From 3f8404fcaa2e4360d265ac9e049a655a0432fac6 Mon Sep 17 00:00:00 2001
From: chudov <devnull@localhost>
Date: Sun, 22 Mar 2009 16:59:05 +0000
Subject: [PATCH] UI revamp

---
 ArCueDotNet/Program.cs                     |    3 +-
 CUERipper/CUERipper.csproj                 |    2 +
 CUERipper/Properties/Resources.Designer.cs |    7 +
 CUERipper/Properties/Resources.resx        |    6 +-
 CUERipper/arok.ico                         |  Bin 0 -> 1406 bytes
 CUERipper/frmCUERipper.Designer.cs         |   20 +-
 CUERipper/frmCUERipper.cs                  |   13 +-
 CUERipper/frmCUERipper.resx                |   46 +-
 CUERipper/musicbrainz.ico                  |  Bin 0 -> 1406 bytes
 CUETools.Codecs/Codecs.cs                  |    6 +
 CUETools.Processor/Processor.cs            |  513 ++-
 CUETools.Processor/UserDefined.cs          |    2 +-
 CUETools.Ripper.SCSI/SCSIDrive.cs          |   10 +-
 CUETools/CUETools.csproj                   |   27 +
 CUETools/CUETools.sln                      |   18 +
 CUETools/Program.cs                        |  122 +-
 CUETools/Properties/Resources.Designer.cs  |   42 +
 CUETools/Properties/Resources.resx         |   36 +-
 CUETools/Resources/AR.ico                  |  Bin 0 -> 1078 bytes
 CUETools/Resources/accuraterip.bmp         |  Bin 0 -> 822 bytes
 CUETools/Resources/accuraterip.jpg         |  Bin 0 -> 10819 bytes
 CUETools/Resources/accuraterip_16.bmp      |  Bin 0 -> 822 bytes
 CUETools/Resources/cd.ico                  |  Bin 0 -> 1406 bytes
 CUETools/Resources/flac.ico                |  Bin 0 -> 1406 bytes
 CUETools/Resources/icon-wv.png             |  Bin 0 -> 425 bytes
 CUETools/Resources/wav.bmp                 |  Bin 0 -> 822 bytes
 CUETools/frmAbout.resx                     |    2 +-
 CUETools/frmBatch.cs                       |   15 +-
 CUETools/frmCUETools.Designer.cs           |  901 +++--
 CUETools/frmCUETools.cs                    | 1021 ++++--
 CUETools/frmCUETools.de-DE.resx            |  233 +-
 CUETools/frmCUETools.resx                  | 3570 +++++++++++---------
 CUETools/frmCUETools.ru-RU.resx            |  221 +-
 CUETools/frmChoice.Designer.cs             |   40 +-
 CUETools/frmChoice.cs                      |  226 +-
 CUETools/frmChoice.resx                    |  357 +-
 CUETools/frmFilenameCorrector.Designer.cs  |    7 -
 CUETools/frmFilenameCorrector.resx         |   58 +-
 CUETools/frmReport.Designer.cs             |   12 +-
 CUETools/frmReport.resx                    |  130 +-
 CUETools/frmSettings.Designer.cs           |   61 +-
 CUETools/frmSettings.cs                    |   10 +-
 CUETools/frmSettings.resx                  |  279 +-
 CUETools/frmSettings.ru-RU.resx            |  341 +-
 Freedb/CDEntry.cs                          |   20 +-
 Freedb/Track.cs                            |   21 +-
 46 files changed, 5278 insertions(+), 3120 deletions(-)
 create mode 100644 CUERipper/arok.ico
 create mode 100644 CUERipper/musicbrainz.ico
 create mode 100644 CUETools/Resources/AR.ico
 create mode 100644 CUETools/Resources/accuraterip.bmp
 create mode 100644 CUETools/Resources/accuraterip.jpg
 create mode 100644 CUETools/Resources/accuraterip_16.bmp
 create mode 100644 CUETools/Resources/cd.ico
 create mode 100644 CUETools/Resources/flac.ico
 create mode 100644 CUETools/Resources/icon-wv.png
 create mode 100644 CUETools/Resources/wav.bmp

diff --git a/ArCueDotNet/Program.cs b/ArCueDotNet/Program.cs
index 0e7d282..8b1bed2 100644
--- a/ArCueDotNet/Program.cs
+++ b/ArCueDotNet/Program.cs
@@ -29,9 +29,10 @@ namespace ArCueDotNet
 			try
 			{
 				CUESheet cueSheet = new CUESheet(config);
+				cueSheet.Action = CUEAction.Verify;
 				cueSheet.Open(pathIn);
+				cueSheet.Lookup();
 				cueSheet.GenerateFilenames(OutputAudioFormat.NoAudio, false, pathIn);
-				cueSheet.AccurateRip = AccurateRipMode.Verify;
 				cueSheet.WriteAudioFiles(Path.GetDirectoryName(pathIn), CUEStyle.SingleFile);
 				cueSheet.GenerateAccurateRipLog(sw);
 			}
diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj
index 4d21f87..32032fb 100644
--- a/CUERipper/CUERipper.csproj
+++ b/CUERipper/CUERipper.csproj
@@ -156,6 +156,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="arok.ico" />
+    <None Include="Resources\accuraterip_16.bmp" />
+    <None Include="Resources\accuraterip.bmp" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/CUERipper/Properties/Resources.Designer.cs b/CUERipper/Properties/Resources.Designer.cs
index f7f7a27..dd4f7df 100644
--- a/CUERipper/Properties/Resources.Designer.cs
+++ b/CUERipper/Properties/Resources.Designer.cs
@@ -60,6 +60,13 @@ namespace CUERipper.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap accuraterip16 {
+            get {
+                object obj = ResourceManager.GetObject("accuraterip16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap arok {
             get {
                 object obj = ResourceManager.GetObject("arok", resourceCulture);
diff --git a/CUERipper/Properties/Resources.resx b/CUERipper/Properties/Resources.resx
index 8899c73..177c1cc 100644
--- a/CUERipper/Properties/Resources.resx
+++ b/CUERipper/Properties/Resources.resx
@@ -127,10 +127,10 @@
   <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arok" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\arok.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="arok" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\arok.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CUERipper/arok.ico b/CUERipper/arok.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7baa891ef63ad9de08737f5d460eb5a18bf4a4e9
GIT binary patch
literal 1406
zcmZQzU}Ruq5D;KsU|`^2$Y5n)5My9q&|qL-00}8DfaEzqk{||z29b<l2@s2cfuRA6
z7#bQtECvwS(7?cO;J^Wf19uKEd^oj?frW*IfrEpCfrp2OK~PYTK}<}HK}JS~K}ku8
zK~qzcAv83U!PnQ9!O6*q!P3%_p`qqKLqNcPhRF=q82-OG!*J}{dxmSzpEFEYxt4)}
z!I*)8A&r57VI~6u!x;$I*qDLAIE{h9cqRjbF-Yt`L`j-414CLG14G(O28OgV3=C=i
zA=+jdGce3dV_=v$lYwF883u-#|G`EvoH1r#IFrV}aAqb0!<jP-3}^l`F#JzrVE8|i
zf#Lrdu+7E{AehEr%rKL|m;ogAp8;&Wu`z?OaT<fM@k|C|<1-A##{VHsN;76KPD^7j
zPMgVKoOXu6IPE{gnKO+UjAy1X7|)!^U_A2-gYnG&5T~CpW-vaJ#$bGACWG;rGYrOO
z{xcZ=H)b&YpT=PPe<p)5$Q}RxgF^u1iZligoXL>JaE2j`;Xeb|%f`kGX~t;`X~r`d
z(u~hAq#6H*1VfrJLt0uILt5HQhP1RZkYJf<%#b!SjUjF3Oop_XAhG|DpgLpBkalJ!
zL)w`$3~6WngM%*ZzcEAF|CtPF|IaX-VffGRpWzH72#selK;Rj0tjsh9g-#m7Ok)uL
zKP0Hrj2UJcr!mY-o5?UU?F_?A<NpjZXBsoioSDWjbLLEjnKMCV{f9&c*zPojnP+A)
z%sg|3Vdk0t;3%5;-<V<MnKXu(|7SAH{C|dF=6{e2Kv4>c2~Y^kWB|Dg6uoDRjTz1u
zr!kx{p2={=_zc4t<NuJT1-T<Fjp0n%OolTccclG?ME6W%hBGtM7|zU`$#7=o8HO`6
z|3i|%8DoYsXVMtXoSDgR=FAy}GiUyTlf@a3TmGjpocTYK;S4A|z-}=H#Q?*929TW$
z4F8Rd8U7omG5j~4$?)I!48wop|B&RAX3TIVEsf!S+DwN3X=fPDr2U5^v6;pU|7WH#
z{GU0K;s4At4F6~T2PHd(|7VOD{+~%>_<v?5!~Zj982+F6&+z}hF~gbvX$=4W&t&-j
z{|rM~8Yqs^7}EZO>;Rb!Qj^A@$gq?lK0cnIyu6&Dt*wn=+O%m5r%#_|*tBUA!}aUe
z8SdV_%kcQ|V}@6+UNL<9_>tkqj~@&le*b4!vS0y211KXifbswX0|Urh5Cw{NkkJ4C
z3|t`a8Vo=z5Ptvq{pZi0Kfizd9>n8%4dH?WUUPAAy?_1r^JhJfg3q5{zlU=5-~u4U
zdU~Is0`FhH{tRJ51;Bi;W{3cY59UIZA@RYMz%7R;djA@1J%sZa;Q*)r*u`)y?_Y!5
u3vw}ve?S6Y|AM{uL!N=*0XqZ30cHk<22hy@EfH~1AT=PhAUz-W85jWVrbFid

literal 0
HcmV?d00001

diff --git a/CUERipper/frmCUERipper.Designer.cs b/CUERipper/frmCUERipper.Designer.cs
index bf12cc6..9388958 100644
--- a/CUERipper/frmCUERipper.Designer.cs
+++ b/CUERipper/frmCUERipper.Designer.cs
@@ -33,10 +33,10 @@ namespace CUERipper
 			this.comboDrives = new System.Windows.Forms.ComboBox();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusAr = new System.Windows.Forms.ToolStripStatusLabel();
 			this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolStripProgressBar2 = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.toolStripStatusAr = new System.Windows.Forms.ToolStripStatusLabel();
 			this.listTracks = new System.Windows.Forms.ListView();
 			this.Title = new System.Windows.Forms.ColumnHeader();
 			this.TrackNo = new System.Windows.Forms.ColumnHeader();
@@ -72,12 +72,13 @@ namespace CUERipper
 			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabel1,
+            this.toolStripStatusAr,
             this.toolStripProgressBar1,
             this.toolStripProgressBar2,
-            this.toolStripStatusLabel2,
-            this.toolStripStatusAr});
+            this.toolStripStatusLabel2});
 			resources.ApplyResources(this.statusStrip1, "statusStrip1");
 			this.statusStrip1.Name = "statusStrip1";
+			this.statusStrip1.ShowItemToolTips = true;
 			this.statusStrip1.SizingGrip = false;
 			// 
 			// toolStripStatusLabel1
@@ -86,6 +87,12 @@ namespace CUERipper
 			resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1");
 			this.toolStripStatusLabel1.Spring = true;
 			// 
+			// toolStripStatusAr
+			// 
+			this.toolStripStatusAr.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			resources.ApplyResources(this.toolStripStatusAr, "toolStripStatusAr");
+			this.toolStripStatusAr.Name = "toolStripStatusAr";
+			// 
 			// toolStripProgressBar1
 			// 
 			this.toolStripProgressBar1.AutoToolTip = true;
@@ -107,13 +114,6 @@ namespace CUERipper
 			this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
 			resources.ApplyResources(this.toolStripStatusLabel2, "toolStripStatusLabel2");
 			// 
-			// toolStripStatusAr
-			// 
-			this.toolStripStatusAr.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.toolStripStatusAr.Image = global::CUERipper.Properties.Resources.arok;
-			this.toolStripStatusAr.Name = "toolStripStatusAr";
-			resources.ApplyResources(this.toolStripStatusAr, "toolStripStatusAr");
-			// 
 			// listTracks
 			// 
 			resources.ApplyResources(this.listTracks, "listTracks");
diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs
index 0b52fe6..f096c3d 100644
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -353,8 +353,10 @@ namespace CUERipper
 			ReleaseInfo r = new ReleaseInfo();
 			r.cueSheet = new CUESheet(_config);
 			r.cueSheet.OpenCD(audioSource);
+			General.SetCUELine(r.cueSheet.Attributes, "REM", "GENRE", "", true);
+			General.SetCUELine(r.cueSheet.Attributes, "REM", "DATE", "", false);
 			General.SetCUELine(r.cueSheet.Attributes, "REM", "DISCID", AccurateRipVerify.CalculateCDDBId(audioSource.TOC), false);
-			General.SetCUELine(r.cueSheet.Attributes, "REM", "COMMENT", CDDriveReader.RipperVersion(), true);
+			General.SetCUELine(r.cueSheet.Attributes, "REM", "COMMENT", _config.createEACLOG ? "ExactAudioCopy v0.99pb4" : CDDriveReader.RipperVersion(), true);
 			if (release != null)
 			{
 				r.cueSheet.FillFromMusicBrainz(release);
@@ -372,7 +374,9 @@ namespace CUERipper
 				for (int i = 0; i < audioSource.TOC.AudioTracks; i++)
 					r.cueSheet.Tracks[i].Title = string.Format("Track {0:00}", i + 1);
 			}
-			r.cueSheet.AccurateRip = AccurateRipMode.VerifyAndConvert;
+			if (r.cueSheet.Genre == "") r.cueSheet.Genre = "";
+			if (r.cueSheet.Year == "") r.cueSheet.Year = "";
+			r.cueSheet.Action = CUEAction.VerifyAndConvert;
 			r.cueSheet.ArVerify.ContactAccurateRip(AccurateRipVerify.CalculateAccurateRipId(audioSource.TOC));
 			return r;
 		}
@@ -483,7 +487,10 @@ namespace CUERipper
 			{
 				SetupControls();
 				comboRelease.SelectedIndex = 0;
-				toolStripStatusAr.Visible = ((ReleaseInfo) comboRelease.SelectedItem).cueSheet.ArVerify.ARStatus == null;
+				CUESheet cueSheet = ((ReleaseInfo)comboRelease.SelectedItem).cueSheet;
+				toolStripStatusAr.Visible = true; //  cueSheet.ArVerify.ARStatus == null;
+				toolStripStatusAr.Text = cueSheet.ArVerify.ARStatus == null ? cueSheet.ArVerify.Total(0).ToString() : "?";
+				toolStripStatusAr.ToolTipText = "AccurateRip: " + (cueSheet.ArVerify.ARStatus ?? "found") + ".";
 			});
 		}
 
diff --git a/CUERipper/frmCUERipper.resx b/CUERipper/frmCUERipper.resx
index a0fe574..8ba7c8a 100644
--- a/CUERipper/frmCUERipper.resx
+++ b/CUERipper/frmCUERipper.resx
@@ -148,11 +148,40 @@
     <value>0, 371</value>
   </metadata>
   <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>254, 17</value>
+    <value>223, 17</value>
   </data>
   <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
   </data>
+  <data name="toolStripStatusAr.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripStatusAr.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>White</value>
+  </data>
+  <data name="toolStripStatusAr.Size" type="System.Drawing.Size, System.Drawing">
+    <value>16, 17</value>
+  </data>
+  <data name="toolStripStatusAr.ToolTipText" xml:space="preserve">
+    <value>Album found in AccurateRip database.</value>
+  </data>
   <data name="toolStripProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 16</value>
   </data>
@@ -171,9 +200,6 @@
   <data name="toolStripStatusLabel2.Text" xml:space="preserve">
     <value>toolStripStatusAr</value>
   </data>
-  <data name="toolStripStatusAr.Size" type="System.Drawing.Size, System.Drawing">
-    <value>16, 17</value>
-  </data>
   <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 371</value>
   </data>
@@ -541,6 +567,12 @@
   <data name="&gt;&gt;toolStripStatusLabel1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;toolStripStatusAr.Name" xml:space="preserve">
+    <value>toolStripStatusAr</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusAr.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;toolStripProgressBar1.Name" xml:space="preserve">
     <value>toolStripProgressBar1</value>
   </data>
@@ -559,12 +591,6 @@
   <data name="&gt;&gt;toolStripStatusLabel2.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolStripStatusAr.Name" xml:space="preserve">
-    <value>toolStripStatusAr</value>
-  </data>
-  <data name="&gt;&gt;toolStripStatusAr.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;Title.Name" xml:space="preserve">
     <value>Title</value>
   </data>
diff --git a/CUERipper/musicbrainz.ico b/CUERipper/musicbrainz.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7942139f7dc7f5449321d2dc61ddf1fce1dc7254
GIT binary patch
literal 1406
zcmZQzU}Ruq5D;KsU|`^2$Y5n)5My9q&|qL-00}8DfaEzqk{||z29b<l2?ibx4hC}-
zH3maD1qNef6$S$tIR*n+IR+aIEe2yHWsph+9W4z8LqkJ`n{yU1Twl44VPAC<!=t?i
z86ND|!?35Kp5aJa55wus2@EZ9Nespo<_v%S|7ZCB|3AZ~O`8}V?%d08_wZ4M&E>TW
zKR$hCSe2H`@a6RzhQ*PI3~%l|VAxbr#c;T(gF#M5i{bFmgA6PT3=Dhr?qztmYahdb
zz9|gnmakzrzj7_Z>hwH@=htp9?CI!Z*jm}ZaImqRAu=hEfti7UK~qwiVc-7!3{MXq
zWmuO}%<$seMTYBJwll2BEMPb>Zz03AZ95ruR5dW1ZSQ3Wi;HErbm}<6iq*>*OjXnv
zPPTS4oSQU*p~TaVVR2Cz!}0b$hV}Vn3|q=;89I|Q7*ynC89I78879x0!!Tpf0tPin
zDTYY}#S9i|>I_#VOlR0x-^y^fsgprMM}<L|hmYZSb0@>W+E#{!uxJKlX<3FF4{tHN
z|NM-Bft!<IOI1C?@%CPZ6fa)}Jxxsp8D=(y^Sx6Tw$(N>>}_mkC<_c>u&}aVIDPRH
z!{!xB8BSd~$?*8yeTL+a0EYOGAcpycWen%LCo>#vXkj?o)W)#0vX<dMT@yove;|XU
zwK>Dr|L+-|etgWZbJqrj+fS}BJpcHJ;pLYn4E|2e3=C{+41wmR3@herWmqtAIm6QF
z>lo7Gau}>^Eg6EH-5H*Jdc^Sl+iQj;i)J&Nzjm5o^3<se6T6!ka$fvrNIdzUA@$;a
z2D|1p4E7GT4CQ%w3}z<!49@N@41fRsU|6zn7Q^+2R~X*^e9539CdJU*-pi12;Xgyh
zk^c-ir~fm!)GuXt^6oLi&;Oqpe*gc<@ZslchR&{5hW!V(GQ4>GkRfOHCx*=9{~63I
zEg1g)|H<&>*9V4YZyqqb`|*lFnt_4A+Q5L}=+V6lU;cbzXsfAaa56Dv0Hy2P>;D-%
zecTxi9o@_D|Nmcx4?o{A=o=a``~{iu;|)XijsFZ;XZ|x3T>8)8*0P2{PC<de-o%Ju
z_4-u|OI9vqNKT4jn7eQm!}@g_7}8Q=8RjpZ#js@Q5{8A#=P__HFfeH8m@&AuZ)DI8
z$_D3y;Yd_<c6WCoKvj1Y=Z2~&NCK&%qM{oR0#zWsXcb&R_mo~$)zm7^s;a6gPLOE#
zl&UJxsww+KMZGw|0-c>zqE(!tqN1XyRh^wCCMG6TqE%HJK;~3|cwm0)lq!%m7=KC?
zXKZYhC|q9Di?eD9g0BiPOdrnY+yD{~6@{rc;jH5H0$B*vZ(?G?Sv93M6(o-kno_la
P)1;~aR1T6Eu^_zwcl@TF

literal 0
HcmV?d00001

diff --git a/CUETools.Codecs/Codecs.cs b/CUETools.Codecs/Codecs.cs
index 820a822..00d761e 100644
--- a/CUETools.Codecs/Codecs.cs
+++ b/CUETools.Codecs/Codecs.cs
@@ -408,6 +408,8 @@ namespace CUETools.Codecs
 					_dataOffset = (ulong)pos;
 					if (!_IO.CanSeek || _IO.Length <= maxFileSize)
 					{
+						if (ckSize == 0x7fffffff)
+							throw new Exception("WAVE stream length unknown");
 						_dataLen = ckSize;
 					}
 					else
@@ -750,6 +752,8 @@ namespace CUETools.Codecs
 			try
 			{
 				started = _encoderProcess.Start();
+				if (started)
+					_encoderProcess.PriorityClass = Process.GetCurrentProcess().PriorityClass;
 			}
 			catch (Exception _ex)
 			{
@@ -837,6 +841,8 @@ namespace CUETools.Codecs
 			try
 			{
 				started = _decoderProcess.Start();
+				if (started)
+					_decoderProcess.PriorityClass = Process.GetCurrentProcess().PriorityClass;
 			}
 			catch (Exception _ex)
 			{
diff --git a/CUETools.Processor/Processor.cs b/CUETools.Processor/Processor.cs
index 1a8e55f..076f022 100644
--- a/CUETools.Processor/Processor.cs
+++ b/CUETools.Processor/Processor.cs
@@ -57,13 +57,15 @@ namespace CUETools.Processor
 		UDC1
 	}
 
-	public enum AccurateRipMode
+	public enum CUEAction
 	{
-		None,
+		Convert,
 		Verify,
 		VerifyPlusCRCs,
 		VerifyThenConvert,
-		VerifyAndConvert
+		VerifyAndConvert,
+		CreateDummyCUE,
+		CorrectFilenames
 	}
 
 	public enum CUEStyle
@@ -144,8 +146,12 @@ namespace CUETools.Processor
 			}
 			else
 			{
-				line.Params[1] = value;
-				line.IsQuoted[1] = quoted;
+				while (line.Params.Count > 1)
+				{
+					line.Params.RemoveAt(1);
+					line.IsQuoted.RemoveAt(1);
+				}
+				line.Params.Add(value); line.IsQuoted.Add(quoted);
 			}
 		}
 
@@ -162,8 +168,12 @@ namespace CUETools.Processor
 			}
 			else
 			{
-				line.Params[2] = value;
-				line.IsQuoted[2] = quoted;
+				while (line.Params.Count > 2)
+				{
+					line.Params.RemoveAt(2);
+					line.IsQuoted.RemoveAt(2);
+				}
+				line.Params.Add(value); line.IsQuoted.Add(quoted);
 			}
 		}
 
@@ -277,6 +287,7 @@ namespace CUETools.Processor
 		public string udc1Extension, udc1Decoder, udc1Params, udc1Encoder, udc1EncParams;
 		public bool udc1APEv2, udc1ID3v2;
 		public bool disableAsm;
+		public bool oneInstance;
 
 		public CUEConfig()
 		{
@@ -329,6 +340,7 @@ namespace CUETools.Processor
 			udc1ID3v2 = udc1APEv2 = false;
 
 			disableAsm = false;
+			oneInstance = true;
 		}
 
 		public void Save (SettingsWriter sw)
@@ -378,6 +390,7 @@ namespace CUETools.Processor
 			sw.Save("DecodeHDCDToLossyWAV16", decodeHDCDtoLW16);
 			sw.Save("DecodeHDCDTo24bit", decodeHDCDto24bit);
 			sw.Save("DisableAsm", disableAsm);
+			sw.Save("OneInstance", oneInstance);
 			if (udc1Extension != "")
 			{
 				sw.Save("UDC1Extension", udc1Extension);
@@ -438,6 +451,7 @@ namespace CUETools.Processor
 			decodeHDCDto24bit = sr.LoadBoolean("DecodeHDCDTo24bit") ?? true;
 
 			disableAsm = sr.LoadBoolean("DisableAsm") ?? false;
+			oneInstance = sr.LoadBoolean("OneInstance") ?? true;
 
 			udc1Extension = sr.Load("UDC1Extension") ?? "";
 			udc1Decoder = sr.Load("UDC1Decoder") ?? "";
@@ -525,11 +539,9 @@ namespace CUETools.Processor
 		private bool _hasEmbeddedCUESheet;
 		private bool _paddedToFrame, _truncated4608, _usePregapForFirstTrackInSingleFile;
 		private int _writeOffset;
-		private AccurateRipMode _accurateRipMode;
-		private uint? _dataTrackLength;
+		private CUEAction _action;
 		private uint? _minDataTrackLength;
 		private string _accurateRipId;
-		private string _accurateRipIdActual;
 		private string _eacLog;
 		private string _cuePath;
 		private TagLib.File _fileInfo;
@@ -571,9 +583,8 @@ namespace CUETools.Processor
 			_paddedToFrame = false;
 			_truncated4608 = false;
 			_usePregapForFirstTrackInSingleFile = false;
-			_accurateRipMode = AccurateRipMode.None;
+			_action = CUEAction.Convert;
 			_appliedWriteOffset = false;
-			_dataTrackLength = null;
 			_minDataTrackLength = null;
 			hdcdDecoder = null;
 			_hasEmbeddedCUESheet = false;
@@ -590,7 +601,6 @@ namespace CUETools.Processor
 				_trackFilenames.Add(string.Format("{0:00}.wav", iTrack + 1));
 				_tracks.Add(new TrackInfo());
 			}
-			_accurateRipId = _accurateRipIdActual = AccurateRipVerify.CalculateAccurateRipId(_toc);
 			_arVerify = new AccurateRipVerify(_toc);
 			_isCD = true;
 			SourceInfo cdInfo;
@@ -833,16 +843,25 @@ namespace CUETools.Processor
 			if (cueDir == pathIn)
 			{
 				CDDriveReader ripper = new CDDriveReader();
-				ripper.Open(pathIn[0]);
-				if (ripper.TOC.AudioTracks > 0)
+				try
 				{
-					OpenCD(ripper);
-					int driveOffset;
-					if (!AccurateRipVerify.FindDriveReadOffset(_ripper.ARName, out driveOffset))
-						throw new Exception("Failed to find drive read offset for drive" + _ripper.ARName);
-					_ripper.DriveOffset = driveOffset;
-					LookupAlbumInfo();
-					return;
+					ripper.Open(pathIn[0]);
+					if (ripper.TOC.AudioTracks > 0)
+					{
+						OpenCD(ripper);
+						int driveOffset;
+						if (!AccurateRipVerify.FindDriveReadOffset(_ripper.ARName, out driveOffset))
+							throw new Exception("Failed to find drive read offset for drive" + _ripper.ARName);
+						_ripper.DriveOffset = driveOffset;
+						LookupAlbumInfo();
+						return;
+					}
+				}
+				catch
+				{
+					ripper.Dispose();
+					_ripper = null;
+					throw;
 				}
 			}
 #endif
@@ -977,8 +996,6 @@ namespace CUETools.Processor
 				_hasEmbeddedCUESheet = true;
 			}
 
-			string dataTrackLength = null;
-
 			using (sr) {
 				while ((lineStr = sr.ReadLine()) != null) {
 					line = new CUELine(lineStr);
@@ -1104,12 +1121,6 @@ namespace CUETools.Processor
 						{
 							// Remove ReplayGain lines
 						}
-						else if ((command == "REM") &&
-							(line.Params.Count == 3) &&
-							(line.Params[1].ToUpper() == "DATATRACKLENGTH"))
-						{
-							dataTrackLength = line.Params[2];
-						}
 						else if ((command == "REM") &&
 						   (line.Params.Count == 3) &&
 						   (line.Params[1].ToUpper() == "ACCURATERIPID"))
@@ -1168,6 +1179,7 @@ namespace CUETools.Processor
 			// Add dummy index 01 for data track
 			if (!_toc[_toc.TrackCount].IsAudio && indexes[indexes.Count - 1].Index == 0)
 			{
+				fileTimeLengthFrames += 152 * 75;
 				indexInfo.Track = trackNumber;
 				indexInfo.Index = 1;
 				indexInfo.Time = absoluteFileStartTime + fileTimeLengthFrames;
@@ -1197,7 +1209,12 @@ namespace CUETools.Processor
 			for (int iTrack = 1; iTrack <= _toc.TrackCount; iTrack++)
 			{
 				_toc[iTrack].Start = _toc[iTrack][1].Start;
-				_toc[iTrack].Length = (iTrack == _toc.TrackCount ? (uint)indexes[indexes.Count - 1].Time - _toc[iTrack].Start : _toc[iTrack + 1][1].Start - _toc[iTrack].Start);
+				_toc[iTrack].Length = iTrack == _toc.TrackCount
+					? (uint)indexes[indexes.Count - 1].Time - _toc[iTrack].Start
+					: _toc[iTrack + 1].IsAudio
+						? _toc[iTrack + 1][1].Start - _toc[iTrack].Start
+						: _toc[iTrack + 1][0].Start - _toc[iTrack].Start;
+
 			}
 
 			// Store the audio filenames, generating generic names if necessary
@@ -1272,67 +1289,35 @@ namespace CUETools.Processor
 
 			CDImageLayout tocFromLog = _eacLog == null ? null : TocFromLog(_eacLog);
 
+			// use pregap from log
 			if (tocFromLog != null && tocFromLog.Pregap > _toc.Pregap)
 				PreGapLength = tocFromLog.Pregap;
 
-			if (_accurateRipId == null)
+			// use data track length from log
+			if (tocFromLog != null && tocFromLog.AudioTracks == _toc.AudioTracks && tocFromLog.TrackCount == tocFromLog.AudioTracks + 1)
 			{
-				if (dataTrackLength != null)
-					DataTrackLength = dataTrackLength;
-				else
+				if (!tocFromLog[tocFromLog.TrackCount].IsAudio)
 				{
-					bool dtlFound = false;
-					if (tocFromLog != null)
-					{
-						// TODO: can just use smth like
-						// DataTrackLength = tocFromLog.DataTrackLengthMSF; 
-						// The only proplem is DataTrackLength property doesn't set last track's offset.
-
-						if (tocFromLog.TrackCount == _toc.TrackCount + 1 && !tocFromLog[tocFromLog.TrackCount].IsAudio)
-						{
-							//_accurateRipId = AccurateRipVerify.CalculateAccurateRipId(tocFromLog);
-							_toc.AddTrack(new CDTrack((uint)tocFromLog.TrackCount, tocFromLog[tocFromLog.TrackCount].Start, tocFromLog[tocFromLog.TrackCount].Length, false, false));
-							dtlFound = true;
-						}
-						else if (tocFromLog.TrackCount == _toc.TrackCount)
-						{
-							if (!tocFromLog[1].IsAudio)
-							{
-								for (i = 2; i <= _toc.TrackCount; i++)
-								{
-									_toc[i].Start += tocFromLog[1].Length - _toc[1].Length;
-									for (int j = 0; j <= _toc[i].LastIndex; j++)
-										_toc[i][j].Start += tocFromLog[1].Length - _toc[1].Length;
-								}
-								_toc[1].Length = tocFromLog[1].Length;
-								dtlFound = true;
-							}
-							else if (!tocFromLog[tocFromLog.TrackCount].IsAudio)
-							{
-								_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
-								_toc[_toc.TrackCount].Length = tocFromLog[_toc.TrackCount].Length;
-								_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
-								_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
-								dtlFound = true;
-							}
-						}
-					}
-					if (!dtlFound && _cddbDiscIdTag != null)
-					{
-						uint cddbDiscIdNum;
-						if (uint.TryParse(_cddbDiscIdTag, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out cddbDiscIdNum) && (cddbDiscIdNum & 0xff) == _toc.TrackCount + 1)
-						{
-							uint lengthFromTag = ((cddbDiscIdNum >> 8) & 0xffff);
-							_minDataTrackLength = ((lengthFromTag + _toc[1].Start / 75) - 152) * 75 - _toc.Length;
-						}
-					}
-				}
+					DataTrackLength = tocFromLog[tocFromLog.TrackCount].Length;
+					_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
+					_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
+					_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
+				} else
+					DataTrackLength = tocFromLog[1].Length;
 			}
 
-			_accurateRipIdActual = AccurateRipVerify.CalculateAccurateRipId(_toc);
-
-			if (_accurateRipId == null)
-				_accurateRipId = _accurateRipIdActual;
+			// use data track length range from cddbId
+			if (DataTrackLength == 0 && _cddbDiscIdTag != null)
+			{
+				uint cddbDiscIdNum;
+				if (uint.TryParse(_cddbDiscIdTag, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out cddbDiscIdNum) && (cddbDiscIdNum & 0xff) == _toc.AudioTracks + 1)
+				{
+					if (_toc.TrackCount == _toc.AudioTracks)
+						_toc.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152 * 75, 0, false, false));
+					uint lengthFromTag = ((cddbDiscIdNum >> 8) & 0xffff);
+					_minDataTrackLength = (lengthFromTag + _toc[1].Start / 75) * 75 - _toc.Length;
+				}
+			}
 
 			_arVerify = new AccurateRipVerify(_toc);
 
@@ -1370,18 +1355,43 @@ namespace CUETools.Processor
 						_arVerify.CRCLOG(1, 0);
 				}
 			}
+		}
 
-			//if (!_dataTrackLength.HasValue && _cddbDiscIdTag != null)
-			//{
-			//    uint cddbDiscIdNum = UInt32.Parse(_cddbDiscIdTag, NumberStyles.HexNumber);
-			//    if ((cddbDiscIdNum & 0xff) == TrackCount)
-			//    {
-			//        _cutOneFrame = true;
-			//        string cddbDiscIdTagCut = CalculateAccurateRipId().Split('-')[2];
-			//        if (cddbDiscIdTagCut.ToUpper() != _cddbDiscIdTag.ToUpper())
-			//            _cutOneFrame = false;
-			//    }
-			//}
+		public void Lookup()
+		{
+			if (_action == CUEAction.Verify 
+				|| _action == CUEAction.VerifyAndConvert 
+				|| _action == CUEAction.VerifyPlusCRCs 
+				|| _action == CUEAction.VerifyThenConvert
+				)
+			{
+				ShowProgress((string)"Contacting AccurateRip database...", 0, 0, null, null);
+				if (!_toc[_toc.TrackCount].IsAudio && DataTrackLength == 0 && _minDataTrackLength.HasValue && _accurateRipId == null && _config.bruteForceDTL)
+				{
+					uint minDTL = _minDataTrackLength.Value;
+					CDImageLayout toc2 = new CDImageLayout(_toc);
+					for (uint dtl = minDTL; dtl < minDTL + 75; dtl++)
+					{
+						toc2[toc2.TrackCount].Length = dtl;
+						_arVerify.ContactAccurateRip(AccurateRipVerify.CalculateAccurateRipId(toc2));
+						if (_arVerify.AccResult != HttpStatusCode.NotFound)
+						{
+							DataTrackLength = dtl;
+							break;
+						}
+						ShowProgress((string)"Contacting AccurateRip database...", 0, (dtl - minDTL) / 75.0, null, null);
+						CheckStop();
+						lock (this)
+						{
+							Monitor.Wait(this, 500);
+						}
+					}
+				}
+				else
+				{
+					_arVerify.ContactAccurateRip(_accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
+				}
+			}
 		}
 
 		public static Encoding Encoding {
@@ -1968,7 +1978,7 @@ namespace CUETools.Processor
 			for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
 			{
 				int cdErrors = 0;
-				bool crcMismatch = _accurateRipMode == AccurateRipMode.VerifyThenConvert &&
+				bool crcMismatch = _action == CUEAction.VerifyThenConvert &&
 					_arVerify.BackupCRC(iTrack) != _arVerify.CRC(iTrack);
 				for (uint iSector = _toc[iTrack + 1].Start; iSector <= _toc[iTrack + 1].End; iSector++)
 					if (_ripper.Errors[(int)iSector])
@@ -1988,7 +1998,7 @@ namespace CUETools.Processor
 						logWriter.WriteLine("Track {0} contains {1} errors", iTrack + 1, cdErrors);
 				}
 			}
-			if (_accurateRipMode != AccurateRipMode.None)
+			if (_action != CUEAction.Convert)
 			{
 				logWriter.WriteLine();
 				logWriter.WriteLine("AccurateRip summary");
@@ -2034,7 +2044,7 @@ namespace CUETools.Processor
 			using (sw) 
 			{
 				if (_config.writeArTagsOnConvert)
-					WriteLine(sw, 0, "REM ACCURATERIPID " + _accurateRipId);
+					WriteLine(sw, 0, "REM ACCURATERIPID " + (_accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc)));
 
 				for (i = 0; i < _attributes.Count; i++)
 					WriteLine(sw, 0, _attributes[i]);
@@ -2091,24 +2101,24 @@ namespace CUETools.Processor
 		public void GenerateAccurateRipLog(TextWriter sw)
 		{
 			sw.WriteLine("[Verification date: {0}]", DateTime.Now);
-			sw.WriteLine("[Disc ID: {0}]", _accurateRipId);
+			sw.WriteLine("[Disc ID: {0}]", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			if (PreGapLength != 0)
 				sw.WriteLine("Pregap length {0}.", PreGapLengthMSF);
-			if (_dataTrackLength.HasValue)
-				sw.WriteLine("Assuming a data track was present, length {0}.", CDImageLayout.TimeToString(_dataTrackLength.Value));
-			else
-			{
-				if (_cddbDiscIdTag != null && _accurateRipId.Split('-')[2].ToUpper() != _cddbDiscIdTag.ToUpper())
-					sw.WriteLine("CDDBId mismatch: {0} vs {1}", _cddbDiscIdTag.ToUpper(), _accurateRipId.Split('-')[2].ToUpper());
-				if (_minDataTrackLength.HasValue)
-					sw.WriteLine("Data track was probably present, length {0}-{1}.", CDImageLayout.TimeToString(_minDataTrackLength.Value), CDImageLayout.TimeToString(_minDataTrackLength.Value + 74));
-				if (_accurateRipIdActual != _accurateRipId)
-					sw.WriteLine("Using preserved id, actual id is {0}.", _accurateRipIdActual);
-				if (_truncated4608)
-					sw.WriteLine("Truncated 4608 extra samples in some input files.");
-				if (_paddedToFrame)
-					sw.WriteLine("Padded some input files to a frame boundary.");
-			}
+			if (!_toc[1].IsAudio)
+				sw.WriteLine("Playstation type data track length {0}.", _toc[1].LengthMSF);
+			if (!_toc[_toc.TrackCount].IsAudio)
+				sw.WriteLine("CD-Extra data track length {0}.", 
+					_toc[_toc.TrackCount].Length == 0 && _minDataTrackLength.HasValue ? 
+						CDImageLayout.TimeToString(_minDataTrackLength.Value) + " - " + CDImageLayout.TimeToString(_minDataTrackLength.Value + 74) : 
+						_toc[_toc.TrackCount].LengthMSF );
+			if (_cddbDiscIdTag != null && AccurateRipVerify.CalculateCDDBId(_toc).ToUpper() != _cddbDiscIdTag.ToUpper() && !_minDataTrackLength.HasValue)
+				sw.WriteLine("CDDBId mismatch: {0} vs {1}", _cddbDiscIdTag.ToUpper(), AccurateRipVerify.CalculateCDDBId(_toc).ToUpper());
+			if (_accurateRipId != null && AccurateRipVerify.CalculateAccurateRipId(_toc) != _accurateRipId)
+				sw.WriteLine("Using preserved id, actual id is {0}.", AccurateRipVerify.CalculateAccurateRipId(_toc));
+			if (_truncated4608)
+				sw.WriteLine("Truncated 4608 extra samples in some input files.");
+			if (_paddedToFrame)
+				sw.WriteLine("Padded some input files to a frame boundary.");
 
 			if (hdcdDecoder != null && hdcdDecoder.Detected)
 			{
@@ -2149,7 +2159,7 @@ namespace CUETools.Processor
 						matching3 += _arVerify.AccDisks[iDisk].tracks[iTrack].count;
 			}
 			tags.Add(String.Format("{0}ACCURATERIPCRC", prefix), String.Format("{0:x8}", _arVerify.CRC(iTrack, offset)));
-			tags.Add(String.Format("{0}AccurateRipDiscId", prefix), String.Format("{0:000}-{1}-{2:00}", TrackCount, _accurateRipId, iTrack+1));
+			tags.Add(String.Format("{0}AccurateRipDiscId", prefix), String.Format("{0:000}-{1}-{2:00}", TrackCount, _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc), iTrack + 1));
 			tags.Add(String.Format("{0}ACCURATERIPCOUNT", prefix), String.Format("{0}", matching));
 			tags.Add(String.Format("{0}ACCURATERIPCOUNTALLOFFSETS", prefix), String.Format("{0}", matching3));
 			tags.Add(String.Format("{0}ACCURATERIPTOTAL", prefix), String.Format("{0}", total));
@@ -2159,7 +2169,7 @@ namespace CUETools.Processor
 
 		public void GenerateAccurateRipTags(NameValueCollection tags, int offset, int bestOffset, int iTrack)
 		{
-			tags.Add("ACCURATERIPID", _accurateRipId);
+			tags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			if (bestOffset != offset)
 				tags.Add("ACCURATERIPOFFSET", String.Format("{1}{0}", bestOffset - offset, bestOffset > offset ? "+" : ""));
 			if (iTrack != -1)
@@ -2220,13 +2230,13 @@ namespace CUETools.Processor
 			outTracksMatch = bestTracksMatch;
 		}
 
-		public void WriteAudioFiles(string dir, CUEStyle style) {
+		public string WriteAudioFiles(string dir, CUEStyle style) {
 			string[] destPaths;
 			int[] destLengths;
 			bool htoaToFile = ((style == CUEStyle.GapsAppended) && _config.preserveHTOA &&
 				(_toc.Pregap != 0));
 
-			if (_isCD && (style == CUEStyle.GapsLeftOut || style == CUEStyle.GapsPrepended) && (_accurateRipMode == AccurateRipMode.None || _accurateRipMode == AccurateRipMode.VerifyAndConvert))
+			if (_isCD && (style == CUEStyle.GapsLeftOut || style == CUEStyle.GapsPrepended) && (_action == CUEAction.Convert || _action == CUEAction.VerifyAndConvert))
 				throw new Exception("When ripping a CD, gaps Left Out/Gaps prepended modes can only be used in verify-then-convert mode");
 
 			if (_usePregapForFirstTrackInSingleFile)
@@ -2246,7 +2256,7 @@ namespace CUETools.Processor
 				}
 			}
 
-			if (_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs)
+			if (_action != CUEAction.Verify && _action != CUEAction.VerifyPlusCRCs)
 				for (int i = 0; i < destPaths.Length; i++)
 					for (int j = 0; j < _sourcePaths.Count; j++)
 						if (destPaths[i].ToLower() == _sourcePaths[j].ToLower())
@@ -2256,64 +2266,32 @@ namespace CUETools.Processor
 
 			bool SkipOutput = false;
 
-			if (_accurateRipMode != AccurateRipMode.None)
-			{
-				ShowProgress((string)"Contacting AccurateRip database...", 0, 0, null, null);
-				if (!_dataTrackLength.HasValue && _minDataTrackLength.HasValue && _accurateRipId == _accurateRipIdActual && _config.bruteForceDTL)
-				{
-					uint minDTL = _minDataTrackLength.Value;
-					CDImageLayout toc2 = new CDImageLayout(_toc);
-					toc2.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152 * 75, minDTL, false, false));
-					for (uint dtl = minDTL; dtl < minDTL + 75; dtl++)
-					{
-						toc2[toc2.TrackCount].Length = dtl;
-						_accurateRipId = AccurateRipVerify.CalculateAccurateRipId(toc2);
-						_arVerify.ContactAccurateRip(_accurateRipId);
-						if (_arVerify.AccResult != HttpStatusCode.NotFound)
-						{
-							_dataTrackLength = dtl;
-							break;
-						}
-						ShowProgress((string)"Contacting AccurateRip database...", 0, (dtl - minDTL) / 75.0, null, null);
-						CheckStop();
-						lock (this)
-						{
-							Monitor.Wait(this, 1000);
-						}
-					}
-					if (_arVerify.AccResult != HttpStatusCode.OK)
-					{
-						_accurateRipId = _accurateRipIdActual;
-					}
-				}
-				else
-				{
-					//CDImageLayout toc2 = new CDImageLayout(_toc);
-					//bool found = false;
-					//for (uint len = 0; len < 150; len++)
-					//{
-					//    toc2[toc2.TrackCount].Length = _toc[_toc.TrackCount].Length + len;
-					//    string id = AccurateRipVerify.CalculateAccurateRipId(toc2);
-					//    _arVerify.ContactAccurateRip(id);
-					//    if (_arVerify.AccResult != HttpStatusCode.NotFound)
-					//    {
-					//        _accurateRipId = id;
-					//        found = true;
-					//        break;
-					//    }
-					//    ShowProgress((string)"Contacting AccurateRip database...", 0, len / 150.0, null, null);
-					//    CheckStop();
-					//    lock (this) { Monitor.Wait(this, 1000); }
-					//}
-					//if (!found)
-					_arVerify.ContactAccurateRip(_accurateRipId);
-				}
+			// Lookup();
 
-				if (_accurateRipMode == AccurateRipMode.Verify)
+			if (_action == CUEAction.Verify)
+			{
+				if (_arVerify.AccResult != HttpStatusCode.OK)
 				{
-					if (_arVerify.AccResult != HttpStatusCode.OK)
+					if (_config.writeArLogOnVerify)
 					{
-						if (_config.writeArLogOnVerify)
+						if (!Directory.Exists(dir))
+							Directory.CreateDirectory(dir);
+						StreamWriter sw = new StreamWriter(Path.ChangeExtension(_cuePath, ".accurip"),
+							false, CUESheet.Encoding);
+						GenerateAccurateRipLog(sw);
+						sw.Close();
+					}
+					return _arVerify.ARStatus;
+				}
+			}
+
+			if (_action == CUEAction.VerifyThenConvert)
+			{
+				if (_arVerify.AccResult != HttpStatusCode.OK && !_isCD)
+				{
+					if (_config.noUnverifiedOutput)
+					{
+						if (_config.writeArLogOnConvert)
 						{
 							if (!Directory.Exists(dir))
 								Directory.CreateDirectory(dir);
@@ -2322,87 +2300,74 @@ namespace CUETools.Processor
 							GenerateAccurateRipLog(sw);
 							sw.Close();
 						}
-						return;
+						if (_config.createTOC)
+						{
+							if (!Directory.Exists(dir))
+								Directory.CreateDirectory(dir);
+							WriteText(Path.ChangeExtension(_cuePath, ".toc"), TOCContents());
+						}
+						return _arVerify.ARStatus;
 					}
 				}
-
-				if (_accurateRipMode == AccurateRipMode.VerifyThenConvert)
+				else
 				{
-					if (_arVerify.AccResult != HttpStatusCode.OK && !_isCD)
+					_writeOffset = 0;
+					WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, true);
+					if (!_isCD)
 					{
+						uint tracksMatch;
+						int bestOffset;
+
 						if (_config.noUnverifiedOutput)
 						{
-							if (_config.writeArLogOnConvert)
-							{
-								if (!Directory.Exists(dir))
-									Directory.CreateDirectory(dir);
-								StreamWriter sw = new StreamWriter(Path.ChangeExtension(_cuePath, ".accurip"),
-									false, CUESheet.Encoding);
-								GenerateAccurateRipLog(sw);
-								sw.Close();
-							}
-							if (_config.createTOC)
-							{
-								if (!Directory.Exists(dir))
-									Directory.CreateDirectory(dir);
-								WriteText(Path.ChangeExtension(_cuePath, ".toc"), TOCContents());
-							}
-							return;
+							FindBestOffset(_config.encodeWhenConfidence, false, out tracksMatch, out bestOffset);
+							if (tracksMatch * 100 < _config.encodeWhenPercent * TrackCount || (_config.encodeWhenZeroOffset && bestOffset != 0))
+								SkipOutput = true;
 						}
-					}
-					else
-					{
-						_writeOffset = 0;
-						WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, true);
-						if (!_isCD)
+
+						if (!SkipOutput && _config.fixOffset)
 						{
-							uint tracksMatch;
-							int bestOffset;
-
-							if (_config.noUnverifiedOutput)
-							{
-								FindBestOffset(_config.encodeWhenConfidence, false, out tracksMatch, out bestOffset);
-								if (tracksMatch * 100 < _config.encodeWhenPercent * TrackCount || (_config.encodeWhenZeroOffset && bestOffset != 0))
-									SkipOutput = true;
-							}
-
-							if (!SkipOutput && _config.fixOffset)
-							{
-								FindBestOffset(_config.fixWhenConfidence, false, out tracksMatch, out bestOffset);
-								if (tracksMatch * 100 >= _config.fixWhenPercent * TrackCount)
-									_writeOffset = bestOffset;
-							}
+							FindBestOffset(_config.fixWhenConfidence, false, out tracksMatch, out bestOffset);
+							if (tracksMatch * 100 >= _config.fixWhenPercent * TrackCount)
+								_writeOffset = bestOffset;
 						}
-						_arVerify.CreateBackup(_writeOffset);
 					}
+					_arVerify.CreateBackup(_writeOffset);
 				}
 			}
 
 			if (!SkipOutput)
 			{
-				if (_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs)
+				if (_action != CUEAction.Verify && _action != CUEAction.VerifyPlusCRCs)
 				{
 					if (!Directory.Exists(dir))
 						Directory.CreateDirectory(dir);
 				}
 				if (_isCD)
 					destLengths = CalculateAudioFileLengths(style); // need to recalc, might have changed after scanning the CD
-				if (_outputFormat != OutputAudioFormat.NoAudio || _accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs)
-					WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, _accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs);
+				if (_outputFormat != OutputAudioFormat.NoAudio || _action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs)
+					WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, _action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs);
 				CreateRipperLOG(destPaths, style);
-				if (_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs)
+				if (_action == CUEAction.Convert || _action == CUEAction.VerifyAndConvert || _action == CUEAction.VerifyThenConvert)
 				{
 					string cueContents = CUESheetContents(style);
 					uint tracksMatch = 0;
 					int bestOffset = 0;
 					
-					if (_accurateRipMode != AccurateRipMode.None &&
+					if (_action != CUEAction.Convert &&
 						_config.writeArTagsOnConvert &&
 						_arVerify.AccResult == HttpStatusCode.OK)
 						FindBestOffset(1, true, out tracksMatch, out bestOffset);
 
+					if (_config.createEACLOG)
+					{
+						if (_ripperLog != null)
+							_ripperLog = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(_ripperLog));
+						cueContents = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(cueContents));
+					}
+
 					if (_ripperLog != null)
-						WriteText(Path.ChangeExtension(_cuePath, ".log"), _ripperLog, _config.createEACLOG ? CUESheet.Encoding : Encoding.UTF8);
+						WriteText(Path.ChangeExtension(_cuePath, ".log"), _ripperLog);
 					else
 						if (_eacLog != null && _config.extractLog)
 							WriteText(Path.ChangeExtension(_cuePath, ".log"), _eacLog);
@@ -2486,12 +2451,12 @@ namespace CUETools.Processor
 				}
 			}
 
-			if (_accurateRipMode == AccurateRipMode.Verify ||
-				_accurateRipMode == AccurateRipMode.VerifyPlusCRCs ||
-				(_accurateRipMode != AccurateRipMode.None && _outputFormat != OutputAudioFormat.NoAudio))
+			if (_action == CUEAction.Verify ||
+				_action == CUEAction.VerifyPlusCRCs ||
+				(_action != CUEAction.Convert && _outputFormat != OutputAudioFormat.NoAudio))
 			{
 				ShowProgress((string)"Generating AccurateRip report...", 0, 0, null, null);
-				if ((_accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs) && _config.writeArTagsOnVerify && _writeOffset == 0 && !_isArchive && !_isCD)
+				if ((_action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs) && _config.writeArTagsOnVerify && _writeOffset == 0 && !_isArchive && !_isCD)
 				{
 					uint tracksMatch;
 					int bestOffset;
@@ -2521,8 +2486,8 @@ namespace CUETools.Processor
 					}
 				}
 
-				if ((_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs && _config.writeArLogOnConvert) ||
-					((_accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs) && _config.writeArLogOnVerify))
+				if ((_action != CUEAction.Verify && _action != CUEAction.VerifyPlusCRCs && _config.writeArLogOnConvert) ||
+					((_action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs) && _config.writeArLogOnVerify))
 				{
 					if (!Directory.Exists(dir))
 						Directory.CreateDirectory(dir);
@@ -2538,6 +2503,7 @@ namespace CUETools.Processor
 					WriteText(Path.ChangeExtension(_cuePath, ".toc"), TOCContents());
 				}
 			}
+			return "done";
 		}
 
 		private NameValueCollection GenerateTrackTags(int iTrack, int bestOffset)
@@ -2593,10 +2559,10 @@ namespace CUETools.Processor
 
 			if (_config.writeArTagsOnConvert)
 			{
-				if (_accurateRipMode != AccurateRipMode.None && _arVerify.AccResult == HttpStatusCode.OK)
+				if (_action != CUEAction.Convert && _arVerify.AccResult == HttpStatusCode.OK)
 					GenerateAccurateRipTags(destTags, _writeOffset, bestOffset, iTrack);
 				else
-					destTags.Add("ACCURATERIPID", _accurateRipId);
+					destTags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			}
 			return destTags;
 		}
@@ -2667,10 +2633,10 @@ namespace CUETools.Processor
 
 			if (_config.writeArTagsOnConvert)
 			{
-				if (fWithCUE && _accurateRipMode != AccurateRipMode.None && _arVerify.AccResult == HttpStatusCode.OK)
+				if (fWithCUE && _action != CUEAction.Convert && _arVerify.AccResult == HttpStatusCode.OK)
 					GenerateAccurateRipTags(destTags, _writeOffset, bestOffset, -1);
 				else
-					destTags.Add("ACCURATERIPID", _accurateRipId);
+					destTags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			}
 			return destTags;
 		}
@@ -2748,7 +2714,7 @@ namespace CUETools.Processor
 			uint diskLength = 588 * _toc.AudioLength;
 			uint diskOffset = 0;
 
-			if (_accurateRipMode != AccurateRipMode.None)
+			if (_action != CUEAction.Convert)
 				_arVerify.Init();
 
 			ShowProgress(String.Format("{2} track {0:00} ({1:00}%)...", 0, 0, noOutput ? "Verifying" : "Writing"), 0, 0.0, null, null);
@@ -2861,7 +2827,7 @@ namespace CUETools.Processor
 									}
 								}
 							}
-							if (_accurateRipMode != AccurateRipMode.None)
+							if (_action != CUEAction.Convert)
 								_arVerify.Write(sampleBuffer, copyCount);
 							if (iTrack > 0 || iIndex > 0)
 								Tracks[iTrack + (iIndex == 0 ? -1 : 0)].MeasurePeakLevel(sampleBuffer, copyCount);
@@ -2905,7 +2871,7 @@ namespace CUETools.Processor
 					if (_toc[_toc.FirstAudio + iTrack].ISRC != null)
 						General.SetCUELine(_tracks[iTrack].Attributes, "ISRC", _toc[_toc.FirstAudio + iTrack].ISRC, false);
 					if (_toc[_toc.FirstAudio + iTrack].DCP || _toc[_toc.FirstAudio + iTrack].PreEmphasis)
-						General.SetCUELine(_tracks[iTrack].Attributes, "FLAGS", (_toc[_toc.FirstAudio + iTrack].PreEmphasis ? " PRE" : "") + (_toc[_toc.FirstAudio + iTrack].DCP ? " DCP" : ""), false);
+						_tracks[iTrack].Attributes.Add(new CUELine("FLAGS" + (_toc[_toc.FirstAudio + iTrack].PreEmphasis ? " PRE" : "") + (_toc[_toc.FirstAudio + iTrack].DCP ? " DCP" : "")));
 				}
 			}
 #endif
@@ -2946,7 +2912,7 @@ namespace CUETools.Processor
 
 		public static string CorrectAudioFilenames(string dir, string cue, bool always, List<string> files) 
 		{
-			string[] audioExts = new string[] { "*.wav", "*.flac", "*.wv", "*.ape", "*.m4a", "*.tta" };
+			string[] audioExts = new string[] { "*.wav", "*.flac", "*.wv", "*.ape", "*.m4a", "*.tta", "*.tak", "*.ogg" };
 			List<string> lines = new List<string>();
 			List<int> filePos = new List<int>();
 			List<string> origFiles = new List<string>();
@@ -3012,7 +2978,7 @@ namespace CUETools.Processor
 					}
 				}
 				if (!foundAll)
-					throw new Exception("Unable to locate the audio files.");
+					throw new Exception("unable to locate the audio files");
 
 				for (i = 0; i < filePos.Count; i++)
 					lines[filePos[i]] = "FILE \"" + Path.GetFileName(audioFiles[i]) + "\" WAVE";
@@ -3067,7 +3033,7 @@ namespace CUETools.Processor
 			return fileLengths;
 		}
 
-		private void CheckStop()
+		public void CheckStop()
 		{
 			lock (this)
 			{
@@ -3305,39 +3271,52 @@ namespace CUETools.Processor
 			}
 		}
 
-		public string DataTrackLength
+		public uint DataTrackLength
 		{
 			get
 			{
-				return CDImageLayout.TimeToString(_dataTrackLength.HasValue ? _dataTrackLength.Value : 0);
+				if (!_toc[1].IsAudio)
+					return _toc[1].Length;
+				else if (!_toc[_toc.TrackCount].IsAudio)
+					return _toc[_toc.TrackCount].Length;
+				else
+					return 0U;
 			}
 			set
 			{
-				uint dtl = (uint)CDImageLayout.TimeFromString(value);
-				if (dtl != 0)
+				if (value == 0)
+					return;
+				if (!_toc[1].IsAudio)
 				{
-					if (!_toc[1].IsAudio)
+					for (int i = 2; i <= _toc.TrackCount; i++)
 					{
-						for (int i = 2; i <= _toc.TrackCount; i++)
-						{
-							_toc[i].Start += dtl - _toc[1].Length;
-							for (int j = 0; j <= _toc[i].LastIndex; j++)
-								_toc[i][j].Start += dtl - _toc[1].Length;
-						}
-						_toc[1].Length = dtl;
+						_toc[i].Start += value - _toc[1].Length;
+						for (int j = 0; j <= _toc[i].LastIndex; j++)
+							_toc[i][j].Start += value - _toc[1].Length;
 					}
-					else if (!_toc[_toc.TrackCount].IsAudio)
-					{
-						//_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
-						_toc[_toc.TrackCount].Length = dtl;
-						//_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
-						//_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
-					}
-					else
-						_toc.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152U * 75U, dtl, false, false));
-					_dataTrackLength = dtl;
-					_accurateRipIdActual = _accurateRipId = AccurateRipVerify.CalculateAccurateRipId(_toc);
+					_toc[1].Length = value;
 				}
+				else if (!_toc[_toc.TrackCount].IsAudio)
+				{
+					//_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
+					_toc[_toc.TrackCount].Length = value;
+					//_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
+					//_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
+				}
+				else
+					_toc.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152U * 75U, value, false, false));
+			}
+		}
+
+		public string DataTrackLengthMSF
+		{
+			get
+			{
+				return CDImageLayout.TimeToString(DataTrackLength);
+			}
+			set
+			{
+				DataTrackLength = (uint) CDImageLayout.TimeFromString(value);
 			}
 		}
 
@@ -3381,8 +3360,6 @@ namespace CUETools.Processor
 				sourceInfo.Offset = 0;
 				sourceInfo.Length = offs * 588;
 				_sources.Insert(0, sourceInfo);
-
-				_accurateRipIdActual = _accurateRipId = AccurateRipVerify.CalculateAccurateRipId(_toc);
 			}
 		}
 
@@ -3403,15 +3380,15 @@ namespace CUETools.Processor
 			}
 		}
 
-		public AccurateRipMode AccurateRip
+		public CUEAction Action
 		{
 			get
 			{
-				return _accurateRipMode;
+				return _action;
 			}
 			set
 			{
-				_accurateRipMode = value;
+				_action = value;
 			}
 		}
 
diff --git a/CUETools.Processor/UserDefined.cs b/CUETools.Processor/UserDefined.cs
index 98ffc70..b549e84 100644
--- a/CUETools.Processor/UserDefined.cs
+++ b/CUETools.Processor/UserDefined.cs
@@ -329,7 +329,7 @@ namespace TagLib.UserDefined {
 
 		private static TagLib.File UserDefinedResolver(TagLib.File.IFileAbstraction abstraction, string mimetype, TagLib.ReadStyle style)
 		{
-			if (mimetype == "taglib/flac" || mimetype == "taglib/wv" || mimetype == "taglib/ape" || mimetype == "taglib/wav" || mimetype == "taglib/ogg" || mimetype == "taglib/m4a")
+			if (mimetype == "taglib/flac" || mimetype == "taglib/wv" || mimetype == "taglib/ape" || mimetype == "taglib/wav" || mimetype == "taglib/ogg" || mimetype == "taglib/m4a" || mimetype == "taglib/mp3")
 				return null;
 			if (mimetype == "taglib/tta")
 				return new File(abstraction, style, true, false);
diff --git a/CUETools.Ripper.SCSI/SCSIDrive.cs b/CUETools.Ripper.SCSI/SCSIDrive.cs
index 78b6c3f..d43ec20 100644
--- a/CUETools.Ripper.SCSI/SCSIDrive.cs
+++ b/CUETools.Ripper.SCSI/SCSIDrive.cs
@@ -36,7 +36,7 @@ namespace CUETools.Ripper.SCSI
 	/// <summary>
 	/// 
 	/// </summary>
-	public class CDDriveReader : IAudioSource
+	public class CDDriveReader : IAudioSource, IDisposable
 	{
 		byte[] cdtext = null;
 		private Device m_device;
@@ -277,11 +277,17 @@ namespace CUETools.Ripper.SCSI
 
 		public void Close()
 		{
-			m_device.Close();
+			if (m_device != null)
+				m_device.Close();
 			m_device = null;
 			_toc = null;
 		}
 
+		public void Dispose()
+		{
+			Close();
+		}
+
 		public int BestBlockSize
 		{
 			get
diff --git a/CUETools/CUETools.csproj b/CUETools/CUETools.csproj
index 3272c25..cb28005 100644
--- a/CUETools/CUETools.csproj
+++ b/CUETools/CUETools.csproj
@@ -71,10 +71,15 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CUETools.Processor\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -224,10 +229,26 @@
     <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\taglib-sharp\taglib-sharp.csproj">
+      <Project>{4CC18776-125E-4318-9D24-D60110AD9697}</Project>
+      <Name>taglib-sharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CUEControls\CUEControls.csproj">
+      <Project>{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}</Project>
+      <Name>CUEControls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CUETools.AccurateRip\CUETools.AccurateRip.csproj">
+      <Project>{5802C7E9-157E-4124-946D-70B5AE48A5A1}</Project>
+      <Name>CUETools.AccurateRip</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CUETools.CDImage\CUETools.CDImage.csproj">
       <Project>{1DD41038-D885-46C5-8DDE-E0B82F066584}</Project>
       <Name>CUETools.CDImage</Name>
     </ProjectReference>
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
+      <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
+      <Name>CUETools.Codecs</Name>
+    </ProjectReference>
     <ProjectReference Include="..\CUETools.Processor\CUETools.Processor.csproj">
       <Project>{4911BD82-49EF-4858-8B51-5394F86739A4}</Project>
       <Name>CUETools.Processor</Name>
@@ -248,9 +269,15 @@
     <None Include="Resources\musicbrainz.ico" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\accuraterip.jpg" />
+    <Content Include="Resources\accuraterip_16.bmp" />
+    <Content Include="Resources\AR.ico" />
     <Content Include="Resources\cue.ico" />
     <Content Include="Resources\cue_32.ico" />
     <Content Include="Resources\eac.ico" />
+    <Content Include="Resources\flac.ico" />
+    <Content Include="Resources\icon-wv.png" />
+    <Content Include="Resources\wav.bmp" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/CUETools/CUETools.sln b/CUETools/CUETools.sln
index 35e3893..9e1ba36 100644
--- a/CUETools/CUETools.sln
+++ b/CUETools/CUETools.sln
@@ -85,6 +85,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Converter", "..\CU
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "taglib-sharp", "..\..\taglib-sharp\taglib-sharp.csproj", "{4CC18776-125E-4318-9D24-D60110AD9697}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUEControls", "..\CUEControls\CUEControls.csproj", "{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -542,6 +544,22 @@ Global
 		{4CC18776-125E-4318-9D24-D60110AD9697}.Release|x64.Build.0 = Release|Any CPU
 		{4CC18776-125E-4318-9D24-D60110AD9697}.Release|x86.ActiveCfg = Release|Any CPU
 		{4CC18776-125E-4318-9D24-D60110AD9697}.Release|x86.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x64.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x86.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x64.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x64.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x86.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CUETools/Program.cs b/CUETools/Program.cs
index 5ce23b0..97b2fc9 100644
--- a/CUETools/Program.cs
+++ b/CUETools/Program.cs
@@ -4,22 +4,25 @@ using System.Windows.Forms;
 using System.IO;
 using System.Text;
 using CUETools.Processor;
+using System.Threading;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Channels.Ipc;
 
 namespace JDP {
 	static class Program {
 		[STAThread]
 		static void Main(string[] args)
 		{
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
 			if (args.Length > 1 && (args[0] == "/verify" || args[0] == "/crc" || args[0] == "/convert" || args[0] == "/fix"))
 			{
+				Application.EnableVisualStyles();
+				Application.SetCompatibleTextRenderingDefault(false);
 				frmBatch batch = new frmBatch();
 				batch.AccurateRip =
-					args[0] == "/convert" ? AccurateRipMode.VerifyAndConvert :
-					args[0] == "/fix" ? AccurateRipMode.VerifyThenConvert :
-					args[0] == "/crc" ? AccurateRipMode.VerifyPlusCRCs :
-					AccurateRipMode.Verify;
+					args[0] == "/convert" ? CUEAction.VerifyAndConvert :
+					args[0] == "/fix" ? CUEAction.VerifyThenConvert :
+					args[0] == "/crc" ? CUEAction.VerifyPlusCRCs :
+					CUEAction.Verify;
 
 				if (args.Length == 2 && args[1][0] != '@')
 					batch.InputPath = args[1];
@@ -45,10 +48,111 @@ namespace JDP {
 				Application.Run(batch);
 				return;
 			}
+
+			string myId = "BZ92759C-63Q7-444e-ADA6-E495634A493D";
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
 			frmCUETools form = new frmCUETools();
-			if (args.Length == 1)
-				form.InputPath = args[0];
-			Application.Run(form);
+			CUEConfig config = new CUEConfig();
+			config.Load(new SettingsReader("CUE Tools", "settings.txt"));
+			if (!config.oneInstance || SingletonController.IamFirst(myId, new SingletonController.ReceiveDelegate(form.OnSecondCall)))
+			{
+				if (args.Length == 1)
+					form.InputPath = args[0];
+				Application.Run(form);
+			}
+			else
+			{
+				List<string> newArgs = new List<string>();
+				foreach (string arg in args)
+					newArgs.Add(Path.GetFullPath(arg));
+				SingletonController.Send(myId, newArgs.ToArray());
+			}
+			SingletonController.Cleanup();
 		}
 	}
+
+	[Serializable]
+    class SingletonController : MarshalByRefObject
+    {
+		private static IpcChannel m_IPCChannel = null;
+
+		public delegate void ReceiveDelegate(string[] args);
+
+        static private ReceiveDelegate m_Receive = null;
+        static public ReceiveDelegate Receiver
+        {
+            get
+            {
+                return m_Receive;
+            }
+            set
+            {
+                m_Receive = value;
+            }
+        }
+
+        public static bool IamFirst(string id, ReceiveDelegate r)
+        {
+            if (IamFirst(id))
+            {
+                Receiver += r;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public static bool IamFirst(string id)
+        {
+			try
+			{
+				m_IPCChannel = new IpcChannel(id);
+			}
+			catch
+			{
+				return false;
+			}
+			System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(m_IPCChannel, false);
+			RemotingConfiguration.RegisterWellKnownServiceType(
+				typeof(SingletonController),
+				"SingletonController",
+				WellKnownObjectMode.SingleCall);
+			return true;
+		}
+
+        public static void Cleanup()
+        {
+            if (m_IPCChannel != null)
+                m_IPCChannel.StopListening(null);
+            m_IPCChannel = null;
+        }
+
+        public static void Send(string id, string[] s)
+        {
+            SingletonController ctrl;
+            IpcChannel channel = new IpcChannel();
+			System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(channel, false);
+            try
+            {
+				ctrl = (SingletonController)Activator.GetObject(typeof(SingletonController), "ipc://" + id + "/SingletonController");
+				ctrl.Receive(s);
+			}
+            catch
+            {
+				MessageBox.Show("Another instance of the application seems to be running, but not responding.",
+					"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        public void Receive(string[] s)
+        {
+            if (m_Receive != null)
+            {
+                m_Receive(s);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/CUETools/Properties/Resources.Designer.cs b/CUETools/Properties/Resources.Designer.cs
index 847840a..fc046c6 100644
--- a/CUETools/Properties/Resources.Designer.cs
+++ b/CUETools/Properties/Resources.Designer.cs
@@ -60,6 +60,34 @@ namespace JDP.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap accuraterip {
+            get {
+                object obj = ResourceManager.GetObject("accuraterip", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap accuraterip16 {
+            get {
+                object obj = ResourceManager.GetObject("accuraterip16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Icon cue {
+            get {
+                object obj = ResourceManager.GetObject("cue", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap flac {
+            get {
+                object obj = ResourceManager.GetObject("flac", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap freedb {
             get {
                 object obj = ResourceManager.GetObject("freedb", resourceCulture);
@@ -100,5 +128,19 @@ namespace JDP.Properties {
                 return ResourceManager.GetString("Verify", resourceCulture);
             }
         }
+        
+        internal static System.Drawing.Bitmap wav {
+            get {
+                object obj = ResourceManager.GetObject("wav", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap wv {
+            get {
+                object obj = ResourceManager.GetObject("wv", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/CUETools/Properties/Resources.resx b/CUETools/Properties/Resources.resx
index a8899c7..9d427c0 100644
--- a/CUETools/Properties/Resources.resx
+++ b/CUETools/Properties/Resources.resx
@@ -117,20 +117,38 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Verify" xml:space="preserve">
+    <value>Verify</value>
+  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Go" xml:space="preserve">
-    <value>&amp;Go</value>
-  </data>
-  <data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="wv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon-wv.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Stop" xml:space="preserve">
     <value>Stop</value>
   </data>
-  <data name="Verify" xml:space="preserve">
-    <value>Verify</value>
+  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="flac" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\flac.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="accuraterip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\accuraterip.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Go" xml:space="preserve">
+    <value>&amp;Go</value>
+  </data>
+  <data name="wav" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wav.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cue.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/CUETools/Resources/AR.ico b/CUETools/Resources/AR.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f1282c694b1641c6a5ab3bf2413cf56ba49a1824
GIT binary patch
literal 1078
zcmZQzU}Ruo5D*Yx009j~1_m_-1_lKM2>%5W1A`wU1A_(w0|Q7zfdQnR1*DYW0GPx^
zG%zqUFfcGQG(aeZ1`v~>p`n4{zyXl1{|pTO85kJ;|A$Zv|3OTK|NlXPQ1j~l_y73c
z&%gkqD>^`cfuX*<y`mf>4yDNv2e}Po?)UEy^S>7`FqDG;1H%DEGB7g(!vS^%h6DVN
zZ~}#q15!9OFhTu<K~W)`U}my|f(M2f7#P_9|Ns93ihfXo4>KD?gUzdef&UQm+uJ)J
z2+D^^S3vm?$@caRC?8E8WG)O3Y4Z!fQGy8n`X3+>Bz`+c0fJuvl17TJa*#9<A1uwl
n4oaV34CX&zU|^>c=6}GzApd}Y!TtdQL;V8=hW`&382<wR)U}Gg

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/accuraterip.bmp b/CUETools/Resources/accuraterip.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..104e197a1291899453aeb43e91a01a132db6c524
GIT binary patch
literal 822
zcmZ?rHDhJ~12YB&1`P%V1_3B$WRL)hGeG4b90>XU|Nk93b}U}JxWB)@t+lhEsi~@=
zzM`(Ry1Ko-uA!;1wxzMQt+}<kw|DxCY5!qh&6+i{X3c79Tb!1^IWpr&Xwj9R+H;{z
zXX4ur<~7ak?dzI3eL74nlwP#*R9M3H;Ixy$*|&X5Uij5L_vwBbFzIo`{QI42jzJZ{
zs0DM5Wkl`RyXn`-V_%LQ`dQudvY_Wj(d_R<OTXrB_?oo$%d86@VQT-^R?H|!pLuN0
zgUfrLpF8mK=J9vy7rvM=<I|MoKl(TQ?%4OY?fAdS%m4dseER?Y|C1+AruWXfeE919
z!?zaXFTcC*@#E94pPc!&ec_#Lo4#z>^MBdt|I@Gj?Z5N4=l=i8-~Vr1wR}or%c`E~
z7nkhck-z-v<l`^*y?%P(*{%K0PV9Mi_{jGy*MF|K^MCHcf0Lg5U;q01%#QSB?FH-F
z>-V*^9<P~kxn#lpRY$*l{rUOBr#n~gT)+G1?9-1s-~QV4;s1&ce-^&~zhq+Cwn<6*
zCud!lQhvX`<KDy>AD=$myKmRWr%yk9dH3b#lY76PT=@Or@SopXe*atb``?D{!sG2J
z=h~C*bfms$E&o{8@#nzlXZP;kx_$lkhZny;Kl}XS<&F0bFMN4-^6R%f-~Jq$GvQoQ
z&c(*0XEm`OO0s@r*E~(C{eSSx-}5Ja9^LW($@M><pMLuG`sS-==ij|O|MC0(|NpO*
zmOm)Ud7G8+J1Oy3V%Gn(^8fW6f9Li8-#Y*Q;k93{9Q^<O@rMtuUVi!X>HClW|Nq};
zo$@@l{!3EHkJyxd=?VXeQvWxX{hrzQf7PV_+h_efwBqBL9k1_Rd~oaX|NsAg{r?M!
zxUHu?CN%s{D*2zE{-ZqRe_PuB=|%sRHT_%H`Df>h-$z#dd~gAz3<-Z<wC!6~_3z^R
z|5a)K+hhMtOaHg1{NLJ!U)v^sIkyK%Au99CnTK;Gy_!<<d{*V__1%B3f>i$b{~N9d
E0KsZW^#A|>

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/accuraterip.jpg b/CUETools/Resources/accuraterip.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2fa49f1b8df7702cb233781081e17d7b315c3945
GIT binary patch
literal 10819
zcmex=<NpH&0WUXCHwH#VMg|WC4+e(+w;7xnm>59-L^6Q@3p0phWnp1vVPj=u17mhh
z4mNg9b~ZK+ZVpZ^5Mblr=Hcez0dYWvFoN_jF|jf;vvRSsv4d2QhW{U65aeL+Wo%|<
zRAOKfWMmd({C|W&o`Hdp734ZbMg}NgWMXDvWn<^y<l_E+gkh@y0}~@NGZPClD=P~N
z0|R3%BNH<Niy*6zqM;+3a9|?4QlW@Z<HUs=%1#>(iUwW$pkka<)WpdpCN3c<rK+Z`
zp{ZqJYG!U>Y31zV>gMj@=@lFj8WtWA8I_!pnwFlCnN?g;T2@|BS=HRq+ScCD*)?hM
zl&RCE&zL!D(c&dbmn~nha@D5ITefc7zGLUELx+zXJ$C%W$y1juU%7hi`i+~n9zJ^f
z<mt2LFJ8X-`04YPuiw7^`1uRuFGdDth_^sd0rnZ1zXTbW7@0tEzz*^kBU3p8BNMYA
z3#+0bn~-B5dt#xml2Idvh||P{8xL|S8wY(5O)9#`C8lEXQ1v6oYha%d=dmWTd<ORz
z!e6%-c$gU(m;{*x8SEMU{#n%Z`9H%g?r(E{SpGJu$h2|)7=KhVBhN@DM@jl!-icSr
zJw*<W)f<eAvX`?rAAKe<<Kc%3#VgfQC01{LG2v3~O}R$by7C{t|8WOD=8gL0o!=VI
zUGmrJiltyowz+Ph@%p4tvsLmr+pjJDVE;!{{oAywded^9y+8at;=aZ=;S~R)HN15l
zdz2r0Jp8*hs<3^^vh_b=>(rb39_egnjJ_F?yI-~VOHkK``lkKc&0F^=R92Pu{js|x
zdV7Lc$&Ax^Pkzl|n&0QXw|Yy^Q5$a)A??LIt5=>-z9RL*=CtM+qpp9)#eI+defi6D
zv8|4pId|Xk^KRks{dcUoG}c?Z=F&d1&*D$^$L-BFu@B$3?&q)(U-qN<sMM>orMml8
zueM#fx3$HBzgYXY$lBApl=Lp{nD(6G>dgNPoc(XN{%3HR{&4?4vGV<YnjPd0x>lMW
zdfz)=?A<@3m>Q`cPe1&2xTu%6g>h9y(Qk+A%l7pBaMzz+D%_d-$Z${f+nWW^6%+rx
zJ3sqc2E(E*4I=QPKefNzYS@0nmaENv{GXxwp4?^q<k+*z&aZOIJMpd2bLxIp6UJMC
zag`sIe_Qm!{o~?ezvegCu&&4oj(=H|WB%FnU3X!&%(PFt7wyS4()+kmLZ;+T_JtRy
zHt%`-?eLF-kK}KD{^t8*=EwVo!pyc?EpN7AU7cN3y7$w@w#c_RPiKlbED>5dfw_s#
z_{91{^*_4fzy18ru*mSk>HiF@-}nES>>z*Pujr@me*`~&yYOTE@4A0Sr1amKe(XQ|
z%WmfCtY60#=S|xs5~RW;UES8|A!Kdl>2}`qD=&jcpeq~~-j}yC`ceNt{7`N3qxl_|
z&$Rn)Q{yhU?R(^S$0PP_&lJ)(oLqn8{4M!M@B8a4eti4S@W{Tuv{LUY_f1Y_^%Tze
z(=-m+YiT^-e;vPQ|A)x;qW50T=h~zEP(qK(c~y4s*#gD`^=hWK_#f-lbN%_S;lq@u
z#Xl!|&6(G7{oOx-N1yIYpDh`vpJ|@`H856u_0{i}H-4_1R~gLR^=mEb`^@^8M}Me2
zdi6LkBHxJb9pn1tcDz4A*IzQ)IEl|Xto=>$Z=D*uAKj0m-<BWSw&>S&=Pi+!eS1&*
zcIoj5C~#EBwJBE#zxJPjbr1W8=f|s#9-R`;`?jRx%acgKH<Od*&z6>NJYRp{%lci9
z*NYm(=$R(0JmeSV=NonE)yu4RU+#ZZTIcC5>=+s^ef7@MeZqgFu9;p5+p_t#z=6ys
z5`q8hTWfVc%+>!Rko2MS+sbdNBgM_u+%eI;TR4ALbs+E5rE7O(-V$~e$uMhkFks)X
z^39eC9kuBFHj<%-^VH{D|I{yC(dxD|{H<K)+rOo@I+Jym%O-xGdpG>*)>w0=OY2Ja
zCjHXRwze*x_v%?W*F?9j$hn;l7#LN4an1E}STFH+>3a1as~_`<e~Y@9lFYZNd)1Fy
z9w(V(l`IW57|Om&4QeR&c=qLB^Hu5J#y7I!Ecafw&#V`TIL-RJH>LZx)UBr;lTN$0
z7i{ThVhlQXFD-`0<haeXsmtFgKJ32V^Y%lZv}IlNPm_-;o>cl)O*>h1?eX7*!fk)}
z7p{9A;eFTqaJk`+qKi_Gq|L+v<V1GFPpxe$j5qjEet4dR9q)(ZhfnJ_&NJEiQLq0o
z$JW>PC0>PnbGr8G>r?ye;!RJNMBKAfah3Mu5|R7D_{x53@qFf6Ka#&SH{{B(U0=N8
zY6`o=W%a*DZ>qCD^|*i5?qc}1aQjE|`Cir;e%Sk;p>^x&kXe_5Hch(sN<60BJ!lQb
zFR91&$?t_<&6<DkMh*X?=xwtjKZL&7CwEoO?evM<4I56~e6G*f`Ki)+^SuV^{|r(U
z*ALC-+oNCk*kAhfwO?t|mmf*ly?0mbitY>5lROzTPO3C8s_j{K`CIpo=Z_z3zt3);
zCb{IY3j4{cd-5L{F5z^~6ykWWW6Js(t7G+Z!#`eKA}_r^>vcTCs|MeP{~6k)T=%W7
zO*?LQH|u+@!uET6`6u$YIbIRl8GO(&_W05K&RzM3`gzng+f6O3FD)&Xoi}x9<lE2r
zc}pz%RPH#i%v&;tfzyVI;c42B{@)od15K{mZ$95x>Ud0f!;kJ_=Jhcj)#e=BT`zP!
z^n>_gll@YEbnDl=l4INV;n~6^ugk5%mM^(~=cuu(jSgdK#f;U9nI!$$*{8C1J#qNE
zEAL{dcRl|f!>vLZg-c>zi=S1g{Kqy|_tZPtQwt?uPCQ#EW%{4t`2CxYAN*%Hy1&ED
z=0jWe(jVPN=9%{HkxyOr+U?ifXS=p<+SC<$RwlQxaGz7FXxGA*b1twitN8qF-sLa(
z5_fA%f5d+H&k+9cc*mLoQ*B?_M_sr5iWoz8?ws1>c0`~|?>ocu-1Org*}q-h$6YRd
zz@8yeJvg)YBj2k?{;Su0x%e-b+4`2uXRQ-{A<z0xF5-u_3$OBF`I#%?{fbTBp02rc
z$Lnt7-IGcF#W9Qi1pavbF+TLlqQCQNv>)EsQmgjMTXT=|qt!pB>b*-&+N8S2K-pN!
z;MTb}%{Cf2G7Ne%e|!CjykMvFqxgWllzsY?3y(kgEx9I@wt2yiZMJ?l)dlt}@KR~I
z=fa}Q5Gp-y$6Ec4`CGz!{^)<4_WHs7Mmxq=|1@`O{BU&I*2)#PUW-k;aBO<G_yiRP
zpNBIKZZ1=oIK1BSoW*_N3jS}0K9(P;Z{Pgm@j*M*otL)oOR6ni@#+_UN1j-OLUiVZ
z`J2z@?e5GJNla0nRCu)Hp75M||8C9~Nd4^H9nbos>iWd*9J2$b=l^p(|A(tV^Hu%U
z^dslFv;WCmwkiCr{rXnw@(vrv+$GBv>{Hk<H+RX537d>mW_R_Zyghk5>ur68ey{w8
zMK!GQJqtg?zVFD(EA6&5JMDS-ol=+QvmG;&;^&2hGNh}kFR(aUWWOc$@X3$-5A}LB
zwu{RPObQP&GCP`Hbo1qn2UqTIv)#Gpf(>U1gI)fSzw%n{v1^t8GrZZt;Q!mPrh0qp
z^U2?Au6<iHE&s==FYg-C|5XL|zfESDziI09w~px_wnt34KilKMhwZo4UVDFT$Ns*P
z0Vm>5J$%9wU1rwYSF!H>vFR(9{jd+cBD+E1^75iuLusiG-Fp>H>VK%cZ+x5NU~|Jp
zzUW}MMCR65yR^SC7ud`GGsy3=R}#11cx^|4apR-C*8ds$LV3-<b^l#dQ_JG{;r6!(
zGb0_XQtf`}A9HmUZJ+YBOEH)CaE##HeXdUuwp)CC+*2GEzxGe{$GFvxc-;@%Gu!dS
zR~-COxu-Ymuc?I2nuqiEXzLu|RAJ~n=y-dM5WfiH-rv@LGOqtK_+zx|<NRJ5@!SPj
zR(YFOWbW#lpS()?hVw0-k0ujOU37_z&U?VcWZYLc`Ph&6Z##a>{uqDgTAaZT?cbWO
zzuzibo-2E9_KJ$d(OWMq*wK2$$bu_<rX#z}5iR-F`P}=gWB;9=FIdCBrXuh3Avx`j
zw$D4BeE4E6wd$^G#`mV+T%AqP&l}!Jw4P?LO55>s%gTTJ71`b&#E;kCzV7ki%Pzn9
z`T6qgd!(1&zU8A7!o_wns=EC_!6|XOrUqNxJ>|c%V&u0tf3SY|bW?%rmi+?ys`*Ec
z&00MFd&T!vm+G#@8UCoWGJh-oLGSgUS=pZ3{DofJy7cN+?1l$y^Zd0W7s{<kyuq&8
zT2#-y$JuW6M{O_vW;>%F6W70Z^vM71@Ba+q2Ob?bxZ$nAmW#@p-yJjKNw$0&cmMHj
zX<qMxR(so)=S;eNcA4Mg<4R8>eR3zbFVkRVf1Li7QT~whey*3Z+z;1gADuo=@5+)b
zmvgspz7<b9Ay=%u_sm7Tvn!8X@>D6jx1m10zv)+fbFPi!qyG$oKZFh)kN)W2wSMdD
zL)RwEZu$J=&PwHD5yn~#oILKb+2{W-Kj80;)A_;pf&aKXZ_Xa;di$0y9}8DRSIm#v
zu~{hEw)vp^ln=N4A{$a3HudoDou_@fPVkTOwjXOheE0kKbnWz;*M7<ywBHe(dQ+OE
zapF`93rUGb4Ho;wGxu5kDF5wn=TG{F>xXrNkD5*YC)n&^W@UPINzj3hcTVbkGdFfw
z>QPhRd1Bq^2ja(0^Y_>DxgXJv=gg{NyX*Do*mIw2am+SCxBWhx+;LE4;>4YtEQSyI
z=4#KpzE8U*;`%?;?EO6ZxPK@gw(33K_Eu-v)u$izJN0rH#GR5Q`cG`$asS`a&vSP?
zURyc&hxDWLmVcr@?7w+@oVIw`t?YT$ALUloK3e|a+(Mm;u1mVxckJl1OzD#3`>11J
z{3iJKwd2VSa{Vj+UHv{!^Q!uV{|xE!t>*izt0Q~DtxjGM_rLhKpdci6m*te^iN9Ao
zVd(Q%n%`l+Z3)A@?FaPRKQA-VN&3-UwuwLA;AN}le};yh-{GN;Ds}$}*J$sXeV|Ub
z&v9|4UddUda|T^U1>W>JNH8~OAJX|}Rx$6Gw{5!X-^F@0fse#?Zx_GE*MD$x^o>(%
zwboobXzU>CrEC~huDGp;?Hz+{^1=G8x^u60>+F;LllY@_)erI5D=C7RovXZMzFD>G
z|9tM=E9I>-zPStTE{l3qXIB$_X&=KMu8+%)*H(M&*thY6f6G?gs&B_GPVp`jox5f_
zzm%8)TWU|^JR`TP^+(UQ?P5RrpP}v7^d=kE>>2OZ@=w;9v?<z$EqRui%;LqZsfkTo
zP1=X+GwkJF#|zd!=>5+i`X~6&$|JKD*Km9cUANp&`TKT*m*o?z=QZn`h-Tg$z<zB0
zNAcrt=Kp7KTl`V@KLhg``yWrEer)~Ez@A-qMo#QU{-W&v3|#*i(&L4GbRXHZb@$oI
z1zA={%mQ9|sgwko9#Xk|x2c_@!|j@6LdE*$&-QiyZLxnaO@5pCACaWkpy%K6Kk$f4
zg>`GR2VdWs{dDW5wxoqEcFDCr%_fwsP+{Uc=E_j_@eluhhNg9Y^!_t6HP#<g`Da{r
z^*@7@eR}j=?L+tEn<GAa@3xU&R?!oCcEv4j?(*5E<{agp7H55Sf#9(_?<^mG>i#G7
z`XBGh{|rmAYl8kW96G1}&ptlA#`16L{*3<&Kh&205s?12@Q3|x_sEw4_p`Q_TP>UM
z%Wm2Bz>};;_s!4pRA5?OqLR?{M_~c~tJD8D)jzKP7PtRDLsQzz{o?!6`dfCrZ~7<m
z;&9Z?Ef-9ykM7#toBK|!y6v7s+nv{n%yw5ll^==!VSV_U=S821H3omD|EXPnV&;us
zYv0bBD?C4Gtu^CUpWor@|1%s^*wV4b^gjdJzZ;d!Nv9vk3&(Cep2_=o@~`Wk?H%N|
zh2Q^Bv2MZVbf5nWP4$Om>L&m3)~h#MzP5_}p#Bf*<KN0Y`mJZ1{_*v<(2w>l3DaEN
zuY9pBla148wAsDbHSeK&j7IUB?1%4vsM-IKzWvesAD8EElkIP{m;Jjq%f5My+O>6C
z-rD=^{_th{B)^1PQf{f!47wt_dh+Zw*H8V=kl%m9|FQia;qBkr_WYgu&s=xT^^cM6
z^~<tmWp9qo3JWq`Q!XgR*q|%Dk|o8+;H`uFwf;9>f4lyX_`9l3^yPi2I;M(Gr;o(R
zTsbKA{agO`nB)?_<<I(DPn<GfNx!!{>t8|rgX{kpZW|xH&sv|?VV`EbH!bYL_9MSD
z7v<VMwTp?GBCuzp-{J*H6L$$&H7(w-{>85bE{#PEcA&sG_($`~pW@#Zkw2chZ_iZw
zFl~+AI#FSjXs>-S?N=De4F5Bf?bH6S{>{S2x%m$te0<mXSXS+8$|iHMYtvlsE<JG4
z_XvaZisLpP<JZ;c`SZuWFt5_@(pk83!=7yw`nu~xjJ&0p)~w+Va8%l_U#Iy){n&qo
z4dq9<?-oCtdbpzh;k}hbv0pwK8r|smdrju879UHqVuSQf(fh6E3oTtj7X7{YLvEkr
zqz9jUjvl`o8oT!FqN%%LzrMZmdVgYl>pt5LW^49~?r|(Ooqfmg>FrD*CYFiw%6*o9
zIP_IE`$fKV-9_>8UmHHOP1<lI`S`b%4dr<!EdTsx(E6xr{_WHc<KhRMdpsZhXAsoB
z|C9aAuh=80X`eYB7(7W3KFKaqx{mqae9^TnXRC`VQf6gxpH?>4Ir3!kkL%|@hIdp*
zP5yRORnqTT*tX8xzs6tZ>~DCLCOo$$R?g$F%dD;c8P453ziE%<<4xOM@5-4|bv^W9
zZ&AHqcG#~Ro#-=#`(>vT`9F=<{gM9Y@0`Yfn8ryAKUcpv-!RYegWuGgymh7-=~wg^
zcn%&ET>stutLcw@ToU(8&Rxko`dec6xmca8PyJU{M=yJR{-YYV-U$thW2f>T_Q%J&
zR6Xyj$$ogg?H|vTKb4Q(I_8#~l{@CW`sRsqH!gZwFi%VFVX#zburz&kf3tpzjk8?u
z%0G!eT9-@L3s*e)kY&}nWrl8Y{`TCh^Xgwti4J+(bhN+f(f(}x-Z;i9b~+Wt59arL
z&7N(`eCj_#%j6@)+?-FlUMfyeUAipUjdxdSrKIPB=ymSrcuQ{Ge|z+|dB!Z&Yb*aV
zaLzrm=-SOEpAs+X-MpVQd8<SBq{0L1@A;oT`=3FqCjUxKO>Xsv&kv6u`Wt>sYTMLw
z)@$qYm&Hd#ubt!*<0AVmwb$Ex+7k_xhehs6EBm|m%X2dPJ8q}OY%~9dSBanfr=n$l
zr`l+)t_Xj)`N#R=VQbktYtn0eJ=@E(SSWhWsePfltB-OWmz3?A^=0zfo6Y|=)>|<=
ztCOhly0}mCNA4fTB~j;du6^Hp^L}J3<Fnf_PES>Ow@osVkaJY%5j?m~?U3__+28gU
zrl(E(XzhA1u3K(>0w?dwnQP}Z+WOy27CmErbUxF+v-7vC@3FCe-2L-SiNEBns2}Za
zJG=enMbuqm+_tA>OV$Cqq_!YFBlX7%*YMw3{B79}#dUv-<@7(8cQ4!hQM|>Jqx3G{
zEnB(QrDwLi-TC(5r#_n-e@<+^eda7fmHJ_(9Q*A3-Lq03iOl+R-*Nv|-m7oV&TKIF
zDwiVEzry4{!>z`6w>=;9kIcTP|INR3Pon6%?J5CV+N9IkB6^mF2!%?ysxvoEzBT`2
z@S%HZA8r3LwAE*=Z<y9uy*m0uqu!S6HMh-nFYys8ZJ5q{dY+l;BmM>{Pm#CxJes}#
zZnaOhzHw~s<NZ?354FFsreCtjl)Rkg_TqHsq16wbq<YGIVZ3v<?qdDsztbk|dVBvk
zKgaR3(^GcV3*KhQUwHrIH<{~G|6TmgAo5T4PsR_%g*9P6q947s%|CoA{z$Ll`ci2(
zy9mMfB|>}-zc*R1Zx?0#&v2~%hk9Q7%9HCe_bL7;E?>1F&3W<R+|p8QzJk?Un>YUA
z`5axpS^O|Rf5q!>X4^m1_w6y%-MYT#?N{!-!TviM7ffY+dSnyx)`pBFTqh1ZFxtT0
zq``dssa)x9mi#^KEY)3~<Zq@wN^h`}ud$M6x2b-tYwq@uzrB?E#`-l|t6#i*GFR?Z
zq|if_mdc5{cFjGkY$KP|-d1Pv`ai?wqif=M>$5oW1$C4KU+%NrzOgdL)I+>=Qd*Dv
zrZWsbuO5i`w4_Pvcz1mU{|)Km-zMJuar@Ew!@fxt$CCbCysEQY`+mcbi4L;=`hWZU
zJHJoqM|0|j)radPYV243Xb$X4-+bBRuB)D$BiH-MGfr!0?U~?VvCjRW>2BZOL4T63
zoMh2`*O|54*6ig(&;E1q*LJ*b`=|WF{A2RB)gOB9GwHs0dZ9-3VQ$#B=Ybc$EbBY{
zR@ij!mO`CVP3A@Y+KHYP&e8V_uWem_bNA!>9skrTx?T2Ou@QVcWz)3xA(wUIDovt)
zSBTx{eB=;)Vv<V7nl6s8a2}Cd9mb`<J*|F}AHC0Cr;$})ohc{%QD@R?;U)U&HxsAb
zifB2apq{l^&ySB$eQWxU`H%G5{xf9Scg1mE_$T}-f7Oe9Qde(BUH@94RJt|XW1fZX
z;SG#W^c8b>T0<-kDqAyuyYP3S-j~N!{~5N#H}$9%o!0NrJzUE*?Og4~2>;(Xf21!h
z+rEF}1=Fb?&Yt~s^XQ`$C7P{MHcv^vEqCS4>#cq%+?ywur(9q!{q2^O?)HQEacqPc
z@AlU9OU^G-D2^-sSask>@i)64=?|_;duPoP*l_D`=9%JXGsD-v*G--HJFxEhe1<>H
zzs)P&J6-sbSX^3N`B3{uZtjAMdN-d=Tu`uTf$Jnsg`{2bw{AyY`eXQ^{NcW}kJNT_
zojQL!O8EXs-Z_(I1O}c=4+%Qx$gD0?=pc7;eeBk@_Uf9siCZQ){?N3)v}68_T?g0N
zr^$1~oe5li<;&%jv0kg2Ri^7*Ha1`R^Mn7^;(5A%x7eq9?$KO%H2?9;IJe8sIJy_d
zPC9bz2J`pO>;Fzp<mSIw{_u{_nibCvMy2%2e3)^U`_{3ek<n9?EfhW(o@FTh&mh0Y
z`?0?4pOB0D)8ZK`roDEFek<pjestH_<~KW={e&tFZy)-bJSmf<`Hak}Lq85GbRKWq
z$N2BG9Y=1o!;jMJyk!rST{mqIj(a5@v?C<;xW3N1Cp;TfCQr(metfO|5qX|{hA;jz
zZ28a7Zev@#`sIfg{tGKk9rtTpy31SN`drg1jpIffvCr;xe-@oFaqbMudxn3P{AWnE
z@3s?_O56O~^+(nb*FxDdM)HErndRv=Ig&CuJyPaDR)V)#0$6|4S=7W|-s8G(f1e$<
z^TS@@*lUk2efjbJ>yBqvQm46;3rQq|^;sNRc<yES^WMF$cl<cNa<2G8{w~vk+jVCj
z{yu5^vLoX9ajE>HvS#`{v&xU=#y>vZWfT6u|3~D+%w4Ac7M-omm5$5|7dl%gxxGgt
zQf-%Dx`b|)<@&_GOZVr*H{4qP=JVrP<HPs#ckbS|<HOo7Wn~vKw&#30als-qK<UXO
z2NA~C^$bb5_TM5tgs3oF_`&SQp0BKQ%<8#)l6PkAe}<Izj5d$?3m@*Tp7yiw%<5<9
zvirVP@waY~j`%0~a-Y!b8OPfnZca2Rm2>c)QEwP0`9b(w$B*g{>JP6?{2=|U?W67f
zmeT(WT#?HrKl{<R?{x0UqYR%O@7zA~qfFO}RX2FNp0hQW|6zSJpW~0!-<AKgvg`$H
zf|qBkUYQxivduVaS4-GS8^fiKHaaWwye%r1yFLBd{73Rq70yTHx0WBym#T<9VpX?s
z@vC_}A6ci(UHx+U#yim`3%~W+Id!U}td`wy`oez(#x?J|?YAs{W4`{y=GY&TAIUe`
zcvt7<DrbHxJfFY9?-HwOn8oF4F_i*_lPm0G{+$c|b^cB1hxa}o=3ICor}N?K9I1DW
zwnrEC>aJJgHJSGL7(=4;n)4#f(rv{(>ok}z?X&x_{m4F+AMR^@>_1f2Z~AP0p4x2@
zyW};F?XzCZKXzK~8TXwA?I|DrGaTmcv(vq}c8~AF`rESlTYleYxi-CQp3tU>C(b9d
z4tx&C{LipW{qTPVe)s<j9Pi(XCfYZc&iKzzTF%~~tet9HqRV>EW@X@RnKtEBeN&HS
zm&JeZ&KG!P{G;jpvHN_A^Imq}we9bGuua(9Qg5Tz!hZD?3-~4<7ppV>QCywA=#K-a
zTa@uj_1?;2(RFjvSH754A{^_h(=AeXtncC6nKwfi_&k|*^55QmU_#xw_z&*&J$B6X
zLjJ4v_8(eX#Q8OP#w1I<WxKi(&Yjw?^>mpHpSF1T<^9R}B0m-%sOPm$eb4iw?A@#S
zj#;tamah1b>?XW)k6BRd_L}R43qwywFKRk_GBJAphnU1i((8Yyx*yZkKV+r*Zt03w
zQoMVYZk;wa=d-W=%<8-~q5@*}ipd9FXfXe@U;iroAMcAFrHlXA{AXzLuQB>}dQ+dK
z>506r**66lGMCPJ=Df52qrk!t;hPRGw13X}&(N0tcai;zrXQF8GjL|_|7RY5<@q1M
zYWJ&q?Ef>c?EYc6@bxXzd-JQaA96h2wRzvRjMUB}{S!_c5U5+!V7dN>{=J=Yt^XNV
zdVU-`t9E_&rJS{kzU!}uX0m@j_v)Wj;a|T0XJA*k{bPUVe}<-*iuS{H93Sp2T^;x8
zp6aEyz4N9fs~%Y^KPM%5lYt-G!O30!^6VeZ{?Cxn|4U(?$$y4JQSbjV^j={9QvO>Y
zZhh1K2X{{A3#2G){yTr`>qj?Vc5Cl6{uTaNG5%72%k=0U>Hitnj>O;mG2MIT<@L#b
z=Wf;Z?)E+rrJ0oZc3FG2a>B~L&z;Yk{<$8&{>AY>1KZBJ>+!6m`8Op0Go;(5AKw)=
z^U-{^irE3va`glE^+~30-ceXE-LOr$C~uOB#f#+U3_brU|1%ss^PgdB|DpO@?f<wK
z6B9oaA1SLkH~T?6o8!WJuf7R$Chpk#+xP5|RegJm7R(e@{?UB>#6P{i9roGs?e{rs
zEPp%R{Udul?L&IkmZkeI)%Y%rvOT)8V-nYikIhdFw2I_qH_o{}x5D^<oz;(tk0fd|
zKm2Dncx&0tRWT=oWbHjSOnQ`_RM^nLX>)=7iv0&Ce~#=pqyG#|8~;ddy|}RKH+#pE
zD|&O?1rM`sxnyY9@Ie1+Ykj!r&&2->Y_IDN%IqorE&k$H|J(TAzArozAD<VBsO@+B
z@MlJ5Nv`d-&0CiLNT1Tc#lNe|sOX6Pt6K21Ugh=Uvw6$jAKtXA=Zt*f@BLnX-u!s`
zAiwu=*5nzpo-9m0=3BS&?#<ix+>+-R9Qf7sZ0q`#c_P<3v*(&A`LE()_!G7Fhwn$D
zTOXITyQU@;l^t!U*V>r>Fuzx<d)uv}lkYgkuP?XXY~Jv^=(v0H{9kEW@;_4VGp5_$
z_)vd;V_a&@bd4kD=dI=N{CTu~;``u7eJYEcZyc5kbS-&4b^5Yh@{?wjH~+J|8>{WD
zd)qu`62mXXOM9<>tNq}9>_%yY+$--1jmL_7Ykz0{HmTsd=kR)o^YOpNq8DHMXW;sy
zyNLJOtsF1+MO^QfdQIiZ5_z;(bd%TVckbO`Yoor(yz)HdUv~HQ&&|pYt>SM~6e+Il
zy`+<@dMvA6<i~gKOUX&6C5~@c9j7znM&zcbWf#~Tw4d+qjykqmdsp=I_m{R9Tdfzb
zyI5AHcVc_2@x|5syZ^3u<o@XWe+IerQdj?&KiV7juunx{e$~>#53`Tza~AbqzSm&;
z+wt%6oc#3Ac@NBgACdZ6&-y3q($^WGjXiU!xPExqGyT}@wU<ZCkAH8q{GsUif;W$C
zJac~Hs|@B>bHg9m&h3#tbAZ7%d%~4}h81<M3bs!?tQp5RRdnOe>vJkj{bz`s?60Ks
z^LCtjy?Ix3pv}qNd&?T^HeRe#swgWLijKIonE9}Z7RO)h`hQ}wJG!fVtg5b`wPUTV
zS@m=2e+H>{d3@`?F>l#mox!~S+CHPqX%837OHH*A%@N49_Wv>WVf0L<W%D!Y-!|2^
z)_i>Ya*v<h>{CX`>dUhBH>Z3w+`$&~x7L@THh1Zde+L|duBc>KX=yNjSy4K_tE^0;
z=42bkbJM4C(pKAVw*9@UJ@3b)U!M-#^Q>!M%20K6`B8h$^Y+t9e%nkw|4#gmcIiLO
zOwBa5ABQx4hBGtmv%mb6U(|KQ)1Dc3UuCb{dF_u!$=?Mh=Tu!_zaUhTana>pM8@a&
zj!}U%5gX>+FZNnv_26^7($VTiGfR2W{Puml{qp@I`8Q|g{=EI(LGJd7n#_xDpWcYF
zKM{IX`7!U(kK8hkU(WjJeMI-sN>d)i$&#<nmi=eoHMuWvV%6pRKN-v~O@6fJDc!rw
z$G*1s*Y+d%+_!g|Y!hqkSD7LHN4w+d!mDp{__%BDM}6v-y#Hh3^3<M_*BWeJ#rH|c
zE~)d0^HQ4A63W1TXzubqB^UElIHc_MHSP1ivh-s%bF=ybU-h>6M;HBduH13rl`li>
zqWz+8<8Gf5{`Pg9__6(RCDEBSyB~@y^k)j??LW7pR*1JOSDAmmb@la0HPIJsLRBA2
z*qo^|Vf+%_^3Sp&@7q%!v1zLg?nrHQlwVq<yZ&gj`?k+MfA?lT(r>eJ?^?7s-ule3
z_f_9|cfE-UW2|}m)r9f&t@FonMfVq0Bu#XDm=bXK>ng*Vun%+QbW8jH{;>aHyh+8n
zdeOfdn<{6V&$(<e?W1?X#>tc4JIF_7>=!L5E##f$Dv-CxlzaZE-Lb+)zU`W$aN@v9
znRhSa)hev?1!gb#%>7vT+TLlmYV%GXxISHM;hEKWw+*jbEZ`5BeRLo9_F|du*Rl?;
zP|XZJUMJvsTW)h6!<$W9f2x1Hd{lqi>G31e-xbBb19NM>eL7_PSaN;Y-|l}b|1QOg
zmK@vv@q3s4+Om0Ko)T#d_AaxJ-jmw7Wzs|ag;SMdHr(N@Y}@}ku}12{x20+`tE=-=
zdN&--x^7td!Ty*%w+;Ksd(P|c#QEgLCrwwMBlTz7kK+&eZ%vN)(OO@fy!if%Sr4~O
zkY1L-{7(Oe&i%KF5AKWAA5^w8iLD6x8F7AL)Xif8eKogVrzHMosM#F;=}+Dw*_gW0
zzkC(p-;_Rvzm5FO_G9}4|D*pI#Ixe0w_lybx%`Um+H0O7&Pu05v_Ce5gg;?FuKz<#
zy?LM9ABVjk_H}+Nj@r|9E2!IKTHwkY`7DNi?e!0O_9=hJoBN-EW!(?uW%shgj?8C{
z-m}re@#oALbDF=dU#hcpf16av+w$edm)<^gTvx^5Sdafsru}mE52js@v-xoTP%i(&
z&}-{g-p#C&zkKQ3x!?(2`hM)pYpbTebzfCevMJTS^>S9r<2hmr_^+Ji7tW}fd34%R
zk$I;cT>aoE$+lnZKSPSYP~9E=$K4)Vr|!#kw)(lR*xaY<um6YSto(<k)2^}U@i?FP
z^{Bx#V^J4_1`I1Jiv&7I{Cd`-zgX+^wH>+n4^6i%)l6@Y`5nGOlzqinlY@em8unTY
zpJwwn?n=qu`BwPf&$Y%M@;wdS{#Gja_qIx-&+sDqQ@5*ML>Qk~%|GC)R>{q6@}FT}
zR;>Jkz4PWgIG(fk#n#ts8s|ggrz$il6bS^d&yD+|vvp_lX#?itOA~xQ$Q@jEFIQaU
zKSSBx>8HAXH-B1U_F?kerUskCo<E$kQyX-TKaFO8cz3ts)1TUxFYPX5@xI7vecHir
zOI--#lU>&jT1&s=-nwYce}>HgFXyx9<jNS`S}*_R`uZ73%F?XrHy8eUuz*kK@WZ2f
z_awR~FJBsR-A?3ImPY8>EB{1aJkmJsA|kQaW{Uh&hKiLxxDz(#i*^5JsJYtyLp|-{
z&-!%v?`Ny|L1rv|bKyTjK>&MC^dGhjk=y@HtoqMTw(a2$=d=kN|IS&J9IZ;&-Xilx
zWM4@99gtyv&mY*$x%@Nls{ai4P4_>%-x?N`)v)c9;oG?8Cr7WJmY=HO635iV@VL~U
zA^OgN;FEFlrk>2IXIZmuiQcuv|9-BI*I3@PXjbk+b!%3Jip75zF5mPt>#Bbs^49(V
z+kBRL37cb{|K9r6KCS(CQ)51d<qZwy^I!fmv~DZ=b}wLifZ=7)&PVc%Rb|Vb&N}OV
zHT$|th6RVcmRp<ItEL8<Y_}hr%Og(6=3Gel7WG2<VeHK9pZ1;GYpZ>cb&taHgr%Pr
z{d@3d1@m!J`9?Ewq3PM7&;QQSwPTHNZqgP1_j7%cflJi_Sa{6JjOWOCtHPr@y+7-X
zNk3Oq)WIj7T$?5~EeU(jWq6U*g29T5;lT8V{f*Cyb?(V*O|$iE37a<Y;ah2^o})`M
zKRPYnlEE6gs6lzxmhF36*S<>%cazXMtZ+?bKKCDP?U^bc?ygL#R1=K;62NY~_K(Gf
ze@h>p?&rG|>CO@^I5kl!dBxG1-H-ZzsKg&UFOoeuyZpjpPm|UeQ@^j@sIh=w`UmrG
z=^B$C(o1CZy)Gpb_!T9IzSvY_@WEtx$voL@`D>K6zgWPt*7%^E_{IBYE^o=M=wIc+
Un$;kZ=*B7%!00Lx!2bUx01@YV7ytkO

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/accuraterip_16.bmp b/CUETools/Resources/accuraterip_16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..104e197a1291899453aeb43e91a01a132db6c524
GIT binary patch
literal 822
zcmZ?rHDhJ~12YB&1`P%V1_3B$WRL)hGeG4b90>XU|Nk93b}U}JxWB)@t+lhEsi~@=
zzM`(Ry1Ko-uA!;1wxzMQt+}<kw|DxCY5!qh&6+i{X3c79Tb!1^IWpr&Xwj9R+H;{z
zXX4ur<~7ak?dzI3eL74nlwP#*R9M3H;Ixy$*|&X5Uij5L_vwBbFzIo`{QI42jzJZ{
zs0DM5Wkl`RyXn`-V_%LQ`dQudvY_Wj(d_R<OTXrB_?oo$%d86@VQT-^R?H|!pLuN0
zgUfrLpF8mK=J9vy7rvM=<I|MoKl(TQ?%4OY?fAdS%m4dseER?Y|C1+AruWXfeE919
z!?zaXFTcC*@#E94pPc!&ec_#Lo4#z>^MBdt|I@Gj?Z5N4=l=i8-~Vr1wR}or%c`E~
z7nkhck-z-v<l`^*y?%P(*{%K0PV9Mi_{jGy*MF|K^MCHcf0Lg5U;q01%#QSB?FH-F
z>-V*^9<P~kxn#lpRY$*l{rUOBr#n~gT)+G1?9-1s-~QV4;s1&ce-^&~zhq+Cwn<6*
zCud!lQhvX`<KDy>AD=$myKmRWr%yk9dH3b#lY76PT=@Or@SopXe*atb``?D{!sG2J
z=h~C*bfms$E&o{8@#nzlXZP;kx_$lkhZny;Kl}XS<&F0bFMN4-^6R%f-~Jq$GvQoQ
z&c(*0XEm`OO0s@r*E~(C{eSSx-}5Ja9^LW($@M><pMLuG`sS-==ij|O|MC0(|NpO*
zmOm)Ud7G8+J1Oy3V%Gn(^8fW6f9Li8-#Y*Q;k93{9Q^<O@rMtuUVi!X>HClW|Nq};
zo$@@l{!3EHkJyxd=?VXeQvWxX{hrzQf7PV_+h_efwBqBL9k1_Rd~oaX|NsAg{r?M!
zxUHu?CN%s{D*2zE{-ZqRe_PuB=|%sRHT_%H`Df>h-$z#dd~gAz3<-Z<wC!6~_3z^R
z|5a)K+hhMtOaHg1{NLJ!U)v^sIkyK%Au99CnTK;Gy_!<<d{*V__1%B3f>i$b{~N9d
E0KsZW^#A|>

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/cd.ico b/CUETools/Resources/cd.ico
new file mode 100644
index 0000000000000000000000000000000000000000..494ff70cafdf60b720278ee9fbba97e6d652dbac
GIT binary patch
literal 1406
zcmZQzU}Ruq5D;KsU|`^2$Y5n)5My9q&|qL-00}8DfaEzqk{||z29b<l2@s2cfuRA6
z7#bQtECvwS(7?cO;J^Wf19uKEd^oj?frW*IfrEpCfrp2OK~PYTK}<}HK}JS~K}ku8
zK~qzcAv83U!PnQ9!O6*q!P3%_p`qqKLqNcPhRF=q82-OG!*J}{dxmSzpEFEYxt4)}
z!I*)8A&r57VI~6u!x;$I*qDLAIE{h9cqRjbF-Yt`L`j-414CLG14G(O28OgV3=C=i
zA=+jdGce3dV_=v$lYwF883u-#|G`EvoH1r#IFrV}aAqb0!<jP-3}^l`F#JzrVE8|i
zf#Lrdu+7E{AehEr%rKL|m;ogAp8;&Wu`z?OaT<fM@k|C|<1-A##{VHsN;76KPD^7j
zPMgVKoOXu6IPE{gnKO+UjAy1X7|)!^U_A2-gYnG&5T~CpW-vaJ#$bGACWG;rGYrOO
z{xcZ=H)b&YpT=PPe<p)5$Q}RxgF^u1iZligoXL>JaE2j`;Xeb|%f`kGX~t;`X~r`d
z(u~hAq#6H*1VfrJLt0uILt5HQhP1RZkYJf<%#b!SjUjF3Oop_XAhG|DpgLpBkalJ!
zL)w`$3~6WngM%*ZzcEAF|CtPF|IaX-VffGRpWzH72#selK;Rj0tjsh9g-#m7Ok)uL
zKP0Hrj2UJcr!mY-o5?UU?F_?A<NpjZXBsoioSDWjbLLEjnKMCV{f9&c*zPojnP+A)
z%sg|3Vdk0t;3%5;-<V<MnKXu(|7SAH{C|dF=6{e2Kv4>c2~Y^kWB|Dg6uoDRjTz1u
zr!kx{p2={=_zc4t<NuJT1-T<Fjp0n%OolTccclG?ME6W%hBGtM7|zU`$#7=o8HO`6
z|3i|%8DoYsXVMtXoSDgR=FAy}GiUyTlf@a3TmGjpocTYK;S4A|z-}=H#Q?*929TW$
z4F8Rd8U7omG5j~4$?)I!48wop|B&RAX3TIVEsf!S+DwN3X=fPDr2U5^v6;pU|7WH#
z{GU0K;s4At4F6~T2PHd(|7VOD{+~%>_<v?5!~Zj982+F6&+z}hF~gbvX$=4W&t&-j
z{|rM~8Yqs^7}EZO>;Rb!Qj^A@$gq?lK0cnIyu6&Dt*wn=+O%m5r%#_|*tBUA!}aUe
z8SdV_%kcQ|V}@6+UNL<9_>tkqj~@&le*b4!vS0y211KXifbswX0|Urh5Cw{NkkJ4C
z3|t`a8Vo=zFn-Mm2Cu;!uGf3OJWfu|Jzx<ymy>f37Z(>)F+|O4R4ymyYZPfJ@KG%Q
vIS9=?8198T5u_OEC4_%}$TKi};Adbszzo3+pmGsfDxy;$IhZ<-9*|xDK&!VJ

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/flac.ico b/CUETools/Resources/flac.ico
new file mode 100644
index 0000000000000000000000000000000000000000..594fe38a4b7fe7cba2cb525adc19f3a2e9090e84
GIT binary patch
literal 1406
zcmZQzU}Ruq5D);-91Iz(3=Con3=A3!3=9Gc3=9ek5OD@P!1BHmLsV!G1H-&I3=9lQ
z88{3C7^-Wl8LBI*8H!7b8Hx*w8M1S;8L~688KPpN7@{Jh7=l8B7`%MF820Yk%b=Jm
z!LW7PR)(#cwlb_;x0Zo{VJpMhRcjfRE?dgL!0?}8&a62M3>umYQ>IN}m@;V!Lr-51
z1A~DfgM^AA!~g&P85sWmXD~D|WH2-^WVm<x9)qTaCd0MM*BBHP6d5FBBp5ghI2bh7
z88UEaa4;~aFfefNa4;~i;PKF?)MyBdh5%6^pvNF62to|%sv3F>3=BNVjEoG7j0_C2
zYHGX;3=A9)z8-^+f&vGaucOJps?ES4tf0UN=4)v&XlWtwq59$SP`-$Q0vA}llpKSc
z6a#~pf&w>~&&<rg%q*_}2C57k%8H5%ii!+it^$J3q@ti8%%;o0p$zqww1R>V0|SGk
zG7F?6PzLD`V31LkkbtO=R8UZmW)PQQ5mg2QB|b4Reg+kBadr+EP=*->(LoLg0O7Yr
Ac>n+a

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/icon-wv.png b/CUETools/Resources/icon-wv.png
new file mode 100644
index 0000000000000000000000000000000000000000..3916960271881bc2abd0c652745e0b6c71681d41
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU<L+;0|7oEt_%ze42%rSENm=n
z9IR{{?3}#pTzu?Y{OsKP?A!tz+yY!YBHRMvd?K>EqVjxV@&e*Y!ZI2na@wMD+Tw}^
zQYvPWs^)S!jtcs&iu$e!2Cixrfm$}<dQOQ3uBj%z1!n$57J=oKLFIN)&2};Ej`7_t
zDHC1Or@Cj(@W`6!l{3#fcfNPtBHyB={>97uOI8Jxtqv+*8&tk7sB&Fc{m!`dBZ+<I
z68kSC^<PMwa3N{J#pDT>k|thCo_INB@|FMp{|8<Xh+tq~SmNp87*cV|^*lS@Ap;TS
zfX#K@H>=<8-QMVQ>-YVx_^z&{8mGLIR6iUoyR>cYwS}912o!Bmp03iK9`s<sN1;yM
z^nfi)8I8<7600ZP6F;VKVebn@;X_h;bM^;hUiuq*@$X@-8<PZ|R5Yha9h?}R>yhSE
zV5u(6`L&GW{Q{o3!KPL1X)AfZ*1w$lvuHz=i~78X52-zz4))Ir<Dcj=*{do|Q%(%}
Z$6hy4Nz`Spo-ZiOJzf1=);T3K0RZXOmG%Gt

literal 0
HcmV?d00001

diff --git a/CUETools/Resources/wav.bmp b/CUETools/Resources/wav.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..37cadf5fbc962306f99b8d3e8a63a5c45d96d349
GIT binary patch
literal 822
zcmZ?rHDhJ~12YB&1`P%V1_3B$WRL)hGeG4b90>Uz3@V8OV6`BkwYBxbhfg0re*XCB
z^QTW=K7ao5`ODWYU%!3*`u*Ft@87@w`2OQ(Yilb=DH!+n_d^uFx_9Wwxp|LHO!)Zf
z4zl7OKY#W2_k-1fh&glSd;*(%da}u-=?oWp7_KaFhM4^0$Il->fBpRRYtEcGAf;fu
zdi83sGrqo@#qw|-!^2*NQ<WTV?w*7z{`LF!>eZ{kYC*)BHETY9{`%$1*E=)(?oSnd
zIgjDyEYla~H(p=X`SaKBU%!9<{{3gonl&J$V7y_&hA&^fef|3F>$mS89-aMgw)@gD
z>vwlfovq{mDgN{4_n$u-Hf#W^1reJzZGtHN1`dkv-#?#TsQ2^N@9WJ<zd?%s{`vcN
z)22-zrC_{e%a(87zC#rM`1$kmi>o&lC*M2Ld8S+N&mWNDzyJPi*|G(!7DQ~{z8$Xk
z=g(h1KEHmxA@;#y*5{Yz{rUU%@4tV4|NYy(eLF}g81LM<^E)iue*OCW?fs)GP0XK;
zME&^-H5^U-?%lf~f&2>;8h^gNxqoX}&gU0*ASOS3`t1Jw2RnD}1e*;a_Uzg7^Vcs>
zQ2Yi31+uX_ckbK{2FU97?c0Y{@!x;{jvP7i?c2AVJ9pl_dlzIh81LV||2KxozyJLC
j`|sbWQ>S+B-1+$FBd|g!u^%_sw{PFquV10+{{II6I5(26

literal 0
HcmV?d00001

diff --git a/CUETools/frmAbout.resx b/CUETools/frmAbout.resx
index 626368a..9104302 100644
--- a/CUETools/frmAbout.resx
+++ b/CUETools/frmAbout.resx
@@ -265,7 +265,7 @@ hdcd.dll (c) Christopher Key</value>
     <value>CenterParent</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>About CUETools v1.9.5a</value>
+    <value>About CUETools</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmAbout</value>
diff --git a/CUETools/frmBatch.cs b/CUETools/frmBatch.cs
index 0107423..268bc2f 100644
--- a/CUETools/frmBatch.cs
+++ b/CUETools/frmBatch.cs
@@ -19,7 +19,7 @@ namespace JDP
 			_config = new CUEConfig();
 			_cueStyle = CUEStyle.SingleFile;
 			_audioFormat = OutputAudioFormat.WAV;
-			_accurateRip = AccurateRipMode.Verify;
+			_accurateRip = CUEAction.Verify;
 			_batchPaths = new List<string>();
 		}
 
@@ -34,7 +34,7 @@ namespace JDP
 			set { pathIn = value; }
 		}
 
-		public AccurateRipMode AccurateRip
+		public CUEAction AccurateRip
 		{
 			get { return _accurateRip; }
 			set { _accurateRip = value; }
@@ -47,7 +47,7 @@ namespace JDP
 		OutputAudioFormat _audioFormat;
 		string pathIn;
 		string pathOut;
-		AccurateRipMode _accurateRip;
+		CUEAction _accurateRip;
 		bool _reducePriority;
 		bool _lossyWAV;
 		DateTime _startedAt;
@@ -132,8 +132,10 @@ namespace JDP
 				else
 					cueName = Path.GetFileNameWithoutExtension(pathIn) + ".cue";
 
-				bool outputAudio = _accurateRip != AccurateRipMode.Verify && _accurateRip != AccurateRipMode.VerifyPlusCRCs;
+				bool outputAudio = _accurateRip != CUEAction.Verify && _accurateRip != CUEAction.VerifyPlusCRCs;
+				cueSheet.Action = _accurateRip;
 				cueSheet.Open(pathIn);
+				cueSheet.Lookup();
 				if (outputAudio)
 				{
 					bool pathFound = false;
@@ -161,7 +163,6 @@ namespace JDP
 				}
 
 				cueSheet.UsePregapForFirstTrackInSingleFile = false;
-				cueSheet.AccurateRip = _accurateRip;
 				cueSheet.WriteAudioFiles(Path.GetDirectoryName(pathOut), _cueStyle);
 				this.Invoke((MethodInvoker)delegate()
 				{
@@ -176,7 +177,7 @@ namespace JDP
 						textBox1.Text += cueSheet.LOGContents;
 						textBox1.Show();
 					}
-					else if (cueSheet.AccurateRip != AccurateRipMode.None)
+					else if (cueSheet.Action != CUEAction.Convert)
 					{
 						StringWriter sw = new StringWriter();
 						cueSheet.GenerateAccurateRipLog(sw);
@@ -270,7 +271,7 @@ namespace JDP
 			if (_reducePriority)
 				Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;
 
-			if (_accurateRip != AccurateRipMode.Verify && _accurateRip != AccurateRipMode.VerifyPlusCRCs)
+			if (_accurateRip != CUEAction.Verify && _accurateRip != CUEAction.VerifyPlusCRCs)
 				txtOutputFile.Show();
 
 			StartConvert();
diff --git a/CUETools/frmCUETools.Designer.cs b/CUETools/frmCUETools.Designer.cs
index baae51d..277f17e 100644
--- a/CUETools/frmCUETools.Designer.cs
+++ b/CUETools/frmCUETools.Designer.cs
@@ -26,13 +26,8 @@ namespace JDP {
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmCUETools));
 			this.btnConvert = new System.Windows.Forms.Button();
-			this.grpCUEPaths = new System.Windows.Forms.GroupBox();
 			this.btnBrowseOutput = new System.Windows.Forms.Button();
-			this.btnBrowseInput = new System.Windows.Forms.Button();
-			this.lblOutput = new System.Windows.Forms.Label();
-			this.lblInput = new System.Windows.Forms.Label();
 			this.txtOutputPath = new System.Windows.Forms.TextBox();
-			this.txtInputPath = new System.Windows.Forms.TextBox();
 			this.grpOutputStyle = new System.Windows.Forms.GroupBox();
 			this.rbEmbedCUE = new System.Windows.Forms.RadioButton();
 			this.rbGapsLeftOut = new System.Windows.Forms.RadioButton();
@@ -58,29 +53,35 @@ namespace JDP {
 			this.rbWavPack = new System.Windows.Forms.RadioButton();
 			this.rbWAV = new System.Windows.Forms.RadioButton();
 			this.rbFLAC = new System.Windows.Forms.RadioButton();
-			this.btnBatch = new System.Windows.Forms.Button();
-			this.btnFilenameCorrector = new System.Windows.Forms.Button();
 			this.btnSettings = new System.Windows.Forms.Button();
-			this.grpAccurateRip = new System.Windows.Forms.GroupBox();
+			this.grpAction = new System.Windows.Forms.GroupBox();
+			this.rbActionCorrectFilenames = new System.Windows.Forms.RadioButton();
+			this.chkRecursive = new System.Windows.Forms.CheckBox();
+			this.rbActionCreateCUESheet = new System.Windows.Forms.RadioButton();
+			this.chkMulti = new System.Windows.Forms.CheckBox();
+			this.rbActionVerifyAndCRCs = new System.Windows.Forms.RadioButton();
+			this.rbActionVerifyAndEncode = new System.Windows.Forms.RadioButton();
+			this.rbActionVerifyThenEncode = new System.Windows.Forms.RadioButton();
+			this.rbActionVerify = new System.Windows.Forms.RadioButton();
+			this.rbActionEncode = new System.Windows.Forms.RadioButton();
 			this.txtPreGapLength = new System.Windows.Forms.MaskedTextBox();
 			this.label2 = new System.Windows.Forms.Label();
-			this.rbArPlusCRC = new System.Windows.Forms.RadioButton();
-			this.rbArAndEncode = new System.Windows.Forms.RadioButton();
 			this.label1 = new System.Windows.Forms.Label();
 			this.txtDataTrackLength = new System.Windows.Forms.MaskedTextBox();
-			this.rbArApplyOffset = new System.Windows.Forms.RadioButton();
-			this.rbArVerify = new System.Windows.Forms.RadioButton();
-			this.rbArNone = new System.Windows.Forms.RadioButton();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabelProcessed = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabelWV = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabelFLAC = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusLabelAR = new System.Windows.Forms.ToolStripStatusLabel();
 			this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolStripProgressBar2 = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-			this.btnCUECreator = new System.Windows.Forms.Button();
 			this.btnStop = new System.Windows.Forms.Button();
 			this.btnPause = new System.Windows.Forms.Button();
 			this.btnResume = new System.Windows.Forms.Button();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.grpFreedb = new System.Windows.Forms.GroupBox();
 			this.rbFreedbAlways = new System.Windows.Forms.RadioButton();
 			this.rbFreedbIf = new System.Windows.Forms.RadioButton();
 			this.rbFreedbNever = new System.Windows.Forms.RadioButton();
@@ -92,90 +93,93 @@ namespace JDP {
 			this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
 			this.mP3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.oGGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.grpCUEPaths.SuspendLayout();
+			this.txtInputPath = new System.Windows.Forms.TextBox();
+			this.grpInput = new System.Windows.Forms.GroupBox();
+			this.textBatchReport = new System.Windows.Forms.TextBox();
+			this.fileSystemTreeView1 = new CUEControls.FileSystemTreeView();
+			this.grpExtra = new System.Windows.Forms.GroupBox();
+			this.numericWriteOffset = new System.Windows.Forms.NumericUpDown();
+			this.lblWriteOffset = new System.Windows.Forms.Label();
+			this.contextMenuStripFileTree = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.SelectedNodeName = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+			this.setAsMyMusicFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.resetToOriginalLocationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.panel1 = new System.Windows.Forms.Panel();
 			this.grpOutputStyle.SuspendLayout();
 			this.grpOutputPathGeneration.SuspendLayout();
 			this.grpAudioOutput.SuspendLayout();
-			this.grpAccurateRip.SuspendLayout();
+			this.grpAction.SuspendLayout();
 			this.statusStrip1.SuspendLayout();
-			this.groupBox1.SuspendLayout();
+			this.grpFreedb.SuspendLayout();
 			this.contextMenuStripUDC.SuspendLayout();
+			this.grpInput.SuspendLayout();
+			this.grpExtra.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
+			this.contextMenuStripFileTree.SuspendLayout();
+			this.panel1.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// btnConvert
 			// 
+			this.btnConvert.AccessibleDescription = null;
+			this.btnConvert.AccessibleName = null;
 			resources.ApplyResources(this.btnConvert, "btnConvert");
+			this.btnConvert.BackgroundImage = null;
+			this.btnConvert.Font = null;
 			this.btnConvert.Name = "btnConvert";
+			this.toolTip1.SetToolTip(this.btnConvert, resources.GetString("btnConvert.ToolTip"));
 			this.btnConvert.UseVisualStyleBackColor = true;
 			this.btnConvert.Click += new System.EventHandler(this.btnConvert_Click);
 			// 
-			// grpCUEPaths
-			// 
-			this.grpCUEPaths.Controls.Add(this.btnBrowseOutput);
-			this.grpCUEPaths.Controls.Add(this.btnBrowseInput);
-			this.grpCUEPaths.Controls.Add(this.lblOutput);
-			this.grpCUEPaths.Controls.Add(this.lblInput);
-			this.grpCUEPaths.Controls.Add(this.txtOutputPath);
-			this.grpCUEPaths.Controls.Add(this.txtInputPath);
-			resources.ApplyResources(this.grpCUEPaths, "grpCUEPaths");
-			this.grpCUEPaths.Name = "grpCUEPaths";
-			this.grpCUEPaths.TabStop = false;
-			// 
 			// btnBrowseOutput
 			// 
+			this.btnBrowseOutput.AccessibleDescription = null;
+			this.btnBrowseOutput.AccessibleName = null;
 			resources.ApplyResources(this.btnBrowseOutput, "btnBrowseOutput");
+			this.btnBrowseOutput.BackgroundImage = null;
+			this.btnBrowseOutput.Font = null;
 			this.btnBrowseOutput.Name = "btnBrowseOutput";
+			this.toolTip1.SetToolTip(this.btnBrowseOutput, resources.GetString("btnBrowseOutput.ToolTip"));
 			this.btnBrowseOutput.UseVisualStyleBackColor = true;
 			this.btnBrowseOutput.Click += new System.EventHandler(this.btnBrowseOutput_Click);
 			// 
-			// btnBrowseInput
-			// 
-			resources.ApplyResources(this.btnBrowseInput, "btnBrowseInput");
-			this.btnBrowseInput.Name = "btnBrowseInput";
-			this.btnBrowseInput.UseVisualStyleBackColor = true;
-			this.btnBrowseInput.Click += new System.EventHandler(this.btnBrowseInput_Click);
-			// 
-			// lblOutput
-			// 
-			resources.ApplyResources(this.lblOutput, "lblOutput");
-			this.lblOutput.Name = "lblOutput";
-			// 
-			// lblInput
-			// 
-			resources.ApplyResources(this.lblInput, "lblInput");
-			this.lblInput.Name = "lblInput";
-			// 
 			// txtOutputPath
 			// 
+			this.txtOutputPath.AccessibleDescription = null;
+			this.txtOutputPath.AccessibleName = null;
 			this.txtOutputPath.AllowDrop = true;
 			resources.ApplyResources(this.txtOutputPath, "txtOutputPath");
+			this.txtOutputPath.BackgroundImage = null;
+			this.txtOutputPath.Font = null;
 			this.txtOutputPath.Name = "txtOutputPath";
+			this.toolTip1.SetToolTip(this.txtOutputPath, resources.GetString("txtOutputPath.ToolTip"));
 			this.txtOutputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop);
 			this.txtOutputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter);
 			// 
-			// txtInputPath
-			// 
-			this.txtInputPath.AllowDrop = true;
-			resources.ApplyResources(this.txtInputPath, "txtInputPath");
-			this.txtInputPath.Name = "txtInputPath";
-			this.txtInputPath.TextChanged += new System.EventHandler(this.txtInputPath_TextChanged);
-			this.txtInputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop);
-			this.txtInputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter);
-			// 
 			// grpOutputStyle
 			// 
+			this.grpOutputStyle.AccessibleDescription = null;
+			this.grpOutputStyle.AccessibleName = null;
+			resources.ApplyResources(this.grpOutputStyle, "grpOutputStyle");
+			this.grpOutputStyle.BackgroundImage = null;
 			this.grpOutputStyle.Controls.Add(this.rbEmbedCUE);
 			this.grpOutputStyle.Controls.Add(this.rbGapsLeftOut);
 			this.grpOutputStyle.Controls.Add(this.rbGapsPrepended);
 			this.grpOutputStyle.Controls.Add(this.rbGapsAppended);
 			this.grpOutputStyle.Controls.Add(this.rbSingleFile);
-			resources.ApplyResources(this.grpOutputStyle, "grpOutputStyle");
+			this.grpOutputStyle.Font = null;
 			this.grpOutputStyle.Name = "grpOutputStyle";
 			this.grpOutputStyle.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpOutputStyle, resources.GetString("grpOutputStyle.ToolTip"));
 			// 
 			// rbEmbedCUE
 			// 
+			this.rbEmbedCUE.AccessibleDescription = null;
+			this.rbEmbedCUE.AccessibleName = null;
 			resources.ApplyResources(this.rbEmbedCUE, "rbEmbedCUE");
+			this.rbEmbedCUE.BackgroundImage = null;
+			this.rbEmbedCUE.Font = null;
 			this.rbEmbedCUE.Name = "rbEmbedCUE";
 			this.rbEmbedCUE.TabStop = true;
 			this.toolTip1.SetToolTip(this.rbEmbedCUE, resources.GetString("rbEmbedCUE.ToolTip"));
@@ -184,29 +188,45 @@ namespace JDP {
 			// 
 			// rbGapsLeftOut
 			// 
+			this.rbGapsLeftOut.AccessibleDescription = null;
+			this.rbGapsLeftOut.AccessibleName = null;
 			resources.ApplyResources(this.rbGapsLeftOut, "rbGapsLeftOut");
+			this.rbGapsLeftOut.BackgroundImage = null;
+			this.rbGapsLeftOut.Font = null;
 			this.rbGapsLeftOut.Name = "rbGapsLeftOut";
 			this.toolTip1.SetToolTip(this.rbGapsLeftOut, resources.GetString("rbGapsLeftOut.ToolTip"));
 			this.rbGapsLeftOut.UseVisualStyleBackColor = true;
 			// 
 			// rbGapsPrepended
 			// 
+			this.rbGapsPrepended.AccessibleDescription = null;
+			this.rbGapsPrepended.AccessibleName = null;
 			resources.ApplyResources(this.rbGapsPrepended, "rbGapsPrepended");
+			this.rbGapsPrepended.BackgroundImage = null;
+			this.rbGapsPrepended.Font = null;
 			this.rbGapsPrepended.Name = "rbGapsPrepended";
 			this.toolTip1.SetToolTip(this.rbGapsPrepended, resources.GetString("rbGapsPrepended.ToolTip"));
 			this.rbGapsPrepended.UseVisualStyleBackColor = true;
 			// 
 			// rbGapsAppended
 			// 
+			this.rbGapsAppended.AccessibleDescription = null;
+			this.rbGapsAppended.AccessibleName = null;
 			resources.ApplyResources(this.rbGapsAppended, "rbGapsAppended");
+			this.rbGapsAppended.BackgroundImage = null;
+			this.rbGapsAppended.Font = null;
 			this.rbGapsAppended.Name = "rbGapsAppended";
 			this.toolTip1.SetToolTip(this.rbGapsAppended, resources.GetString("rbGapsAppended.ToolTip"));
 			this.rbGapsAppended.UseVisualStyleBackColor = true;
 			// 
 			// rbSingleFile
 			// 
+			this.rbSingleFile.AccessibleDescription = null;
+			this.rbSingleFile.AccessibleName = null;
 			resources.ApplyResources(this.rbSingleFile, "rbSingleFile");
+			this.rbSingleFile.BackgroundImage = null;
 			this.rbSingleFile.Checked = true;
+			this.rbSingleFile.Font = null;
 			this.rbSingleFile.Name = "rbSingleFile";
 			this.rbSingleFile.TabStop = true;
 			this.toolTip1.SetToolTip(this.rbSingleFile, resources.GetString("rbSingleFile.ToolTip"));
@@ -214,13 +234,24 @@ namespace JDP {
 			// 
 			// btnAbout
 			// 
+			this.btnAbout.AccessibleDescription = null;
+			this.btnAbout.AccessibleName = null;
 			resources.ApplyResources(this.btnAbout, "btnAbout");
+			this.btnAbout.BackgroundImage = null;
+			this.btnAbout.Font = null;
 			this.btnAbout.Name = "btnAbout";
+			this.toolTip1.SetToolTip(this.btnAbout, resources.GetString("btnAbout.ToolTip"));
 			this.btnAbout.UseVisualStyleBackColor = true;
 			this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click);
 			// 
 			// grpOutputPathGeneration
 			// 
+			this.grpOutputPathGeneration.AccessibleDescription = null;
+			this.grpOutputPathGeneration.AccessibleName = null;
+			resources.ApplyResources(this.grpOutputPathGeneration, "grpOutputPathGeneration");
+			this.grpOutputPathGeneration.BackgroundImage = null;
+			this.grpOutputPathGeneration.Controls.Add(this.btnBrowseOutput);
+			this.grpOutputPathGeneration.Controls.Add(this.txtOutputPath);
 			this.grpOutputPathGeneration.Controls.Add(this.txtCustomFormat);
 			this.grpOutputPathGeneration.Controls.Add(this.rbCustomFormat);
 			this.grpOutputPathGeneration.Controls.Add(this.txtCreateSubdirectory);
@@ -228,60 +259,100 @@ namespace JDP {
 			this.grpOutputPathGeneration.Controls.Add(this.rbCreateSubdirectory);
 			this.grpOutputPathGeneration.Controls.Add(this.rbAppendFilename);
 			this.grpOutputPathGeneration.Controls.Add(this.txtAppendFilename);
-			resources.ApplyResources(this.grpOutputPathGeneration, "grpOutputPathGeneration");
+			this.grpOutputPathGeneration.Font = null;
 			this.grpOutputPathGeneration.Name = "grpOutputPathGeneration";
 			this.grpOutputPathGeneration.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpOutputPathGeneration, resources.GetString("grpOutputPathGeneration.ToolTip"));
 			// 
 			// txtCustomFormat
 			// 
+			this.txtCustomFormat.AccessibleDescription = null;
+			this.txtCustomFormat.AccessibleName = null;
 			resources.ApplyResources(this.txtCustomFormat, "txtCustomFormat");
+			this.txtCustomFormat.BackgroundImage = null;
+			this.txtCustomFormat.Font = null;
 			this.txtCustomFormat.Name = "txtCustomFormat";
+			this.toolTip1.SetToolTip(this.txtCustomFormat, resources.GetString("txtCustomFormat.ToolTip"));
 			this.txtCustomFormat.TextChanged += new System.EventHandler(this.txtCustomFormat_TextChanged);
 			// 
 			// rbCustomFormat
 			// 
+			this.rbCustomFormat.AccessibleDescription = null;
+			this.rbCustomFormat.AccessibleName = null;
 			resources.ApplyResources(this.rbCustomFormat, "rbCustomFormat");
+			this.rbCustomFormat.BackgroundImage = null;
+			this.rbCustomFormat.Font = null;
 			this.rbCustomFormat.Name = "rbCustomFormat";
 			this.rbCustomFormat.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbCustomFormat, resources.GetString("rbCustomFormat.ToolTip"));
 			this.rbCustomFormat.UseVisualStyleBackColor = true;
 			this.rbCustomFormat.CheckedChanged += new System.EventHandler(this.rbCustomFormat_CheckedChanged);
 			// 
 			// txtCreateSubdirectory
 			// 
+			this.txtCreateSubdirectory.AccessibleDescription = null;
+			this.txtCreateSubdirectory.AccessibleName = null;
 			resources.ApplyResources(this.txtCreateSubdirectory, "txtCreateSubdirectory");
+			this.txtCreateSubdirectory.BackgroundImage = null;
+			this.txtCreateSubdirectory.Font = null;
 			this.txtCreateSubdirectory.Name = "txtCreateSubdirectory";
+			this.toolTip1.SetToolTip(this.txtCreateSubdirectory, resources.GetString("txtCreateSubdirectory.ToolTip"));
 			this.txtCreateSubdirectory.TextChanged += new System.EventHandler(this.txtCreateSubdirectory_TextChanged);
 			// 
 			// rbDontGenerate
 			// 
+			this.rbDontGenerate.AccessibleDescription = null;
+			this.rbDontGenerate.AccessibleName = null;
 			resources.ApplyResources(this.rbDontGenerate, "rbDontGenerate");
+			this.rbDontGenerate.BackgroundImage = null;
+			this.rbDontGenerate.Font = null;
 			this.rbDontGenerate.Name = "rbDontGenerate";
+			this.toolTip1.SetToolTip(this.rbDontGenerate, resources.GetString("rbDontGenerate.ToolTip"));
 			this.rbDontGenerate.UseVisualStyleBackColor = true;
 			// 
 			// rbCreateSubdirectory
 			// 
+			this.rbCreateSubdirectory.AccessibleDescription = null;
+			this.rbCreateSubdirectory.AccessibleName = null;
 			resources.ApplyResources(this.rbCreateSubdirectory, "rbCreateSubdirectory");
+			this.rbCreateSubdirectory.BackgroundImage = null;
 			this.rbCreateSubdirectory.Checked = true;
+			this.rbCreateSubdirectory.Font = null;
 			this.rbCreateSubdirectory.Name = "rbCreateSubdirectory";
 			this.rbCreateSubdirectory.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbCreateSubdirectory, resources.GetString("rbCreateSubdirectory.ToolTip"));
 			this.rbCreateSubdirectory.UseVisualStyleBackColor = true;
 			this.rbCreateSubdirectory.CheckedChanged += new System.EventHandler(this.rbCreateSubdirectory_CheckedChanged);
 			// 
 			// rbAppendFilename
 			// 
+			this.rbAppendFilename.AccessibleDescription = null;
+			this.rbAppendFilename.AccessibleName = null;
 			resources.ApplyResources(this.rbAppendFilename, "rbAppendFilename");
+			this.rbAppendFilename.BackgroundImage = null;
+			this.rbAppendFilename.Font = null;
 			this.rbAppendFilename.Name = "rbAppendFilename";
+			this.toolTip1.SetToolTip(this.rbAppendFilename, resources.GetString("rbAppendFilename.ToolTip"));
 			this.rbAppendFilename.UseVisualStyleBackColor = true;
 			this.rbAppendFilename.CheckedChanged += new System.EventHandler(this.rbAppendFilename_CheckedChanged);
 			// 
 			// txtAppendFilename
 			// 
+			this.txtAppendFilename.AccessibleDescription = null;
+			this.txtAppendFilename.AccessibleName = null;
 			resources.ApplyResources(this.txtAppendFilename, "txtAppendFilename");
+			this.txtAppendFilename.BackgroundImage = null;
+			this.txtAppendFilename.Font = null;
 			this.txtAppendFilename.Name = "txtAppendFilename";
+			this.toolTip1.SetToolTip(this.txtAppendFilename, resources.GetString("txtAppendFilename.ToolTip"));
 			this.txtAppendFilename.TextChanged += new System.EventHandler(this.txtAppendFilename_TextChanged);
 			// 
 			// grpAudioOutput
 			// 
+			this.grpAudioOutput.AccessibleDescription = null;
+			this.grpAudioOutput.AccessibleName = null;
+			resources.ApplyResources(this.grpAudioOutput, "grpAudioOutput");
+			this.grpAudioOutput.BackgroundImage = null;
 			this.grpAudioOutput.Controls.Add(this.btnCodec);
 			this.grpAudioOutput.Controls.Add(this.rbUDC1);
 			this.grpAudioOutput.Controls.Add(this.rbTTA);
@@ -291,36 +362,56 @@ namespace JDP {
 			this.grpAudioOutput.Controls.Add(this.rbWavPack);
 			this.grpAudioOutput.Controls.Add(this.rbWAV);
 			this.grpAudioOutput.Controls.Add(this.rbFLAC);
-			resources.ApplyResources(this.grpAudioOutput, "grpAudioOutput");
+			this.grpAudioOutput.Font = null;
 			this.grpAudioOutput.Name = "grpAudioOutput";
 			this.grpAudioOutput.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpAudioOutput, resources.GetString("grpAudioOutput.ToolTip"));
 			// 
 			// btnCodec
 			// 
+			this.btnCodec.AccessibleDescription = null;
+			this.btnCodec.AccessibleName = null;
 			resources.ApplyResources(this.btnCodec, "btnCodec");
+			this.btnCodec.BackgroundImage = null;
+			this.btnCodec.Font = null;
 			this.btnCodec.Name = "btnCodec";
+			this.toolTip1.SetToolTip(this.btnCodec, resources.GetString("btnCodec.ToolTip"));
 			this.btnCodec.UseVisualStyleBackColor = true;
 			this.btnCodec.Click += new System.EventHandler(this.btnCodec_Click);
 			// 
 			// rbUDC1
 			// 
+			this.rbUDC1.AccessibleDescription = null;
+			this.rbUDC1.AccessibleName = null;
 			resources.ApplyResources(this.rbUDC1, "rbUDC1");
+			this.rbUDC1.BackgroundImage = null;
+			this.rbUDC1.Font = null;
 			this.rbUDC1.Name = "rbUDC1";
 			this.rbUDC1.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbUDC1, resources.GetString("rbUDC1.ToolTip"));
 			this.rbUDC1.UseVisualStyleBackColor = true;
 			this.rbUDC1.CheckedChanged += new System.EventHandler(this.rbUDC1_CheckedChanged);
 			// 
 			// rbTTA
 			// 
+			this.rbTTA.AccessibleDescription = null;
+			this.rbTTA.AccessibleName = null;
 			resources.ApplyResources(this.rbTTA, "rbTTA");
+			this.rbTTA.BackgroundImage = null;
+			this.rbTTA.Font = null;
 			this.rbTTA.Name = "rbTTA";
 			this.rbTTA.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbTTA, resources.GetString("rbTTA.ToolTip"));
 			this.rbTTA.UseVisualStyleBackColor = true;
 			this.rbTTA.CheckedChanged += new System.EventHandler(this.rbTTA_CheckedChanged);
 			// 
 			// chkLossyWAV
 			// 
+			this.chkLossyWAV.AccessibleDescription = null;
+			this.chkLossyWAV.AccessibleName = null;
 			resources.ApplyResources(this.chkLossyWAV, "chkLossyWAV");
+			this.chkLossyWAV.BackgroundImage = null;
+			this.chkLossyWAV.Font = null;
 			this.chkLossyWAV.Name = "chkLossyWAV";
 			this.toolTip1.SetToolTip(this.chkLossyWAV, resources.GetString("chkLossyWAV.ToolTip"));
 			this.chkLossyWAV.UseVisualStyleBackColor = true;
@@ -328,15 +419,24 @@ namespace JDP {
 			// 
 			// rbAPE
 			// 
+			this.rbAPE.AccessibleDescription = null;
+			this.rbAPE.AccessibleName = null;
 			resources.ApplyResources(this.rbAPE, "rbAPE");
+			this.rbAPE.BackgroundImage = null;
+			this.rbAPE.Font = null;
 			this.rbAPE.Name = "rbAPE";
 			this.rbAPE.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbAPE, resources.GetString("rbAPE.ToolTip"));
 			this.rbAPE.UseVisualStyleBackColor = true;
 			this.rbAPE.CheckedChanged += new System.EventHandler(this.rbAPE_CheckedChanged);
 			// 
 			// rbNoAudio
 			// 
+			this.rbNoAudio.AccessibleDescription = null;
+			this.rbNoAudio.AccessibleName = null;
 			resources.ApplyResources(this.rbNoAudio, "rbNoAudio");
+			this.rbNoAudio.BackgroundImage = null;
+			this.rbNoAudio.Font = null;
 			this.rbNoAudio.Name = "rbNoAudio";
 			this.toolTip1.SetToolTip(this.rbNoAudio, resources.GetString("rbNoAudio.ToolTip"));
 			this.rbNoAudio.UseVisualStyleBackColor = true;
@@ -344,161 +444,326 @@ namespace JDP {
 			// 
 			// rbWavPack
 			// 
+			this.rbWavPack.AccessibleDescription = null;
+			this.rbWavPack.AccessibleName = null;
 			resources.ApplyResources(this.rbWavPack, "rbWavPack");
+			this.rbWavPack.BackgroundImage = null;
+			this.rbWavPack.Font = null;
 			this.rbWavPack.Name = "rbWavPack";
+			this.toolTip1.SetToolTip(this.rbWavPack, resources.GetString("rbWavPack.ToolTip"));
 			this.rbWavPack.UseVisualStyleBackColor = true;
 			this.rbWavPack.CheckedChanged += new System.EventHandler(this.rbWavPack_CheckedChanged);
 			// 
 			// rbWAV
 			// 
+			this.rbWAV.AccessibleDescription = null;
+			this.rbWAV.AccessibleName = null;
 			resources.ApplyResources(this.rbWAV, "rbWAV");
+			this.rbWAV.BackgroundImage = null;
 			this.rbWAV.Checked = true;
+			this.rbWAV.Font = null;
 			this.rbWAV.Name = "rbWAV";
 			this.rbWAV.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbWAV, resources.GetString("rbWAV.ToolTip"));
 			this.rbWAV.UseVisualStyleBackColor = true;
 			this.rbWAV.CheckedChanged += new System.EventHandler(this.rbWAV_CheckedChanged);
 			// 
 			// rbFLAC
 			// 
+			this.rbFLAC.AccessibleDescription = null;
+			this.rbFLAC.AccessibleName = null;
 			resources.ApplyResources(this.rbFLAC, "rbFLAC");
+			this.rbFLAC.BackgroundImage = null;
+			this.rbFLAC.Font = null;
 			this.rbFLAC.Name = "rbFLAC";
+			this.toolTip1.SetToolTip(this.rbFLAC, resources.GetString("rbFLAC.ToolTip"));
 			this.rbFLAC.UseVisualStyleBackColor = true;
 			this.rbFLAC.CheckedChanged += new System.EventHandler(this.rbFLAC_CheckedChanged);
 			// 
-			// btnBatch
-			// 
-			resources.ApplyResources(this.btnBatch, "btnBatch");
-			this.btnBatch.Name = "btnBatch";
-			this.btnBatch.UseVisualStyleBackColor = true;
-			this.btnBatch.Click += new System.EventHandler(this.btnBatch_Click);
-			// 
-			// btnFilenameCorrector
-			// 
-			resources.ApplyResources(this.btnFilenameCorrector, "btnFilenameCorrector");
-			this.btnFilenameCorrector.Name = "btnFilenameCorrector";
-			this.btnFilenameCorrector.UseVisualStyleBackColor = true;
-			this.btnFilenameCorrector.Click += new System.EventHandler(this.btnFilenameCorrector_Click);
-			// 
 			// btnSettings
 			// 
+			this.btnSettings.AccessibleDescription = null;
+			this.btnSettings.AccessibleName = null;
 			resources.ApplyResources(this.btnSettings, "btnSettings");
+			this.btnSettings.BackgroundImage = null;
+			this.btnSettings.Font = null;
 			this.btnSettings.Name = "btnSettings";
+			this.toolTip1.SetToolTip(this.btnSettings, resources.GetString("btnSettings.ToolTip"));
 			this.btnSettings.UseVisualStyleBackColor = true;
 			this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
 			// 
-			// grpAccurateRip
+			// grpAction
 			// 
-			this.grpAccurateRip.Controls.Add(this.txtPreGapLength);
-			this.grpAccurateRip.Controls.Add(this.label2);
-			this.grpAccurateRip.Controls.Add(this.rbArPlusCRC);
-			this.grpAccurateRip.Controls.Add(this.rbArAndEncode);
-			this.grpAccurateRip.Controls.Add(this.label1);
-			this.grpAccurateRip.Controls.Add(this.txtDataTrackLength);
-			this.grpAccurateRip.Controls.Add(this.rbArApplyOffset);
-			this.grpAccurateRip.Controls.Add(this.rbArVerify);
-			this.grpAccurateRip.Controls.Add(this.rbArNone);
-			resources.ApplyResources(this.grpAccurateRip, "grpAccurateRip");
-			this.grpAccurateRip.Name = "grpAccurateRip";
-			this.grpAccurateRip.TabStop = false;
+			this.grpAction.AccessibleDescription = null;
+			this.grpAction.AccessibleName = null;
+			resources.ApplyResources(this.grpAction, "grpAction");
+			this.grpAction.BackgroundImage = null;
+			this.grpAction.Controls.Add(this.rbActionCorrectFilenames);
+			this.grpAction.Controls.Add(this.chkRecursive);
+			this.grpAction.Controls.Add(this.rbActionCreateCUESheet);
+			this.grpAction.Controls.Add(this.chkMulti);
+			this.grpAction.Controls.Add(this.rbActionVerifyAndCRCs);
+			this.grpAction.Controls.Add(this.rbActionVerifyAndEncode);
+			this.grpAction.Controls.Add(this.rbActionVerifyThenEncode);
+			this.grpAction.Controls.Add(this.rbActionVerify);
+			this.grpAction.Controls.Add(this.rbActionEncode);
+			this.grpAction.Font = null;
+			this.grpAction.Name = "grpAction";
+			this.grpAction.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpAction, resources.GetString("grpAction.ToolTip"));
+			// 
+			// rbActionCorrectFilenames
+			// 
+			this.rbActionCorrectFilenames.AccessibleDescription = null;
+			this.rbActionCorrectFilenames.AccessibleName = null;
+			resources.ApplyResources(this.rbActionCorrectFilenames, "rbActionCorrectFilenames");
+			this.rbActionCorrectFilenames.BackgroundImage = null;
+			this.rbActionCorrectFilenames.Font = null;
+			this.rbActionCorrectFilenames.Name = "rbActionCorrectFilenames";
+			this.rbActionCorrectFilenames.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbActionCorrectFilenames, resources.GetString("rbActionCorrectFilenames.ToolTip"));
+			this.rbActionCorrectFilenames.UseVisualStyleBackColor = true;
+			this.rbActionCorrectFilenames.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
+			// 
+			// chkRecursive
+			// 
+			this.chkRecursive.AccessibleDescription = null;
+			this.chkRecursive.AccessibleName = null;
+			resources.ApplyResources(this.chkRecursive, "chkRecursive");
+			this.chkRecursive.BackgroundImage = null;
+			this.chkRecursive.Font = null;
+			this.chkRecursive.Name = "chkRecursive";
+			this.toolTip1.SetToolTip(this.chkRecursive, resources.GetString("chkRecursive.ToolTip"));
+			this.chkRecursive.UseVisualStyleBackColor = true;
+			this.chkRecursive.CheckedChanged += new System.EventHandler(this.chkRecursive_CheckedChanged);
+			// 
+			// rbActionCreateCUESheet
+			// 
+			this.rbActionCreateCUESheet.AccessibleDescription = null;
+			this.rbActionCreateCUESheet.AccessibleName = null;
+			resources.ApplyResources(this.rbActionCreateCUESheet, "rbActionCreateCUESheet");
+			this.rbActionCreateCUESheet.BackgroundImage = null;
+			this.rbActionCreateCUESheet.Font = null;
+			this.rbActionCreateCUESheet.Name = "rbActionCreateCUESheet";
+			this.rbActionCreateCUESheet.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbActionCreateCUESheet, resources.GetString("rbActionCreateCUESheet.ToolTip"));
+			this.rbActionCreateCUESheet.UseVisualStyleBackColor = true;
+			this.rbActionCreateCUESheet.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
+			// 
+			// chkMulti
+			// 
+			this.chkMulti.AccessibleDescription = null;
+			this.chkMulti.AccessibleName = null;
+			resources.ApplyResources(this.chkMulti, "chkMulti");
+			this.chkMulti.BackgroundImage = null;
+			this.chkMulti.Font = null;
+			this.chkMulti.Name = "chkMulti";
+			this.toolTip1.SetToolTip(this.chkMulti, resources.GetString("chkMulti.ToolTip"));
+			this.chkMulti.UseVisualStyleBackColor = true;
+			this.chkMulti.CheckedChanged += new System.EventHandler(this.chkMulti_CheckedChanged);
+			// 
+			// rbActionVerifyAndCRCs
+			// 
+			this.rbActionVerifyAndCRCs.AccessibleDescription = null;
+			this.rbActionVerifyAndCRCs.AccessibleName = null;
+			resources.ApplyResources(this.rbActionVerifyAndCRCs, "rbActionVerifyAndCRCs");
+			this.rbActionVerifyAndCRCs.BackgroundImage = null;
+			this.rbActionVerifyAndCRCs.Font = null;
+			this.rbActionVerifyAndCRCs.Name = "rbActionVerifyAndCRCs";
+			this.toolTip1.SetToolTip(this.rbActionVerifyAndCRCs, resources.GetString("rbActionVerifyAndCRCs.ToolTip"));
+			this.rbActionVerifyAndCRCs.UseVisualStyleBackColor = true;
+			this.rbActionVerifyAndCRCs.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
+			// 
+			// rbActionVerifyAndEncode
+			// 
+			this.rbActionVerifyAndEncode.AccessibleDescription = null;
+			this.rbActionVerifyAndEncode.AccessibleName = null;
+			resources.ApplyResources(this.rbActionVerifyAndEncode, "rbActionVerifyAndEncode");
+			this.rbActionVerifyAndEncode.BackgroundImage = null;
+			this.rbActionVerifyAndEncode.Font = null;
+			this.rbActionVerifyAndEncode.Name = "rbActionVerifyAndEncode";
+			this.rbActionVerifyAndEncode.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbActionVerifyAndEncode, resources.GetString("rbActionVerifyAndEncode.ToolTip"));
+			this.rbActionVerifyAndEncode.UseVisualStyleBackColor = true;
+			this.rbActionVerifyAndEncode.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
+			// 
+			// rbActionVerifyThenEncode
+			// 
+			this.rbActionVerifyThenEncode.AccessibleDescription = null;
+			this.rbActionVerifyThenEncode.AccessibleName = null;
+			resources.ApplyResources(this.rbActionVerifyThenEncode, "rbActionVerifyThenEncode");
+			this.rbActionVerifyThenEncode.BackgroundImage = null;
+			this.rbActionVerifyThenEncode.Font = null;
+			this.rbActionVerifyThenEncode.Name = "rbActionVerifyThenEncode";
+			this.toolTip1.SetToolTip(this.rbActionVerifyThenEncode, resources.GetString("rbActionVerifyThenEncode.ToolTip"));
+			this.rbActionVerifyThenEncode.UseVisualStyleBackColor = true;
+			this.rbActionVerifyThenEncode.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
+			// 
+			// rbActionVerify
+			// 
+			this.rbActionVerify.AccessibleDescription = null;
+			this.rbActionVerify.AccessibleName = null;
+			resources.ApplyResources(this.rbActionVerify, "rbActionVerify");
+			this.rbActionVerify.BackgroundImage = null;
+			this.rbActionVerify.Font = null;
+			this.rbActionVerify.Name = "rbActionVerify";
+			this.toolTip1.SetToolTip(this.rbActionVerify, resources.GetString("rbActionVerify.ToolTip"));
+			this.rbActionVerify.UseVisualStyleBackColor = true;
+			this.rbActionVerify.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
+			// 
+			// rbActionEncode
+			// 
+			this.rbActionEncode.AccessibleDescription = null;
+			this.rbActionEncode.AccessibleName = null;
+			resources.ApplyResources(this.rbActionEncode, "rbActionEncode");
+			this.rbActionEncode.BackgroundImage = null;
+			this.rbActionEncode.Checked = true;
+			this.rbActionEncode.Font = null;
+			this.rbActionEncode.Name = "rbActionEncode";
+			this.rbActionEncode.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbActionEncode, resources.GetString("rbActionEncode.ToolTip"));
+			this.rbActionEncode.UseVisualStyleBackColor = true;
+			this.rbActionEncode.CheckedChanged += new System.EventHandler(this.rbAction_CheckedChanged);
 			// 
 			// txtPreGapLength
 			// 
+			this.txtPreGapLength.AccessibleDescription = null;
+			this.txtPreGapLength.AccessibleName = null;
+			resources.ApplyResources(this.txtPreGapLength, "txtPreGapLength");
+			this.txtPreGapLength.BackgroundImage = null;
 			this.txtPreGapLength.Culture = new System.Globalization.CultureInfo("");
 			this.txtPreGapLength.CutCopyMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals;
+			this.txtPreGapLength.Font = null;
 			this.txtPreGapLength.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Overwrite;
-			resources.ApplyResources(this.txtPreGapLength, "txtPreGapLength");
 			this.txtPreGapLength.Name = "txtPreGapLength";
 			this.txtPreGapLength.TextMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals;
 			this.toolTip1.SetToolTip(this.txtPreGapLength, resources.GetString("txtPreGapLength.ToolTip"));
 			// 
 			// label2
 			// 
+			this.label2.AccessibleDescription = null;
+			this.label2.AccessibleName = null;
 			resources.ApplyResources(this.label2, "label2");
+			this.label2.Font = null;
 			this.label2.Name = "label2";
-			// 
-			// rbArPlusCRC
-			// 
-			resources.ApplyResources(this.rbArPlusCRC, "rbArPlusCRC");
-			this.rbArPlusCRC.Name = "rbArPlusCRC";
-			this.toolTip1.SetToolTip(this.rbArPlusCRC, resources.GetString("rbArPlusCRC.ToolTip"));
-			this.rbArPlusCRC.UseVisualStyleBackColor = true;
-			this.rbArPlusCRC.CheckedChanged += new System.EventHandler(this.rbArPlusCRC_CheckedChanged);
-			// 
-			// rbArAndEncode
-			// 
-			resources.ApplyResources(this.rbArAndEncode, "rbArAndEncode");
-			this.rbArAndEncode.Name = "rbArAndEncode";
-			this.rbArAndEncode.TabStop = true;
-			this.rbArAndEncode.UseVisualStyleBackColor = true;
+			this.toolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
 			// 
 			// label1
 			// 
+			this.label1.AccessibleDescription = null;
+			this.label1.AccessibleName = null;
 			resources.ApplyResources(this.label1, "label1");
+			this.label1.Font = null;
 			this.label1.Name = "label1";
+			this.toolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip"));
 			// 
 			// txtDataTrackLength
 			// 
+			this.txtDataTrackLength.AccessibleDescription = null;
+			this.txtDataTrackLength.AccessibleName = null;
+			resources.ApplyResources(this.txtDataTrackLength, "txtDataTrackLength");
+			this.txtDataTrackLength.BackgroundImage = null;
 			this.txtDataTrackLength.Culture = new System.Globalization.CultureInfo("");
 			this.txtDataTrackLength.CutCopyMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals;
+			this.txtDataTrackLength.Font = null;
 			this.txtDataTrackLength.InsertKeyMode = System.Windows.Forms.InsertKeyMode.Overwrite;
-			resources.ApplyResources(this.txtDataTrackLength, "txtDataTrackLength");
 			this.txtDataTrackLength.Name = "txtDataTrackLength";
 			this.txtDataTrackLength.TextMaskFormat = System.Windows.Forms.MaskFormat.IncludePromptAndLiterals;
 			this.toolTip1.SetToolTip(this.txtDataTrackLength, resources.GetString("txtDataTrackLength.ToolTip"));
 			// 
-			// rbArApplyOffset
-			// 
-			resources.ApplyResources(this.rbArApplyOffset, "rbArApplyOffset");
-			this.rbArApplyOffset.Name = "rbArApplyOffset";
-			this.toolTip1.SetToolTip(this.rbArApplyOffset, resources.GetString("rbArApplyOffset.ToolTip"));
-			this.rbArApplyOffset.UseVisualStyleBackColor = true;
-			this.rbArApplyOffset.CheckedChanged += new System.EventHandler(this.rbArApplyOffset_CheckedChanged);
-			// 
-			// rbArVerify
-			// 
-			resources.ApplyResources(this.rbArVerify, "rbArVerify");
-			this.rbArVerify.Name = "rbArVerify";
-			this.toolTip1.SetToolTip(this.rbArVerify, resources.GetString("rbArVerify.ToolTip"));
-			this.rbArVerify.UseVisualStyleBackColor = true;
-			this.rbArVerify.CheckedChanged += new System.EventHandler(this.rbArVerify_CheckedChanged);
-			// 
-			// rbArNone
-			// 
-			resources.ApplyResources(this.rbArNone, "rbArNone");
-			this.rbArNone.Checked = true;
-			this.rbArNone.Name = "rbArNone";
-			this.rbArNone.TabStop = true;
-			this.toolTip1.SetToolTip(this.rbArNone, resources.GetString("rbArNone.ToolTip"));
-			this.rbArNone.UseVisualStyleBackColor = true;
-			// 
 			// statusStrip1
 			// 
+			this.statusStrip1.AccessibleDescription = null;
+			this.statusStrip1.AccessibleName = null;
+			resources.ApplyResources(this.statusStrip1, "statusStrip1");
+			this.statusStrip1.BackgroundImage = null;
+			this.statusStrip1.Font = null;
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripStatusLabel1,
+            this.toolStripStatusLabelProcessed,
+            this.toolStripStatusLabel2,
+            this.toolStripStatusLabelWV,
+            this.toolStripStatusLabelFLAC,
+            this.toolStripStatusLabelAR,
             this.toolStripProgressBar1,
             this.toolStripProgressBar2});
-			resources.ApplyResources(this.statusStrip1, "statusStrip1");
 			this.statusStrip1.Name = "statusStrip1";
+			this.statusStrip1.ShowItemToolTips = true;
 			this.statusStrip1.SizingGrip = false;
+			this.toolTip1.SetToolTip(this.statusStrip1, resources.GetString("statusStrip1.ToolTip"));
 			// 
 			// toolStripStatusLabel1
 			// 
-			this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+			this.toolStripStatusLabel1.AccessibleDescription = null;
+			this.toolStripStatusLabel1.AccessibleName = null;
 			resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1");
+			this.toolStripStatusLabel1.BackgroundImage = null;
+			this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
 			this.toolStripStatusLabel1.Spring = true;
 			// 
+			// toolStripStatusLabelProcessed
+			// 
+			this.toolStripStatusLabelProcessed.AccessibleDescription = null;
+			this.toolStripStatusLabelProcessed.AccessibleName = null;
+			resources.ApplyResources(this.toolStripStatusLabelProcessed, "toolStripStatusLabelProcessed");
+			this.toolStripStatusLabelProcessed.BackgroundImage = null;
+			this.toolStripStatusLabelProcessed.Name = "toolStripStatusLabelProcessed";
+			// 
+			// toolStripStatusLabel2
+			// 
+			this.toolStripStatusLabel2.AccessibleDescription = null;
+			this.toolStripStatusLabel2.AccessibleName = null;
+			resources.ApplyResources(this.toolStripStatusLabel2, "toolStripStatusLabel2");
+			this.toolStripStatusLabel2.BackgroundImage = null;
+			this.toolStripStatusLabel2.Image = global::JDP.Properties.Resources.wav;
+			this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
+			this.toolStripStatusLabel2.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
+			// 
+			// toolStripStatusLabelWV
+			// 
+			this.toolStripStatusLabelWV.AccessibleDescription = null;
+			this.toolStripStatusLabelWV.AccessibleName = null;
+			resources.ApplyResources(this.toolStripStatusLabelWV, "toolStripStatusLabelWV");
+			this.toolStripStatusLabelWV.BackgroundImage = null;
+			this.toolStripStatusLabelWV.Image = global::JDP.Properties.Resources.wv;
+			this.toolStripStatusLabelWV.Name = "toolStripStatusLabelWV";
+			this.toolStripStatusLabelWV.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
+			// 
+			// toolStripStatusLabelFLAC
+			// 
+			this.toolStripStatusLabelFLAC.AccessibleDescription = null;
+			this.toolStripStatusLabelFLAC.AccessibleName = null;
+			resources.ApplyResources(this.toolStripStatusLabelFLAC, "toolStripStatusLabelFLAC");
+			this.toolStripStatusLabelFLAC.BackgroundImage = null;
+			this.toolStripStatusLabelFLAC.Image = global::JDP.Properties.Resources.flac;
+			this.toolStripStatusLabelFLAC.Name = "toolStripStatusLabelFLAC";
+			this.toolStripStatusLabelFLAC.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
+			// 
+			// toolStripStatusLabelAR
+			// 
+			this.toolStripStatusLabelAR.AccessibleDescription = null;
+			this.toolStripStatusLabelAR.AccessibleName = null;
+			resources.ApplyResources(this.toolStripStatusLabelAR, "toolStripStatusLabelAR");
+			this.toolStripStatusLabelAR.BackgroundImage = null;
+			this.toolStripStatusLabelAR.Name = "toolStripStatusLabelAR";
+			this.toolStripStatusLabelAR.Padding = new System.Windows.Forms.Padding(0, 0, 5, 0);
+			// 
 			// toolStripProgressBar1
 			// 
+			this.toolStripProgressBar1.AccessibleDescription = null;
+			this.toolStripProgressBar1.AccessibleName = null;
+			resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1");
 			this.toolStripProgressBar1.AutoToolTip = true;
 			this.toolStripProgressBar1.Name = "toolStripProgressBar1";
-			resources.ApplyResources(this.toolStripProgressBar1, "toolStripProgressBar1");
 			this.toolStripProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
 			// 
 			// toolStripProgressBar2
 			// 
+			this.toolStripProgressBar2.AccessibleDescription = null;
+			this.toolStripProgressBar2.AccessibleName = null;
+			resources.ApplyResources(this.toolStripProgressBar2, "toolStripProgressBar2");
 			this.toolStripProgressBar2.AutoToolTip = true;
 			this.toolStripProgressBar2.Name = "toolStripProgressBar2";
-			resources.ApplyResources(this.toolStripProgressBar2, "toolStripProgressBar2");
 			this.toolStripProgressBar2.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
 			// 
 			// toolTip1
@@ -507,66 +772,99 @@ namespace JDP {
 			this.toolTip1.InitialDelay = 500;
 			this.toolTip1.ReshowDelay = 100;
 			// 
-			// btnCUECreator
-			// 
-			resources.ApplyResources(this.btnCUECreator, "btnCUECreator");
-			this.btnCUECreator.Name = "btnCUECreator";
-			this.btnCUECreator.UseVisualStyleBackColor = true;
-			this.btnCUECreator.Click += new System.EventHandler(this.btnCUECreator_Click);
-			// 
 			// btnStop
 			// 
+			this.btnStop.AccessibleDescription = null;
+			this.btnStop.AccessibleName = null;
 			resources.ApplyResources(this.btnStop, "btnStop");
+			this.btnStop.BackgroundImage = null;
+			this.btnStop.Font = null;
 			this.btnStop.Name = "btnStop";
+			this.toolTip1.SetToolTip(this.btnStop, resources.GetString("btnStop.ToolTip"));
 			this.btnStop.UseVisualStyleBackColor = true;
 			this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
 			// 
 			// btnPause
 			// 
+			this.btnPause.AccessibleDescription = null;
+			this.btnPause.AccessibleName = null;
 			resources.ApplyResources(this.btnPause, "btnPause");
+			this.btnPause.BackgroundImage = null;
+			this.btnPause.Font = null;
 			this.btnPause.Name = "btnPause";
+			this.toolTip1.SetToolTip(this.btnPause, resources.GetString("btnPause.ToolTip"));
 			this.btnPause.UseVisualStyleBackColor = true;
 			this.btnPause.Click += new System.EventHandler(this.btnPause_Click);
 			// 
 			// btnResume
 			// 
+			this.btnResume.AccessibleDescription = null;
+			this.btnResume.AccessibleName = null;
 			resources.ApplyResources(this.btnResume, "btnResume");
+			this.btnResume.BackgroundImage = null;
+			this.btnResume.Font = null;
 			this.btnResume.Name = "btnResume";
+			this.toolTip1.SetToolTip(this.btnResume, resources.GetString("btnResume.ToolTip"));
 			this.btnResume.UseVisualStyleBackColor = true;
 			this.btnResume.Click += new System.EventHandler(this.btnPause_Click);
 			// 
-			// groupBox1
+			// grpFreedb
 			// 
-			this.groupBox1.Controls.Add(this.rbFreedbAlways);
-			this.groupBox1.Controls.Add(this.rbFreedbIf);
-			this.groupBox1.Controls.Add(this.rbFreedbNever);
-			resources.ApplyResources(this.groupBox1, "groupBox1");
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.TabStop = false;
+			this.grpFreedb.AccessibleDescription = null;
+			this.grpFreedb.AccessibleName = null;
+			resources.ApplyResources(this.grpFreedb, "grpFreedb");
+			this.grpFreedb.BackgroundImage = null;
+			this.grpFreedb.Controls.Add(this.rbFreedbAlways);
+			this.grpFreedb.Controls.Add(this.rbFreedbIf);
+			this.grpFreedb.Controls.Add(this.rbFreedbNever);
+			this.grpFreedb.Font = null;
+			this.grpFreedb.Name = "grpFreedb";
+			this.grpFreedb.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpFreedb, resources.GetString("grpFreedb.ToolTip"));
 			// 
 			// rbFreedbAlways
 			// 
+			this.rbFreedbAlways.AccessibleDescription = null;
+			this.rbFreedbAlways.AccessibleName = null;
 			resources.ApplyResources(this.rbFreedbAlways, "rbFreedbAlways");
+			this.rbFreedbAlways.BackgroundImage = null;
+			this.rbFreedbAlways.Font = null;
 			this.rbFreedbAlways.Name = "rbFreedbAlways";
 			this.rbFreedbAlways.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbFreedbAlways, resources.GetString("rbFreedbAlways.ToolTip"));
 			this.rbFreedbAlways.UseVisualStyleBackColor = true;
 			// 
 			// rbFreedbIf
 			// 
+			this.rbFreedbIf.AccessibleDescription = null;
+			this.rbFreedbIf.AccessibleName = null;
 			resources.ApplyResources(this.rbFreedbIf, "rbFreedbIf");
+			this.rbFreedbIf.BackgroundImage = null;
+			this.rbFreedbIf.Font = null;
 			this.rbFreedbIf.Name = "rbFreedbIf";
 			this.rbFreedbIf.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbFreedbIf, resources.GetString("rbFreedbIf.ToolTip"));
 			this.rbFreedbIf.UseVisualStyleBackColor = true;
 			// 
 			// rbFreedbNever
 			// 
+			this.rbFreedbNever.AccessibleDescription = null;
+			this.rbFreedbNever.AccessibleName = null;
 			resources.ApplyResources(this.rbFreedbNever, "rbFreedbNever");
+			this.rbFreedbNever.BackgroundImage = null;
+			this.rbFreedbNever.Font = null;
 			this.rbFreedbNever.Name = "rbFreedbNever";
 			this.rbFreedbNever.TabStop = true;
+			this.toolTip1.SetToolTip(this.rbFreedbNever, resources.GetString("rbFreedbNever.ToolTip"));
 			this.rbFreedbNever.UseVisualStyleBackColor = true;
 			// 
 			// contextMenuStripUDC
 			// 
+			this.contextMenuStripUDC.AccessibleDescription = null;
+			this.contextMenuStripUDC.AccessibleName = null;
+			resources.ApplyResources(this.contextMenuStripUDC, "contextMenuStripUDC");
+			this.contextMenuStripUDC.BackgroundImage = null;
+			this.contextMenuStripUDC.Font = null;
 			this.contextMenuStripUDC.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripMenuItem2,
             this.tAKToolStripMenuItem,
@@ -576,84 +874,295 @@ namespace JDP {
             this.mP3ToolStripMenuItem,
             this.oGGToolStripMenuItem});
 			this.contextMenuStripUDC.Name = "contextMenuStripUDC";
-			resources.ApplyResources(this.contextMenuStripUDC, "contextMenuStripUDC");
+			this.toolTip1.SetToolTip(this.contextMenuStripUDC, resources.GetString("contextMenuStripUDC.ToolTip"));
 			this.contextMenuStripUDC.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.contextMenuStripUDC_ItemClicked);
 			// 
 			// toolStripMenuItem2
 			// 
+			this.toolStripMenuItem2.AccessibleDescription = null;
+			this.toolStripMenuItem2.AccessibleName = null;
 			resources.ApplyResources(this.toolStripMenuItem2, "toolStripMenuItem2");
+			this.toolStripMenuItem2.BackgroundImage = null;
 			this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+			this.toolStripMenuItem2.ShortcutKeyDisplayString = null;
 			// 
 			// tAKToolStripMenuItem
 			// 
-			this.tAKToolStripMenuItem.Name = "tAKToolStripMenuItem";
+			this.tAKToolStripMenuItem.AccessibleDescription = null;
+			this.tAKToolStripMenuItem.AccessibleName = null;
 			resources.ApplyResources(this.tAKToolStripMenuItem, "tAKToolStripMenuItem");
+			this.tAKToolStripMenuItem.BackgroundImage = null;
+			this.tAKToolStripMenuItem.Name = "tAKToolStripMenuItem";
+			this.tAKToolStripMenuItem.ShortcutKeyDisplayString = null;
 			// 
 			// toolStripMenuItem1
 			// 
-			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.AccessibleDescription = null;
+			this.toolStripMenuItem1.AccessibleName = null;
 			resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1");
+			this.toolStripMenuItem1.BackgroundImage = null;
+			this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+			this.toolStripMenuItem1.ShortcutKeyDisplayString = null;
 			// 
 			// toolStripSeparator1
 			// 
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.AccessibleDescription = null;
+			this.toolStripSeparator1.AccessibleName = null;
 			resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
 			// 
 			// toolStripMenuItem3
 			// 
+			this.toolStripMenuItem3.AccessibleDescription = null;
+			this.toolStripMenuItem3.AccessibleName = null;
 			resources.ApplyResources(this.toolStripMenuItem3, "toolStripMenuItem3");
+			this.toolStripMenuItem3.BackgroundImage = null;
 			this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+			this.toolStripMenuItem3.ShortcutKeyDisplayString = null;
 			// 
 			// mP3ToolStripMenuItem
 			// 
-			this.mP3ToolStripMenuItem.Name = "mP3ToolStripMenuItem";
+			this.mP3ToolStripMenuItem.AccessibleDescription = null;
+			this.mP3ToolStripMenuItem.AccessibleName = null;
 			resources.ApplyResources(this.mP3ToolStripMenuItem, "mP3ToolStripMenuItem");
+			this.mP3ToolStripMenuItem.BackgroundImage = null;
+			this.mP3ToolStripMenuItem.Name = "mP3ToolStripMenuItem";
+			this.mP3ToolStripMenuItem.ShortcutKeyDisplayString = null;
 			// 
 			// oGGToolStripMenuItem
 			// 
-			this.oGGToolStripMenuItem.Name = "oGGToolStripMenuItem";
+			this.oGGToolStripMenuItem.AccessibleDescription = null;
+			this.oGGToolStripMenuItem.AccessibleName = null;
 			resources.ApplyResources(this.oGGToolStripMenuItem, "oGGToolStripMenuItem");
+			this.oGGToolStripMenuItem.BackgroundImage = null;
+			this.oGGToolStripMenuItem.Name = "oGGToolStripMenuItem";
+			this.oGGToolStripMenuItem.ShortcutKeyDisplayString = null;
+			// 
+			// txtInputPath
+			// 
+			this.txtInputPath.AccessibleDescription = null;
+			this.txtInputPath.AccessibleName = null;
+			this.txtInputPath.AllowDrop = true;
+			resources.ApplyResources(this.txtInputPath, "txtInputPath");
+			this.txtInputPath.BackColor = System.Drawing.SystemColors.Control;
+			this.txtInputPath.BackgroundImage = null;
+			this.txtInputPath.Font = null;
+			this.txtInputPath.Name = "txtInputPath";
+			this.toolTip1.SetToolTip(this.txtInputPath, resources.GetString("txtInputPath.ToolTip"));
+			this.txtInputPath.TextChanged += new System.EventHandler(this.txtInputPath_TextChanged);
+			this.txtInputPath.DragDrop += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragDrop);
+			this.txtInputPath.DragEnter += new System.Windows.Forms.DragEventHandler(this.PathTextBox_DragEnter);
+			// 
+			// grpInput
+			// 
+			this.grpInput.AccessibleDescription = null;
+			this.grpInput.AccessibleName = null;
+			resources.ApplyResources(this.grpInput, "grpInput");
+			this.grpInput.BackgroundImage = null;
+			this.grpInput.Controls.Add(this.textBatchReport);
+			this.grpInput.Controls.Add(this.fileSystemTreeView1);
+			this.grpInput.Controls.Add(this.txtInputPath);
+			this.grpInput.Font = null;
+			this.grpInput.Name = "grpInput";
+			this.grpInput.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpInput, resources.GetString("grpInput.ToolTip"));
+			// 
+			// textBatchReport
+			// 
+			this.textBatchReport.AccessibleDescription = null;
+			this.textBatchReport.AccessibleName = null;
+			resources.ApplyResources(this.textBatchReport, "textBatchReport");
+			this.textBatchReport.BackgroundImage = null;
+			this.textBatchReport.Font = null;
+			this.textBatchReport.Name = "textBatchReport";
+			this.textBatchReport.ReadOnly = true;
+			this.textBatchReport.TabStop = false;
+			this.toolTip1.SetToolTip(this.textBatchReport, resources.GetString("textBatchReport.ToolTip"));
+			// 
+			// fileSystemTreeView1
+			// 
+			this.fileSystemTreeView1.AccessibleDescription = null;
+			this.fileSystemTreeView1.AccessibleName = null;
+			this.fileSystemTreeView1.AllowDrop = true;
+			resources.ApplyResources(this.fileSystemTreeView1, "fileSystemTreeView1");
+			this.fileSystemTreeView1.BackColor = System.Drawing.SystemColors.Control;
+			this.fileSystemTreeView1.BackgroundImage = null;
+			this.fileSystemTreeView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.fileSystemTreeView1.CheckBoxes = true;
+			this.fileSystemTreeView1.Font = null;
+			this.fileSystemTreeView1.FullRowSelect = true;
+			this.fileSystemTreeView1.HideSelection = false;
+			this.fileSystemTreeView1.ItemHeight = 16;
+			this.fileSystemTreeView1.Name = "fileSystemTreeView1";
+			this.fileSystemTreeView1.ShowLines = false;
+			this.fileSystemTreeView1.ShowRootLines = false;
+			this.fileSystemTreeView1.SpecialFolders = new CUEControls.ExtraSpecialFolder[] {
+        CUEControls.ExtraSpecialFolder.MyComputer,
+        CUEControls.ExtraSpecialFolder.Profile,
+        CUEControls.ExtraSpecialFolder.MyMusic,
+        CUEControls.ExtraSpecialFolder.CommonMusic};
+			this.toolTip1.SetToolTip(this.fileSystemTreeView1, resources.GetString("fileSystemTreeView1.ToolTip"));
+			this.fileSystemTreeView1.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeView1_AfterCheck);
+			this.fileSystemTreeView1.NodeAttributes += new CUEControls.FileSystemTreeViewNodeAttributesHandler(this.fileSystemTreeView1_NodeAttributes);
+			this.fileSystemTreeView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.fileSystemTreeView1_DragDrop);
+			this.fileSystemTreeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeView1_AfterSelect);
+			this.fileSystemTreeView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.fileSystemTreeView1_MouseDown);
+			this.fileSystemTreeView1.DragEnter += new System.Windows.Forms.DragEventHandler(this.fileSystemTreeView1_DragEnter);
+			this.fileSystemTreeView1.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.fileSystemTreeView1_AfterExpand);
+			// 
+			// grpExtra
+			// 
+			this.grpExtra.AccessibleDescription = null;
+			this.grpExtra.AccessibleName = null;
+			resources.ApplyResources(this.grpExtra, "grpExtra");
+			this.grpExtra.BackgroundImage = null;
+			this.grpExtra.Controls.Add(this.numericWriteOffset);
+			this.grpExtra.Controls.Add(this.txtPreGapLength);
+			this.grpExtra.Controls.Add(this.lblWriteOffset);
+			this.grpExtra.Controls.Add(this.label2);
+			this.grpExtra.Controls.Add(this.txtDataTrackLength);
+			this.grpExtra.Controls.Add(this.label1);
+			this.grpExtra.Font = null;
+			this.grpExtra.Name = "grpExtra";
+			this.grpExtra.TabStop = false;
+			this.toolTip1.SetToolTip(this.grpExtra, resources.GetString("grpExtra.ToolTip"));
+			// 
+			// numericWriteOffset
+			// 
+			this.numericWriteOffset.AccessibleDescription = null;
+			this.numericWriteOffset.AccessibleName = null;
+			resources.ApplyResources(this.numericWriteOffset, "numericWriteOffset");
+			this.numericWriteOffset.Font = null;
+			this.numericWriteOffset.Maximum = new decimal(new int[] {
+            99999,
+            0,
+            0,
+            0});
+			this.numericWriteOffset.Minimum = new decimal(new int[] {
+            99999,
+            0,
+            0,
+            -2147483648});
+			this.numericWriteOffset.Name = "numericWriteOffset";
+			this.toolTip1.SetToolTip(this.numericWriteOffset, resources.GetString("numericWriteOffset.ToolTip"));
+			// 
+			// lblWriteOffset
+			// 
+			this.lblWriteOffset.AccessibleDescription = null;
+			this.lblWriteOffset.AccessibleName = null;
+			resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset");
+			this.lblWriteOffset.Font = null;
+			this.lblWriteOffset.Name = "lblWriteOffset";
+			this.toolTip1.SetToolTip(this.lblWriteOffset, resources.GetString("lblWriteOffset.ToolTip"));
+			// 
+			// contextMenuStripFileTree
+			// 
+			this.contextMenuStripFileTree.AccessibleDescription = null;
+			this.contextMenuStripFileTree.AccessibleName = null;
+			resources.ApplyResources(this.contextMenuStripFileTree, "contextMenuStripFileTree");
+			this.contextMenuStripFileTree.BackgroundImage = null;
+			this.contextMenuStripFileTree.Font = null;
+			this.contextMenuStripFileTree.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SelectedNodeName,
+            this.toolStripSeparator2,
+            this.setAsMyMusicFolderToolStripMenuItem,
+            this.resetToOriginalLocationToolStripMenuItem});
+			this.contextMenuStripFileTree.Name = "contextMenuStripFileTree";
+			this.toolTip1.SetToolTip(this.contextMenuStripFileTree, resources.GetString("contextMenuStripFileTree.ToolTip"));
+			// 
+			// SelectedNodeName
+			// 
+			this.SelectedNodeName.AccessibleDescription = null;
+			this.SelectedNodeName.AccessibleName = null;
+			resources.ApplyResources(this.SelectedNodeName, "SelectedNodeName");
+			this.SelectedNodeName.BackgroundImage = null;
+			this.SelectedNodeName.Name = "SelectedNodeName";
+			this.SelectedNodeName.ShortcutKeyDisplayString = null;
+			// 
+			// toolStripSeparator2
+			// 
+			this.toolStripSeparator2.AccessibleDescription = null;
+			this.toolStripSeparator2.AccessibleName = null;
+			resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
+			this.toolStripSeparator2.Name = "toolStripSeparator2";
+			// 
+			// setAsMyMusicFolderToolStripMenuItem
+			// 
+			this.setAsMyMusicFolderToolStripMenuItem.AccessibleDescription = null;
+			this.setAsMyMusicFolderToolStripMenuItem.AccessibleName = null;
+			resources.ApplyResources(this.setAsMyMusicFolderToolStripMenuItem, "setAsMyMusicFolderToolStripMenuItem");
+			this.setAsMyMusicFolderToolStripMenuItem.BackgroundImage = null;
+			this.setAsMyMusicFolderToolStripMenuItem.Name = "setAsMyMusicFolderToolStripMenuItem";
+			this.setAsMyMusicFolderToolStripMenuItem.ShortcutKeyDisplayString = null;
+			this.setAsMyMusicFolderToolStripMenuItem.Click += new System.EventHandler(this.setAsMyMusicFolderToolStripMenuItem_Click);
+			// 
+			// resetToOriginalLocationToolStripMenuItem
+			// 
+			this.resetToOriginalLocationToolStripMenuItem.AccessibleDescription = null;
+			this.resetToOriginalLocationToolStripMenuItem.AccessibleName = null;
+			resources.ApplyResources(this.resetToOriginalLocationToolStripMenuItem, "resetToOriginalLocationToolStripMenuItem");
+			this.resetToOriginalLocationToolStripMenuItem.BackgroundImage = null;
+			this.resetToOriginalLocationToolStripMenuItem.Name = "resetToOriginalLocationToolStripMenuItem";
+			this.resetToOriginalLocationToolStripMenuItem.ShortcutKeyDisplayString = null;
+			this.resetToOriginalLocationToolStripMenuItem.Click += new System.EventHandler(this.resetToOriginalLocationToolStripMenuItem_Click);
+			// 
+			// panel1
+			// 
+			this.panel1.AccessibleDescription = null;
+			this.panel1.AccessibleName = null;
+			resources.ApplyResources(this.panel1, "panel1");
+			this.panel1.BackgroundImage = null;
+			this.panel1.Controls.Add(this.grpOutputPathGeneration);
+			this.panel1.Controls.Add(this.btnStop);
+			this.panel1.Controls.Add(this.btnConvert);
+			this.panel1.Controls.Add(this.btnSettings);
+			this.panel1.Controls.Add(this.grpExtra);
+			this.panel1.Controls.Add(this.btnAbout);
+			this.panel1.Controls.Add(this.grpOutputStyle);
+			this.panel1.Controls.Add(this.grpFreedb);
+			this.panel1.Controls.Add(this.grpAudioOutput);
+			this.panel1.Controls.Add(this.grpAction);
+			this.panel1.Controls.Add(this.btnPause);
+			this.panel1.Controls.Add(this.btnResume);
+			this.panel1.Font = null;
+			this.panel1.Name = "panel1";
+			this.toolTip1.SetToolTip(this.panel1, resources.GetString("panel1.ToolTip"));
 			// 
 			// frmCUETools
 			// 
+			this.AccessibleDescription = null;
+			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.btnResume);
-			this.Controls.Add(this.btnPause);
-			this.Controls.Add(this.btnStop);
-			this.Controls.Add(this.btnCUECreator);
+			this.BackgroundImage = null;
+			this.Controls.Add(this.panel1);
+			this.Controls.Add(this.grpInput);
 			this.Controls.Add(this.statusStrip1);
-			this.Controls.Add(this.grpAccurateRip);
-			this.Controls.Add(this.btnSettings);
-			this.Controls.Add(this.btnFilenameCorrector);
-			this.Controls.Add(this.btnBatch);
-			this.Controls.Add(this.grpAudioOutput);
-			this.Controls.Add(this.grpOutputPathGeneration);
-			this.Controls.Add(this.btnAbout);
-			this.Controls.Add(this.grpOutputStyle);
-			this.Controls.Add(this.grpCUEPaths);
-			this.Controls.Add(this.btnConvert);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
 			this.MaximizeBox = false;
 			this.Name = "frmCUETools";
+			this.toolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
 			this.Load += new System.EventHandler(this.frmCUETools_Load);
 			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.frmCUETools_FormClosed);
-			this.grpCUEPaths.ResumeLayout(false);
-			this.grpCUEPaths.PerformLayout();
 			this.grpOutputStyle.ResumeLayout(false);
 			this.grpOutputStyle.PerformLayout();
 			this.grpOutputPathGeneration.ResumeLayout(false);
 			this.grpOutputPathGeneration.PerformLayout();
 			this.grpAudioOutput.ResumeLayout(false);
 			this.grpAudioOutput.PerformLayout();
-			this.grpAccurateRip.ResumeLayout(false);
-			this.grpAccurateRip.PerformLayout();
+			this.grpAction.ResumeLayout(false);
+			this.grpAction.PerformLayout();
 			this.statusStrip1.ResumeLayout(false);
 			this.statusStrip1.PerformLayout();
-			this.groupBox1.ResumeLayout(false);
-			this.groupBox1.PerformLayout();
+			this.grpFreedb.ResumeLayout(false);
+			this.grpFreedb.PerformLayout();
 			this.contextMenuStripUDC.ResumeLayout(false);
+			this.grpInput.ResumeLayout(false);
+			this.grpInput.PerformLayout();
+			this.grpExtra.ResumeLayout(false);
+			this.grpExtra.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).EndInit();
+			this.contextMenuStripFileTree.ResumeLayout(false);
+			this.panel1.ResumeLayout(false);
 			this.ResumeLayout(false);
 			this.PerformLayout();
 
@@ -662,13 +1171,8 @@ namespace JDP {
 		#endregion
 
 		private System.Windows.Forms.Button btnConvert;
-		private System.Windows.Forms.GroupBox grpCUEPaths;
 		private System.Windows.Forms.Button btnBrowseOutput;
-		private System.Windows.Forms.Button btnBrowseInput;
-		private System.Windows.Forms.Label lblOutput;
-		private System.Windows.Forms.Label lblInput;
 		private System.Windows.Forms.TextBox txtOutputPath;
-		private System.Windows.Forms.TextBox txtInputPath;
 		private System.Windows.Forms.GroupBox grpOutputStyle;
 		private System.Windows.Forms.Button btnAbout;
 		private System.Windows.Forms.RadioButton rbGapsLeftOut;
@@ -687,21 +1191,18 @@ namespace JDP {
 		private System.Windows.Forms.RadioButton rbWavPack;
 		private System.Windows.Forms.RadioButton rbCustomFormat;
 		private System.Windows.Forms.TextBox txtCustomFormat;
-		private System.Windows.Forms.Button btnBatch;
-		private System.Windows.Forms.Button btnFilenameCorrector;
 		private System.Windows.Forms.Button btnSettings;
 		private System.Windows.Forms.RadioButton rbNoAudio;
-		private System.Windows.Forms.GroupBox grpAccurateRip;
-		private System.Windows.Forms.RadioButton rbArApplyOffset;
-		private System.Windows.Forms.RadioButton rbArVerify;
-		private System.Windows.Forms.RadioButton rbArNone;
+		private System.Windows.Forms.GroupBox grpAction;
+		private System.Windows.Forms.RadioButton rbActionVerifyThenEncode;
+		private System.Windows.Forms.RadioButton rbActionVerify;
+		private System.Windows.Forms.RadioButton rbActionEncode;
 		private System.Windows.Forms.StatusStrip statusStrip1;
 		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
 		private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar1;
 		private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar2;
 		private System.Windows.Forms.ToolTip toolTip1;
 		private System.Windows.Forms.RadioButton rbEmbedCUE;
-        private System.Windows.Forms.Button btnCUECreator;
 		private System.Windows.Forms.MaskedTextBox txtDataTrackLength;
 		private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.RadioButton rbAPE;
@@ -709,9 +1210,9 @@ namespace JDP {
 		private System.Windows.Forms.Button btnPause;
 		private System.Windows.Forms.Button btnResume;
 		private System.Windows.Forms.CheckBox chkLossyWAV;
-		private System.Windows.Forms.RadioButton rbArAndEncode;
+		private System.Windows.Forms.RadioButton rbActionVerifyAndEncode;
 		private System.Windows.Forms.RadioButton rbTTA;
-		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.GroupBox grpFreedb;
 		private System.Windows.Forms.RadioButton rbFreedbAlways;
 		private System.Windows.Forms.RadioButton rbFreedbIf;
 		private System.Windows.Forms.RadioButton rbFreedbNever;
@@ -725,9 +1226,31 @@ namespace JDP {
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
 		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
 		private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
-		private System.Windows.Forms.RadioButton rbArPlusCRC;
+		private System.Windows.Forms.RadioButton rbActionVerifyAndCRCs;
 		private System.Windows.Forms.MaskedTextBox txtPreGapLength;
 		private System.Windows.Forms.Label label2;
+		private CUEControls.FileSystemTreeView fileSystemTreeView1;
+		private System.Windows.Forms.TextBox txtInputPath;
+		private System.Windows.Forms.CheckBox chkMulti;
+		private System.Windows.Forms.CheckBox chkRecursive;
+		private System.Windows.Forms.GroupBox grpInput;
+		private System.Windows.Forms.GroupBox grpExtra;
+		private System.Windows.Forms.RadioButton rbActionCorrectFilenames;
+		private System.Windows.Forms.RadioButton rbActionCreateCUESheet;
+		private System.Windows.Forms.ContextMenuStrip contextMenuStripFileTree;
+		private System.Windows.Forms.ToolStripMenuItem setAsMyMusicFolderToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem SelectedNodeName;
+		private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+		private System.Windows.Forms.ToolStripMenuItem resetToOriginalLocationToolStripMenuItem;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelAR;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelFLAC;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelWV;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
+		private System.Windows.Forms.NumericUpDown numericWriteOffset;
+		private System.Windows.Forms.Label lblWriteOffset;
+		private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelProcessed;
+		private System.Windows.Forms.TextBox textBatchReport;
+		private System.Windows.Forms.Panel panel1;
 	}
 }
 
diff --git a/CUETools/frmCUETools.cs b/CUETools/frmCUETools.cs
index 7730a8c..7d58bf0 100644
--- a/CUETools/frmCUETools.cs
+++ b/CUETools/frmCUETools.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Drawing;
 using System.Text;
@@ -40,25 +41,10 @@ namespace JDP {
 		public frmCUETools() {
 			_config = new CUEConfig();
 			InitializeComponent();
-		}
-
-		private void btnBrowseInput_Click(object sender, EventArgs e) {
-			OpenFileDialog fileDlg = new OpenFileDialog();
-			DialogResult dlgRes;
-
-			fileDlg.Title = "Input CUE Sheet or album image";
-			fileDlg.Filter = "CUE Sheets (*.cue)|*.cue|FLAC images (*.flac)|*.flac|WavPack images (*.wv)|*.wv|APE images (*.ape)|*.ape|RAR archives (*.rar)|*.rar";
-
-			try
-			{
-				if (Directory.Exists (Path.GetDirectoryName (txtInputPath.Text)))
-					fileDlg.InitialDirectory = Path.GetDirectoryName (txtInputPath.Text);
-			}
-			catch { }
-			dlgRes = fileDlg.ShowDialog();
-			if (dlgRes == DialogResult.OK) {
-				txtInputPath.Text = fileDlg.FileName;
-			}
+			m_icon_mgr = new CUEControls.ShellIconMgr();
+			m_icon_mgr.SetExtensionIcon(".flac", global::JDP.Properties.Resources.flac);
+			m_icon_mgr.SetExtensionIcon(".wv", global::JDP.Properties.Resources.wv);
+			m_icon_mgr.SetExtensionIcon(".cue", global::JDP.Properties.Resources.cue);
 		}
 
 		private void btnBrowseOutput_Click(object sender, EventArgs e) {
@@ -74,60 +60,68 @@ namespace JDP {
 			}
 		}
 
+		private void AddNodesToBatch(TreeNodeCollection nodes)
+		{
+			foreach (TreeNode node in nodes)
+			{
+				if (node.Checked && node.Tag is FileSystemInfo)
+				{
+					_batchPaths.Add(((FileSystemInfo)node.Tag).FullName);
+					if (!chkRecursive.Checked)
+						AddNodesToBatch(node.Nodes);
+				}
+				else
+					AddNodesToBatch(node.Nodes);
+				node.Checked = false;
+			}
+		}
+
 		private void btnConvert_Click(object sender, EventArgs e) {
 			if ((_workThread != null) && (_workThread.IsAlive))
 				return;
 			if (!CheckWriteOffset()) return;
-			StartConvert();
-		}
-
-		private void btnBatch_Click(object sender, EventArgs e) {
-			if (rbDontGenerate.Checked) {
-				MessageBox.Show("Batch mode cannot be used with the output path set manually.",
+			_batchReport = new StringBuilder();
+			_batchRoot = null;
+			_batchProcessed = 0;
+			if (!chkMulti.Checked && !chkRecursive.Checked)
+			{
+				StartConvert();
+				return;
+			}
+			if (rbDontGenerate.Checked)
+			{
+				MessageBox.Show(this, "Batch mode cannot be used with the output path set manually.",
 					"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return;
 			}
-			FolderBrowserDialog folderDialog = new FolderBrowserDialog();
-			folderDialog.Description = "Select the folder containing the CUE sheets you want to convert.  Subfolders will be included automatically.";
-			folderDialog.ShowNewFolderButton = false;
-			try
+			if (chkMulti.Checked)
+				AddNodesToBatch(fileSystemTreeView1.Nodes);
+			else
 			{
-				if (Directory.Exists(Path.GetDirectoryName(txtInputPath.Text)))
-					folderDialog.SelectedPath = Path.GetDirectoryName(txtInputPath.Text);
+				_batchPaths.Add(txtInputPath.Text);
+				_batchRoot = txtInputPath.Text;
 			}
-			catch { }
-			if (folderDialog.ShowDialog() == DialogResult.OK) {
-				if (!CheckWriteOffset()) return;
-				AddDirToBatch(folderDialog.SelectedPath);
-				StartConvert();
-			}
-		}
-
-		private void btnFilenameCorrector_Click(object sender, EventArgs e) {
-			if ((_fcForm == null) || _fcForm.IsDisposed) {
-				_fcForm = new frmFilenameCorrector();
-				CenterSubForm(_fcForm);
-				_fcForm.Show();
-			}
-			else {
-				_fcForm.Activate();
+			if (_batchPaths.Count == 0)
+			{
+				MessageBox.Show(this, "Nothing selected!", "Done", MessageBoxButtons.OK,
+					MessageBoxIcon.Information);
+				return;
 			}
+			StartConvert();
 		}
 
 		private void btnSettings_Click(object sender, EventArgs e) {
 			using (frmSettings settingsForm = new frmSettings()) {
-				settingsForm.WriteOffset = _writeOffset;
 				settingsForm.ReducePriority = _reducePriority;
 				settingsForm.Config = _config;
 
-				CenterSubForm(settingsForm);
 				settingsForm.ShowDialog();
 
-				_writeOffset = settingsForm.WriteOffset;
 				_reducePriority = settingsForm.ReducePriority;
 				_config = settingsForm.Config;
 				updateOutputStyles();
 				UpdateOutputPath();
+				SaveSettings();
 			}
 		}
 
@@ -164,6 +158,7 @@ namespace JDP {
 
 		private void txtInputPath_TextChanged(object sender, EventArgs e) {
 			UpdateOutputPath();
+			UpdateActions();
 		}
 
 		private void rbCreateSubdirectory_CheckedChanged(object sender, EventArgs e) {
@@ -195,6 +190,27 @@ namespace JDP {
 			LoadSettings();
 			if (_reducePriority)
 				Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;
+
+			fileSystemTreeView1.CheckBoxes = chkMulti.Checked;
+			fileSystemTreeView1.IconManager = m_icon_mgr;
+			if (InputPath != "")
+			{
+				TreeNode node = null;
+				try
+				{
+					node = fileSystemTreeView1.LookupNode(InputPath) ??
+						fileSystemTreeView1.LookupNode(Path.GetDirectoryName(InputPath));
+				}
+				catch
+				{
+				}
+				if (node != null)
+				{
+					fileSystemTreeView1.SelectedNode = node;
+					node.Expand();
+				}
+			}
+
 			SetupControls(false);
 			UpdateOutputPath();
 			updateOutputStyles();
@@ -207,15 +223,22 @@ namespace JDP {
 
 		// ********************************************************************************
 
-		frmFilenameCorrector _fcForm;
+		private CUEControls.ShellIconMgr m_icon_mgr;
 		List<string> _batchPaths;
+		StringBuilder _batchReport;
+		string _batchRoot;
+		int _batchProcessed;
 		bool _usePregapForFirstTrackInSingleFile;
-		int _writeOffset;
 		bool _reducePriority;
 		Thread _workThread;
 		CUESheet _workClass;
 		CUEConfig _config;
 
+		private bool IsCDROM(string pathIn)
+		{
+			return pathIn.Length == 3 && pathIn.Substring(1) == ":\\" && new DriveInfo(pathIn).DriveType == DriveType.CDRom;
+		}
+
 		private void StartConvert() {
 			try
 			{
@@ -223,12 +246,13 @@ namespace JDP {
 				if (_batchPaths.Count != 0)
 				{
 					txtInputPath.Text = _batchPaths[0];
+					txtInputPath.SelectAll();
 				}
 
 				string pathIn = txtInputPath.Text;
 				if (!File.Exists(pathIn))
 				{
-					if (!Directory.Exists(pathIn))
+					if (!Directory.Exists(pathIn) && !IsCDROM(pathIn))
 						throw new Exception("Input CUE Sheet not found.");
 					if (!pathIn.EndsWith(new string(Path.DirectorySeparatorChar, 1)))
 					{
@@ -241,9 +265,9 @@ namespace JDP {
 				cueSheet.PasswordRequired += new ArchivePasswordRequiredHandler(PasswordRequired);
 				cueSheet.CUEToolsProgress += new CUEToolsProgressHandler(SetStatus);
 				cueSheet.CUEToolsSelection += new CUEToolsSelectionHandler(MakeSelection);
-				cueSheet.WriteOffset = _writeOffset;
+				cueSheet.WriteOffset = (int)numericWriteOffset.Value;
 
-				object[] p = new object[6];
+				object[] p = new object[7];
 
 				_workThread = new Thread(WriteAudioFilesThread);
 				_workClass = cueSheet;
@@ -251,9 +275,10 @@ namespace JDP {
 				p[0] = cueSheet;
 				p[1] = pathIn;
 				p[2] = SelectedCUEStyle;
-				p[3] = SelectedAccurateRipMode;
+				p[3] = SelectedAction;
 				p[4] = SelectedOutputAudioFormat;
 				p[5] = chkLossyWAV.Checked;
+				p[6] = chkRecursive.Checked;
 
 				SetupControls(true);
 				_workThread.Priority = ThreadPriority.BelowNormal;
@@ -268,7 +293,12 @@ namespace JDP {
 				{
 					_batchPaths.RemoveAt(0);
 					if (_batchPaths.Count == 0)
-						ShowBatchDoneMessage();
+					{
+						frmReport reportForm = new frmReport();
+						reportForm.Message = _batchReport.ToString();
+						reportForm.ShowDialog(this);
+						//ShowBatchDoneMessage();
+					}
 					else
 						StartConvert();
 				}
@@ -302,108 +332,269 @@ namespace JDP {
 			});
 		}
 
+		private bool TryDummyCUE(string pathIn, out string cueSheetContents, out string ext)
+		{
+			string[] audioExts = new string[] { "*.wav", "*.flac", "*.wv", "*.ape", "*.m4a", "*.tta", "*.tak" };
+			for (int i = 0; i < audioExts.Length; i++)
+			{
+				cueSheetContents = CUESheet.CreateDummyCUESheet(pathIn, audioExts[i]);
+				if (cueSheetContents != null)
+				{
+					ext = audioExts[i].Substring(1);
+					return true;
+				}
+			}
+			cueSheetContents = null;
+			ext = null;
+			return false;
+		}
+
+		private void BatchLog(string format, string pathIn, params object[] args)
+		{
+			if (_batchRoot == null || !pathIn.StartsWith(_batchRoot))
+				_batchReport.Append(pathIn);
+			else
+			{
+				_batchReport.Append(".");
+				_batchReport.Append(pathIn, _batchRoot.Length, pathIn.Length - _batchRoot.Length);
+			}
+			_batchReport.Append(": ");
+			_batchReport.AppendFormat(format, args);
+			_batchReport.Append("\r\n");
+		}
+
 		private void WriteAudioFilesThread(object o) {
 			object[] p = (object[])o;
 
 			CUESheet cueSheet = (CUESheet)p[0];
 			string pathIn = (string)p[1];
 			CUEStyle cueStyle = (CUEStyle)p[2];
-			AccurateRipMode accurateRip = (AccurateRipMode)p[3];
+			CUEAction action = (CUEAction)p[3];
 			OutputAudioFormat outputFormat = (OutputAudioFormat)p[4];
 			bool lossyWAV = (bool)p[5];
+			bool recursive = (bool)p[6];
 			DialogResult dlgRes = DialogResult.OK;
 
 			try
 			{
-
-				bool outputAudio = outputFormat != OutputAudioFormat.NoAudio && accurateRip != AccurateRipMode.Verify && accurateRip != AccurateRipMode.VerifyPlusCRCs;
-				bool outputCUE = cueStyle != CUEStyle.SingleFileWithCUE && accurateRip != AccurateRipMode.Verify && accurateRip != AccurateRipMode.VerifyPlusCRCs;
-				string pathOut = null;
-				List<object> releases = null;
-
-				cueSheet.Open(pathIn);
-
-				if (_batchPaths.Count == 0 && accurateRip != AccurateRipMode.Verify && accurateRip != AccurateRipMode.VerifyPlusCRCs)
+				if (action == CUEAction.CreateDummyCUE)
 				{
-					if (rbFreedbAlways.Checked || (rbFreedbIf.Checked && 
-						(cueSheet.Artist == "" || cueSheet.Title == "" || cueSheet.Year == "")))
-						releases = cueSheet.LookupAlbumInfo();
-				}
-
-				this.Invoke((MethodInvoker)delegate()
-				{
-					if (releases != null && releases.Count > 0)
+					if (_batchPaths.Count > 0 && Directory.Exists(pathIn))
 					{
-						frmChoice dlg = new frmChoice();
-						dlg.CUE = cueSheet;
-						dlg.Choices = releases;
-						dlgRes = dlg.ShowDialog(this);
-						if (dlgRes == DialogResult.Cancel)
-						{
-							cueSheet.Close();
-							SetupControls(false);
-						}
+						if (recursive)
+							_batchPaths.InsertRange(1, Directory.GetDirectories(pathIn));
 					}
-					UpdateOutputPath(
-						cueSheet.Year != "" ? cueSheet.Year : "YYYY", 
-						cueSheet.Artist != "" ? cueSheet.Artist : "Unknown Artist", 
-						cueSheet.Title != "" ? cueSheet.Title : "Unknown Title");
-					pathOut = txtOutputPath.Text;
-				});
-
-				if (dlgRes == DialogResult.Cancel)
-					return;
-
-				cueSheet.GenerateFilenames(outputFormat, lossyWAV, pathOut);
-				string outDir = Path.GetDirectoryName(pathOut);
-				if (cueStyle == CUEStyle.SingleFileWithCUE)
-					cueSheet.SingleFilename = Path.GetFileName(pathOut);
-				if (outDir == "")
-					outDir = ".";
-
-				bool outputExists = false;
-				if (outputCUE)
-					outputExists = File.Exists(pathOut);
-				if (outputAudio)
-				{
-					if (cueStyle == CUEStyle.SingleFile || cueStyle == CUEStyle.SingleFileWithCUE)
-						outputExists |= File.Exists(Path.Combine(outDir, cueSheet.SingleFilename));
+					if (!Directory.Exists(pathIn))
+						BatchLog("no such directory.", pathIn);
 					else
 					{
-						if (cueStyle == CUEStyle.GapsAppended && _config.preserveHTOA)
-							outputExists |= File.Exists(Path.Combine(outDir, cueSheet.HTOAFilename));
-						for (int i = 0; i < cueSheet.TrackCount; i++)
-							outputExists |= File.Exists(Path.Combine(outDir, cueSheet.TrackFilenames[i]));
+						if (Directory.GetFiles(pathIn, "*.cue").Length != 0)
+							BatchLog("already contains a cue sheet.", pathIn);
+						else
+						{
+							string cueSheetContents, ext;
+							if (TryDummyCUE(pathIn, out cueSheetContents, out ext))
+							{
+								string cueName = Path.GetFileName(Path.GetDirectoryName(pathIn)) + ".cuetools" + ext + ".cue";
+								string fullCueName = Path.Combine(pathIn, cueName);
+								bool utf8Required = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(cueSheetContents)) != cueSheetContents;
+								StreamWriter sw1 = new StreamWriter(fullCueName, false, utf8Required ? Encoding.UTF8 : CUESheet.Encoding);
+								sw1.Write(cueSheetContents);
+								sw1.Close();
+								BatchLog("created ok.", fullCueName);
+							} else
+								BatchLog("no audio files.", pathIn);
+						}
 					}
 				}
-				dlgRes = DialogResult.Cancel;
-				if (outputExists)
+				else if (action == CUEAction.CorrectFilenames)
 				{
-					this.Invoke((MethodInvoker)delegate()
+					if (_batchPaths.Count > 0 && Directory.Exists(pathIn))
 					{
-						dlgRes = MessageBox.Show(this, "One or more output file already exists, " +
-							"do you want to overwrite?", "Overwrite?", (_batchPaths.Count == 0) ?
-							MessageBoxButtons.YesNo : MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
-						if (dlgRes == DialogResult.Yes)
-							outputExists = false;
-						else if (_batchPaths.Count == 0)
-							SetupControls(false);
-					});
-					if (outputExists && _batchPaths.Count == 0)
+						string [] cues = Directory.GetFiles(pathIn, "*.cue", recursive ? 
+							SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
+						if (cues.Length == 0)
+							BatchLog("no cue files.", pathIn);
+						else
+							_batchPaths.InsertRange(1, cues);
+					}
+					try
 					{
-						cueSheet.Close();
-						return;
+						if (Directory.Exists(pathIn))
+						{
+							if (_batchPaths.Count == 0)
+								throw new Exception ("is a directory");
+						}
+						else
+						{
+							if (Path.GetExtension(pathIn).ToLower() != ".cue")
+								throw new Exception("is not a .cue file");
+							string cue = null;
+							using (StreamReader sr = new StreamReader(pathIn, CUESheet.Encoding))
+								cue = sr.ReadToEnd();
+							string fixedCue = CUESheet.CorrectAudioFilenames(Path.GetDirectoryName(pathIn), cue, true, null);
+							if (fixedCue != cue)
+							{
+								using (StreamWriter sw = new StreamWriter(pathIn, false, CUESheet.Encoding))
+									sw.Write(fixedCue);
+								BatchLog("corrected.", pathIn);
+							}
+							else
+								BatchLog("no changes.", pathIn);
+						}
+					}
+					catch (Exception ex)
+					{
+						BatchLog("{0}.", pathIn, ex.Message);
 					}
 				}
-				if (!outputExists)
+				else
 				{
-					cueSheet.UsePregapForFirstTrackInSingleFile = _usePregapForFirstTrackInSingleFile && !outputAudio;
-					cueSheet.AccurateRip = accurateRip;
-					if (accurateRip != AccurateRipMode.None)
-						cueSheet.DataTrackLength = txtDataTrackLength.Text;
-					cueSheet.PreGapLengthMSF = txtPreGapLength.Text;
+					bool foundImages = false;
+					bool foundAudio = false;
+					bool processThis = true;
 
-					cueSheet.WriteAudioFiles(outDir, cueStyle);
+					if (_batchPaths.Count > 0 && Directory.Exists(pathIn))
+					{
+						if (recursive)
+							_batchPaths.InsertRange(1, Directory.GetDirectories(pathIn));
+						string[] cueFiles = Directory.GetFiles(pathIn, "*.cue");
+						if (cueFiles.Length > 0)
+						{
+							_batchPaths.InsertRange(1, cueFiles);
+							foundImages = true;
+						}
+						else
+						{
+							string cueSheetContents, ext1;
+							foundAudio = TryDummyCUE(pathIn, out cueSheetContents, out ext1);
+							string[] audioExts = new string[] { "*.flac", "*.wv", "*.ape" };
+							foreach (string ext in audioExts)
+								foreach (string audioFile in Directory.GetFiles(pathIn, ext))
+								{
+									TagLib.UserDefined.AdditionalFileTypes.Config = _config;
+									TagLib.File.IFileAbstraction file = new TagLib.File.LocalFileAbstraction(audioFile);
+									try
+									{
+										TagLib.File fileInfo = TagLib.File.Create(file);
+										NameValueCollection tags = Tagging.Analyze(fileInfo);
+										if (tags.Get("CUESHEET") != null)
+										{
+											_batchPaths.Insert(1, audioFile);
+											foundImages = true;
+										}
+									}
+									catch
+									{
+									}
+								}
+						}
+						processThis = !foundImages && foundAudio;
+					}
+
+					if (processThis)
+					{
+						bool convertAction = action == CUEAction.Convert || action == CUEAction.VerifyAndConvert || action == CUEAction.VerifyThenConvert;
+						string pathOut = null;
+						List<object> releases = null;
+
+						cueSheet.Action = action;
+						cueSheet.Open(pathIn);
+						if (action != CUEAction.Convert)
+							cueSheet.DataTrackLengthMSF = txtDataTrackLength.Text;
+						cueSheet.PreGapLengthMSF = txtPreGapLength.Text;
+						cueSheet.Lookup();
+
+						if (_batchPaths.Count == 0 && convertAction)
+						{
+							if (rbFreedbAlways.Checked || (rbFreedbIf.Checked &&
+								(cueSheet.Artist == "" || cueSheet.Title == "" || cueSheet.Year == "")))
+								releases = cueSheet.LookupAlbumInfo();
+						}
+
+						this.Invoke((MethodInvoker)delegate()
+						{
+							toolStripStatusLabelAR.Visible = action != CUEAction.Convert;// && cueSheet.ArVerify.ARStatus == null;
+							toolStripStatusLabelAR.Text = cueSheet.ArVerify.ARStatus == null ? cueSheet.ArVerify.Total(0).ToString() : "?";
+							toolStripStatusLabelAR.ToolTipText = "AccurateRip: " + (cueSheet.ArVerify.ARStatus ?? "found") + ".";
+							if (releases != null)
+							{
+								frmChoice dlg = new frmChoice();
+								dlg.CUE = cueSheet;
+								dlg.Choices = releases;
+								dlgRes = dlg.ShowDialog(this);
+								if (dlgRes == DialogResult.Cancel)
+								{
+									cueSheet.Close();
+									SetupControls(false);
+								}
+							}
+							UpdateOutputPath(
+								cueSheet.Year != "" ? cueSheet.Year : "YYYY",
+								cueSheet.Artist != "" ? cueSheet.Artist : "Unknown Artist",
+								cueSheet.Title != "" ? cueSheet.Title : "Unknown Title");
+							pathOut = txtOutputPath.Text;
+						});
+
+						if (dlgRes == DialogResult.Cancel)
+							return;
+
+						bool outputAudio = convertAction && outputFormat != OutputAudioFormat.NoAudio;
+						bool outputCUE = convertAction && (cueStyle == CUEStyle.SingleFile || (cueStyle == CUEStyle.SingleFileWithCUE && _config.createCUEFileWhenEmbedded));
+
+						cueSheet.GenerateFilenames(outputFormat, lossyWAV, pathOut);
+						string outDir = Path.GetDirectoryName(pathOut);
+						if (cueStyle == CUEStyle.SingleFileWithCUE)
+							cueSheet.SingleFilename = Path.GetFileName(pathOut);
+						if (outDir == "")
+							outDir = ".";
+
+						bool outputExists = false;
+						if (outputCUE)
+							outputExists = File.Exists(pathOut);
+						if (outputAudio)
+						{
+							if (cueStyle == CUEStyle.SingleFile || cueStyle == CUEStyle.SingleFileWithCUE)
+								outputExists |= File.Exists(Path.Combine(outDir, cueSheet.SingleFilename));
+							else
+							{
+								if (cueStyle == CUEStyle.GapsAppended && _config.preserveHTOA)
+									outputExists |= File.Exists(Path.Combine(outDir, cueSheet.HTOAFilename));
+								for (int i = 0; i < cueSheet.TrackCount; i++)
+									outputExists |= File.Exists(Path.Combine(outDir, cueSheet.TrackFilenames[i]));
+							}
+						}
+						dlgRes = DialogResult.Cancel;
+						if (outputExists)
+						{
+							this.Invoke((MethodInvoker)delegate()
+							{
+								dlgRes = MessageBox.Show(this, "One or more output file already exists, " +
+									"do you want to overwrite?", "Overwrite?", (_batchPaths.Count == 0) ?
+									MessageBoxButtons.YesNo : MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+								if (dlgRes == DialogResult.Yes)
+									outputExists = false;
+								else if (_batchPaths.Count == 0)
+									SetupControls(false);
+							});
+							if (outputExists && _batchPaths.Count == 0)
+							{
+								cueSheet.Close();
+								return;
+							}
+						}
+						if (!outputExists)
+						{
+							cueSheet.UsePregapForFirstTrackInSingleFile = _usePregapForFirstTrackInSingleFile && !outputAudio;
+							string status = cueSheet.WriteAudioFiles(outDir, cueStyle);
+							if (_batchPaths.Count > 0)
+							{
+								_batchProcessed++;
+								BatchLog("{0}.", pathIn, status);
+							}
+							cueSheet.CheckStop();
+						}
+					}
 				}
 				this.Invoke((MethodInvoker)delegate()
 				{
@@ -413,19 +604,23 @@ namespace JDP {
 						{
 							frmReport reportForm = new frmReport();
 							reportForm.Message = cueSheet.LOGContents;
-							CenterSubForm(reportForm);
 							reportForm.ShowDialog(this);
 						}
-						else if (cueSheet.AccurateRip == AccurateRipMode.Verify ||
-							cueSheet.AccurateRip == AccurateRipMode.VerifyPlusCRCs ||
-						(cueSheet.AccurateRip != AccurateRipMode.None && outputFormat != OutputAudioFormat.NoAudio))
+						else if (action == CUEAction.CreateDummyCUE || action == CUEAction.CorrectFilenames)
+						{
+							frmReport reportForm = new frmReport();
+							reportForm.Message = _batchReport.ToString();
+							reportForm.ShowDialog(this);
+						}
+						else if (cueSheet.Action == CUEAction.Verify ||
+							cueSheet.Action == CUEAction.VerifyPlusCRCs ||
+						(cueSheet.Action != CUEAction.Convert && outputFormat != OutputAudioFormat.NoAudio))
 						{
 							frmReport reportForm = new frmReport();
 							StringWriter sw = new StringWriter();
 							cueSheet.GenerateAccurateRipLog(sw);
 							reportForm.Message = sw.ToString();
 							sw.Close();
-							CenterSubForm(reportForm);
 							reportForm.ShowDialog(this);
 						}
 						else
@@ -435,6 +630,31 @@ namespace JDP {
 				});
 			}
 			catch (StopException)
+			{
+			}
+#if !DEBUG
+			catch (Exception ex)
+			{
+				if (_batchPaths.Count == 0)
+				{
+					this.Invoke((MethodInvoker)delegate()
+					{
+						SetupControls(false);
+						ShowErrorMessage(ex);
+					});
+				}
+				else
+				{
+					_batchProcessed++;
+					BatchLog("{0}.", pathIn, ex.Message);
+				}
+			}
+#endif
+			try
+			{
+				cueSheet.CheckStop();
+			}
+			catch (StopException)
 			{
 				_batchPaths.Clear();
 				this.Invoke((MethodInvoker)delegate()
@@ -444,20 +664,6 @@ namespace JDP {
 						MessageBoxIcon.Exclamation);
 				});
 			}
-#if !DEBUG
-			catch (Exception ex)
-			{
-				this.Invoke((MethodInvoker)delegate()
-				{
-					if (_batchPaths.Count == 0) SetupControls(false);
-					if (!ShowErrorMessage(ex))
-					{
-						_batchPaths.Clear();
-						SetupControls(false);
-					}
-				});
-			}
-#endif
 			cueSheet.Close();
 
 			if (_batchPaths.Count != 0) {
@@ -465,7 +671,10 @@ namespace JDP {
 				this.BeginInvoke((MethodInvoker)delegate() {
 					if (_batchPaths.Count == 0) {
 						SetupControls(false);
-						ShowBatchDoneMessage();
+						frmReport reportForm = new frmReport();
+						reportForm.Message = _batchReport.ToString();
+						reportForm.ShowDialog(this);
+						//ShowBatchDoneMessage();
 					}
 					else {
 						StartConvert();
@@ -484,20 +693,20 @@ namespace JDP {
 		}
 
 		private void SetupControls(bool running) {
-			grpCUEPaths.Enabled = !running;
+			bool converting = (SelectedAction == CUEAction.Convert || SelectedAction == CUEAction.VerifyAndConvert || SelectedAction == CUEAction.VerifyThenConvert);
+			bool verifying = (SelectedAction == CUEAction.Verify || SelectedAction == CUEAction.VerifyPlusCRCs || SelectedAction == CUEAction.VerifyAndConvert || SelectedAction == CUEAction.VerifyThenConvert);
+			//grpInput.Enabled = !running;
+			txtInputPath.Enabled = !running;
+			grpExtra.Enabled = !running;
 			grpOutputPathGeneration.Enabled = !running;
-			grpAudioOutput.Enabled = !running && !rbArVerify.Checked && !rbArPlusCRC.Checked;
-			grpAccurateRip.Enabled = !running;
-			grpOutputStyle.Enabled = !running && !rbArVerify.Checked && !rbArPlusCRC.Checked;
-			groupBox1.Enabled = !running && !rbArVerify.Checked && !rbArPlusCRC.Checked;
-			txtDataTrackLength.Enabled = !running && !rbArNone.Checked;
+			grpAudioOutput.Enabled = !running && converting;
+			grpAction.Enabled = !running;
+			grpOutputStyle.Enabled = !running && converting;
+			grpFreedb.Enabled = !running && converting;
+			txtDataTrackLength.Enabled = !running && verifying;
 			txtPreGapLength.Enabled = !running;
 			btnAbout.Enabled = !running;
 			btnSettings.Enabled = !running;
-			btnFilenameCorrector.Enabled = !running;
-			btnCUECreator.Enabled = !running;
-			btnBatch.Enabled = !running;
-			btnConvert.Enabled = !running;
 			btnConvert.Visible = !running;
 			btnStop.Enabled = btnPause.Enabled = btnResume.Enabled = running;
 			btnStop.Visible = btnPause.Visible = running;
@@ -505,6 +714,31 @@ namespace JDP {
 			toolStripStatusLabel1.Text = String.Empty;
 			toolStripProgressBar1.Value = 0;
 			toolStripProgressBar2.Value = 0;
+			toolStripStatusLabelAR.Visible = false;			
+			if (_batchPaths.Count > 0)
+			{
+				fileSystemTreeView1.Visible = false;
+				textBatchReport.Visible = true;
+				textBatchReport.Text = _batchReport.ToString();
+				textBatchReport.SelectAll();
+				textBatchReport.ScrollToCaret();
+				//toolStripStatusLabelProcessed.Visible = true;
+				//toolStripStatusLabelProcessed.Text = "Processed: " + _batchProcessed.ToString();
+				//toolStripStatusLabelProcessed.ToolTipText = _batchReport.ToString();
+			}
+			else
+			{
+				bool wasHidden = !fileSystemTreeView1.Visible;
+				fileSystemTreeView1.Visible = true;
+				toolStripStatusLabelProcessed.Visible = false;
+				textBatchReport.Visible = false;
+				if (wasHidden && fileSystemTreeView1.SelectedPath != null)
+				{
+					txtInputPath.Text = fileSystemTreeView1.SelectedPath;
+					txtInputPath.SelectAll();
+				}
+			}
+			UpdateActions();
 		}
 
 		private bool ShowErrorMessage(Exception ex) {
@@ -530,13 +764,13 @@ namespace JDP {
 				MessageBoxIcon.Information);
 		}
 
-		private void ShowBatchDoneMessage() {
-			MessageBox.Show(this, "Batch conversion is complete!", "Done", MessageBoxButtons.OK,
-				MessageBoxIcon.Information);
-		}
+		//private void ShowBatchDoneMessage() {
+		//    MessageBox.Show(this, "Batch conversion is complete!", "Done", MessageBoxButtons.OK,
+		//        MessageBoxIcon.Information);
+		//}
 
 		private bool CheckWriteOffset() {
-			if ((_writeOffset == 0) || rbNoAudio.Checked || rbArVerify.Checked || rbArPlusCRC.Checked)
+			if (numericWriteOffset.Value == 0 || rbNoAudio.Checked || rbActionVerify.Checked || rbActionVerifyAndCRCs.Checked)
 			{
 				return true;
 			}
@@ -548,27 +782,20 @@ namespace JDP {
 			return (dlgRes == DialogResult.Yes);
 		}
 
-		private void AddDirToBatch(string dir) {
-			string[] files = Directory.GetFiles(dir, "*.cue");
-			string[] subDirs = Directory.GetDirectories(dir);
-			_batchPaths.AddRange(files);
-			foreach (string subDir in subDirs) {
-				AddDirToBatch(subDir);
-			}
-		}
-
 		private void LoadSettings() {
 			SettingsReader sr = new SettingsReader("CUE Tools", "settings.txt");
 			txtCreateSubdirectory.Text = sr.Load("OutputSubdirectory") ?? "New";
 			txtAppendFilename.Text = sr.Load("OutputFilenameSuffix") ?? "-New";
-			txtCustomFormat.Text = sr.Load("OutputCustomFormat") ?? "%1:-2\\New\\%-1\\%F.cue";
+			txtCustomFormat.Text = sr.Load("OutputCustomFormat") ?? "%music%\\Converted\\%artist%\\%year% - %album%\\%artist% - %album%.cue";
 			SelectedOutputPathGeneration = (OutputPathGeneration?)sr.LoadInt32("OutputPathGeneration", null, null) ?? OutputPathGeneration.CreateSubdirectory;
 			SelectedOutputAudioFormat = (OutputAudioFormat?)sr.LoadInt32("OutputAudioFormat", null, null) ?? OutputAudioFormat.WAV;
-			SelectedAccurateRipMode = (AccurateRipMode?)sr.LoadInt32("AccurateRipMode", null, null) ?? AccurateRipMode.None;
+			SelectedAction = (CUEAction?)sr.LoadInt32("AccurateRipMode", null, null) ?? CUEAction.Convert;
 			SelectedCUEStyle = (CUEStyle?)sr.LoadInt32("CUEStyle", null, null) ?? CUEStyle.SingleFileWithCUE;
-			_writeOffset = sr.LoadInt32("WriteOffset", null, null) ?? 0;
+			numericWriteOffset.Value = sr.LoadInt32("WriteOffset", null, null) ?? 0;
 			_usePregapForFirstTrackInSingleFile = sr.LoadBoolean("UsePregapForFirstTrackInSingleFile") ?? false;
 			_reducePriority = sr.LoadBoolean("ReducePriority") ?? true;
+			chkMulti.Checked = sr.LoadBoolean("BatchProcessing") ?? false;
+			chkRecursive.Checked = sr.LoadBoolean("RecursiveProcessing") ?? true;
 			chkLossyWAV.Checked = sr.LoadBoolean("LossyWav") ?? false;
 			switch (sr.LoadInt32("FreedbLookup", null, null) ?? 2)
 			{
@@ -586,11 +813,13 @@ namespace JDP {
 			sw.Save("OutputFilenameSuffix", txtAppendFilename.Text);
 			sw.Save("OutputCustomFormat", txtCustomFormat.Text);
 			sw.Save("OutputAudioFormat", (int)SelectedOutputAudioFormat);
-			sw.Save("AccurateRipMode", (int)SelectedAccurateRipMode);
+			sw.Save("AccurateRipMode", (int)SelectedAction);
 			sw.Save("CUEStyle", (int)SelectedCUEStyle);
-			sw.Save("WriteOffset", _writeOffset);
+			sw.Save("WriteOffset", (int)numericWriteOffset.Value);
 			sw.Save("UsePregapForFirstTrackInSingleFile", _usePregapForFirstTrackInSingleFile);
 			sw.Save("ReducePriority", _reducePriority);
+			sw.Save("BatchProcessing", chkMulti.Checked);
+			sw.Save("RecursiveProcessing", chkRecursive.Checked);
 			sw.Save("LossyWav", chkLossyWAV.Checked);
 			sw.Save("FreedbLookup", rbFreedbNever.Checked ? 0 : rbFreedbIf.Checked ? 1 : 2);
 			_config.Save(sw);
@@ -656,6 +885,8 @@ namespace JDP {
 		}
 
 		private string GetDirectoryElements(string dir, int first, int last) {
+			if (dir == null)
+				return "";
 			string[] dirSplit = dir.Split(Path.DirectorySeparatorChar,
 				Path.AltDirectorySeparatorChar);
 			int count = dirSplit.Length;
@@ -761,68 +992,48 @@ namespace JDP {
 			}
 		}
 
-		private AccurateRipMode SelectedAccurateRipMode
+		private CUEAction SelectedAction
 		{
 			get
 			{
 				return
-					rbArPlusCRC.Checked ? AccurateRipMode.VerifyPlusCRCs :
-					rbArVerify.Checked ? AccurateRipMode.Verify :
-					rbArApplyOffset.Checked ? AccurateRipMode.VerifyThenConvert :
-					rbArAndEncode.Checked ? AccurateRipMode.VerifyAndConvert :
-					AccurateRipMode.None;
+					rbActionVerifyAndCRCs.Checked ? CUEAction.VerifyPlusCRCs :
+					rbActionVerify.Checked ? CUEAction.Verify :
+					rbActionVerifyThenEncode.Checked ? CUEAction.VerifyThenConvert :
+					rbActionVerifyAndEncode.Checked ? CUEAction.VerifyAndConvert :
+					rbActionCorrectFilenames.Checked ? CUEAction.CorrectFilenames :
+					rbActionCreateCUESheet.Checked ? CUEAction.CreateDummyCUE :
+					CUEAction.Convert;
 			}
 			set
 			{
 				switch (value)
 				{
-					case AccurateRipMode.VerifyPlusCRCs:
-						rbArPlusCRC.Checked = true;
+					case CUEAction.VerifyPlusCRCs:
+						rbActionVerifyAndCRCs.Checked = true;
 						break;
-					case AccurateRipMode.Verify:
-						rbArVerify.Checked = true;
+					case CUEAction.Verify:
+						rbActionVerify.Checked = true;
 						break;
-					case AccurateRipMode.VerifyThenConvert:
-						rbArApplyOffset.Checked = true;
+					case CUEAction.VerifyThenConvert:
+						rbActionVerifyThenEncode.Checked = true;
 						break;
-					case AccurateRipMode.VerifyAndConvert:
-						rbArAndEncode.Checked = true;
+					case CUEAction.VerifyAndConvert:
+						rbActionVerifyAndEncode.Checked = true;
+						break;
+					case CUEAction.CorrectFilenames:
+						rbActionCorrectFilenames.Checked = true;
+						break;
+					case CUEAction.CreateDummyCUE:
+						rbActionCreateCUESheet.Checked = true;
 						break;
 					default:
-						rbArNone.Checked = true;
+						rbActionEncode.Checked = true;
 						break;
 				}
 			}
 		}
 
-		private void CenterSubForm(Form form) {
-			int centerX, centerY, formX, formY;
-			Rectangle formRect, maxRect;
-
-			centerX = ((Left * 2) + Width ) / 2;
-			centerY = ((Top  * 2) + Height) / 2;
-			formX   = ((Left * 2) + Width  - form.Width ) / 2;
-			formY   = ((Top  * 2) + Height - form.Height) / 2;
-
-			formRect = new Rectangle(formX, formY, form.Width, form.Height);
-			maxRect = Screen.GetWorkingArea(new Point(centerX, centerY));
-
-			if (formRect.Right > maxRect.Right) {
-				formRect.X -= formRect.Right - maxRect.Right;
-			}
-			if (formRect.Bottom > maxRect.Bottom) {
-				formRect.Y -= formRect.Bottom - maxRect.Bottom;
-			}
-			if (formRect.X < maxRect.X) {
-				formRect.X = maxRect.X;
-			}
-			if (formRect.Y < maxRect.Y) {
-				formRect.Y = maxRect.Y;
-			}
-
-			form.Location = formRect.Location;
-		}
-
 		private void UpdateOutputPath() {
 			UpdateOutputPath("YYYY", "Artist", "Album");
 		}
@@ -892,11 +1103,19 @@ namespace JDP {
 					List<string> replace = new List<string>();
 					bool rs = _config.replaceSpaces;
 
+					find.Add("%music%");
+					find.Add("%artist%");
 					find.Add("%D");
+					find.Add("%album%");
 					find.Add("%C");
+					find.Add("%year%");
 					find.Add("%Y");
+					replace.Add(m_icon_mgr.GetFolderPath(CUEControls.ExtraSpecialFolder.MyMusic));
+					replace.Add(General.EmptyStringToNull(_config.CleanseString(rs ? artist.Replace(' ', '_') : artist)));
 					replace.Add(General.EmptyStringToNull(_config.CleanseString(rs ? artist.Replace(' ', '_') : artist)));
 					replace.Add(General.EmptyStringToNull(_config.CleanseString(rs ? album.Replace(' ', '_') : album)));
+					replace.Add(General.EmptyStringToNull(_config.CleanseString(rs ? album.Replace(' ', '_') : album)));
+					replace.Add(year);
 					replace.Add(year);
 					BuildOutputPathFindReplace(pathIn, format, find, replace);
 
@@ -950,57 +1169,6 @@ namespace JDP {
 			UpdateOutputPath();
 		}
 
-		private void rbArVerify_CheckedChanged(object sender, EventArgs e)
-		{
-			UpdateOutputPath();
-			SetupControls (false);
-		}
-
-		private void CUECreator (string dir)
-		{
-			string[] cueFiles = Directory.GetFiles(dir, "*.cue");
-			if (cueFiles.Length == 0)
-			{
-				string[] audioExts = new string[] { "*.wav", "*.flac", "*.wv", "*.ape", "*.m4a", "*.tta" };
-				for (int i = 0; i < audioExts.Length; i++)
-				{
-					string cueSheet = CUESheet.CreateDummyCUESheet(dir, audioExts[i]);
-					if (cueSheet == null)
-						continue;
-					string cueName = Path.GetFileName(dir) + ".cuetools" + audioExts[i].Substring(1) + ".cue";
-					cueName = Path.Combine(dir, cueName);
-					bool utf8Required = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(cueSheet)) != cueSheet;
-					StreamWriter sw1 = new StreamWriter(cueName, false, utf8Required ? Encoding.UTF8 : CUESheet.Encoding);
-					sw1.Write(cueSheet);
-					sw1.Close();
-					break;
-				}
-			}
-			string[] subDirs = Directory.GetDirectories(dir);
-			foreach (string subDir in subDirs)
-			{
-				CUECreator (subDir);
-			}
-		}
-
-        private void btnCUECreator_Click(object sender, EventArgs e)
-        {
-			FolderBrowserDialog folderDialog = new FolderBrowserDialog();
-			folderDialog.Description = "Select the folder containing the audio files without CUE sheets. Subfolders will be included automatically.";
-			folderDialog.ShowNewFolderButton = false;
-			if (folderDialog.ShowDialog() == DialogResult.OK)
-			{
-				try
-				{
-					CUECreator(folderDialog.SelectedPath);
-				}
-				catch (Exception ex)
-				{
-					ShowErrorMessage(ex);
-				}
-			}
-		}
-
 		private void rbAPE_CheckedChanged(object sender, EventArgs e)
 		{
 			updateOutputStyles();
@@ -1029,12 +1197,6 @@ namespace JDP {
 			UpdateOutputPath();
 		}
 
-		private void rbArApplyOffset_CheckedChanged(object sender, EventArgs e)
-		{
-			UpdateOutputPath();
-			SetupControls(false);
-		}
-
 		private void rbTTA_CheckedChanged(object sender, EventArgs e)
 		{
 			updateOutputStyles();
@@ -1121,11 +1283,304 @@ namespace JDP {
 			UpdateOutputPath();
 		}
 
-		private void rbArPlusCRC_CheckedChanged(object sender, EventArgs e)
+		private void fileSystemTreeView1_NodeAttributes(object sender, CUEControls.FileSystemTreeViewNodeAttributesEventArgs e)
+		{
+			if ((e.file.Attributes & FileAttributes.Hidden) != 0)
+			{
+				e.isVisible = false;
+				return;
+			}
+			if ((e.file.Attributes & FileAttributes.Directory) != 0)
+			{
+				e.isVisible = true;
+				e.isExpandable = true;
+				//		  e.isExpandable = false;
+				//        foreach (FileSystemInfo subfile in ((DirectoryInfo)e.file).GetFileSystemInfos())
+				//            if (IsVisible(subfile))
+				//            {
+				//                e.isExpandable = true;
+				//                break;
+				//            }
+				return;
+			}
+			string ext = e.file.Extension.ToLower();
+			if (ext == ".cue")
+			{
+				e.isVisible = true;
+				e.isExpandable = false;
+				return;
+			}
+			if (ext == ".zip")
+			{
+				e.isVisible = false;
+				e.isExpandable = false;
+				try
+				{
+					using (ICSharpCode.SharpZipLib.Zip.ZipFile unzip = new ICSharpCode.SharpZipLib.Zip.ZipFile(e.file.FullName))
+					{
+						foreach (ICSharpCode.SharpZipLib.Zip.ZipEntry entry in unzip)
+						{
+							if (entry.IsFile && Path.GetExtension(entry.Name).ToLower() == ".cue")
+							{
+								e.isVisible = true;
+								break;
+							}
+
+						}
+						unzip.Close();
+					}
+				}
+				catch
+				{
+				}
+				return;
+			}
+			if (ext == ".rar")
+			{
+				e.isVisible = true;
+				e.isExpandable = false;
+				return;
+			}
+			if (ext != "" && ".flac;.ape;.wv;".Contains(ext))
+			{
+				TagLib.UserDefined.AdditionalFileTypes.Config = _config;
+				TagLib.File.IFileAbstraction file = new TagLib.File.LocalFileAbstraction(e.file.FullName);
+				try
+				{
+					TagLib.File fileInfo = TagLib.File.Create(file);
+					NameValueCollection tags = Tagging.Analyze(fileInfo);
+					e.isVisible = tags.Get("CUESHEET") != null;
+				}
+				catch
+				{
+					e.isVisible = false;
+				}
+				e.isExpandable = false;
+				return;
+			}
+			return;
+		}
+
+		private void UpdateActions()
+		{
+			if (chkMulti.Checked)
+			{
+				rbActionCorrectFilenames.Enabled = true;
+				rbActionCreateCUESheet.Enabled = true;
+				rbActionEncode.Enabled = true;
+				rbActionVerifyAndCRCs.Enabled = true;
+				rbActionVerify.Enabled = true;
+				rbActionVerifyThenEncode.Enabled = true;
+				rbActionVerifyAndEncode.Enabled = true;
+			}
+			else if (chkRecursive.Checked)
+			{
+				string pathIn = txtInputPath.Text;
+				rbActionCorrectFilenames.Enabled = 
+					rbActionCreateCUESheet.Enabled =
+					rbActionVerifyAndEncode.Enabled =
+					rbActionVerifyThenEncode.Enabled =
+					rbActionVerify.Enabled =
+					rbActionVerifyAndCRCs.Enabled =
+					rbActionEncode.Enabled = pathIn.Length != 0 && Directory.Exists(pathIn);
+			}
+			else
+			{
+				string pathIn = txtInputPath.Text;
+				string cueSheetContents, ext;
+				rbActionCorrectFilenames.Enabled = pathIn.Length != 0
+					&& File.Exists(pathIn)
+					&& Path.GetExtension(pathIn).ToLower() == ".cue";
+				rbActionCreateCUESheet.Enabled = pathIn.Length != 0
+					&& Directory.Exists(pathIn)
+					&& Directory.GetFiles(pathIn, "*.cue").Length == 0
+					&& TryDummyCUE(pathIn, out cueSheetContents, out ext);
+				rbActionVerifyAndEncode.Enabled =
+					rbActionVerifyThenEncode.Enabled =
+					rbActionVerify.Enabled =
+					rbActionVerifyAndCRCs.Enabled =
+					rbActionEncode.Enabled = pathIn.Length != 0
+						&& (File.Exists(pathIn) || IsCDROM(pathIn) || rbActionCreateCUESheet.Enabled);
+			}
+			btnConvert.Enabled = btnConvert.Visible &&
+				 ((rbActionCorrectFilenames.Enabled && rbActionCorrectFilenames.Checked)
+				|| (rbActionCreateCUESheet.Enabled && rbActionCreateCUESheet.Checked)
+				|| (rbActionEncode.Enabled && rbActionEncode.Checked)
+				|| (rbActionVerifyAndCRCs.Enabled && rbActionVerifyAndCRCs.Checked)
+				|| (rbActionVerify.Enabled && rbActionVerify.Checked)
+				|| (rbActionVerifyThenEncode.Enabled && rbActionVerifyThenEncode.Checked)
+				|| (rbActionVerifyAndEncode.Enabled && rbActionVerifyAndEncode.Checked));
+		}
+
+		private void fileSystemTreeView1_AfterSelect(object sender, TreeViewEventArgs e)
+		{
+			if (fileSystemTreeView1.SelectedPath != null)
+			{
+				txtInputPath.Text = fileSystemTreeView1.SelectedPath;
+				txtInputPath.SelectAll();
+			}
+		}
+
+		private void chkMulti_CheckedChanged(object sender, EventArgs e)
+		{
+			fileSystemTreeView1.CheckBoxes = chkMulti.Checked;
+			if (fileSystemTreeView1.SelectedNode != null)
+			{
+				if (chkMulti.Checked)
+					fileSystemTreeView1.SelectedNode.Checked = true;
+				fileSystemTreeView1.SelectedNode.Expand();
+			}
+			UpdateActions();
+		}
+
+		private void chkRecursive_CheckedChanged(object sender, EventArgs e)
+		{
+			UpdateActions();
+		}
+
+		private void fileSystemTreeView1_AfterExpand(object sender, TreeViewEventArgs e)
+		{
+			fileSystemTreeView1_AfterCheck(sender, e);
+		}
+
+		private void fileSystemTreeView1_AfterCheck(object sender, TreeViewEventArgs e)
+		{
+			if (chkMulti.Checked && chkRecursive.Checked)
+				foreach (TreeNode node in e.Node.Nodes)
+					node.Checked = e.Node.Checked;
+		}
+
+		private void fileSystemTreeView1_DragEnter(object sender, DragEventArgs e)
+		{
+			if (e.Data.GetDataPresent(DataFormats.FileDrop))
+			{
+				e.Effect = DragDropEffects.Copy;
+			}
+		}
+
+		private void fileSystemTreeView1_DragDrop(object sender, DragEventArgs e)
+		{
+			if (e.Data.GetDataPresent(DataFormats.FileDrop))
+			{
+				string[] folders = e.Data.GetData(DataFormats.FileDrop) as string[];
+				if (folders != null)
+				{
+					if (folders.Length > 1 && !chkMulti.Checked)
+					{
+						chkMulti.Checked = true;
+						if (fileSystemTreeView1.SelectedNode != null && fileSystemTreeView1.SelectedNode.Checked)
+							fileSystemTreeView1.SelectedNode.Checked = false;
+					}
+					if (chkMulti.Checked)
+						foreach (string folder in folders)
+						{
+							TreeNode node = fileSystemTreeView1.LookupNode(folder);
+							if (node != null) node.Checked = true;
+						}
+					else
+						fileSystemTreeView1.SelectedPath = folders[0];
+					fileSystemTreeView1.Focus();
+				}
+			}
+		}
+
+		private void rbAction_CheckedChanged(object sender, EventArgs e)
 		{
 			UpdateOutputPath();
 			SetupControls(false);
 		}
+
+		public void OnSecondCall(string[] args)
+		{
+			this.Invoke((MethodInvoker)delegate()
+			{
+				if (args.Length == 1)
+				{
+					TreeNode node = null;
+					try
+					{
+						node = fileSystemTreeView1.LookupNode(args[0]) ??
+							fileSystemTreeView1.LookupNode(Path.GetDirectoryName(args[0]));
+					}
+					catch
+					{
+					}
+					if (node != null)
+					{
+						fileSystemTreeView1.SelectedNode = node;
+						node.Expand();
+					}
+				}
+				if (WindowState == FormWindowState.Minimized)
+					WindowState = FormWindowState.Normal;
+				fileSystemTreeView1.Select();
+				Activate();
+			});
+		}
+
+		private void setAsMyMusicFolderToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			DirectoryInfo dir = (DirectoryInfo)contextMenuStripFileTree.Tag;
+			try
+			{
+				fileSystemTreeView1.IconManager.SetFolderPath(CUEControls.ExtraSpecialFolder.MyMusic, dir.FullName);
+			}
+			catch (Exception ex)
+			{
+				MessageBox.Show(this, ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			fileSystemTreeView1.Nodes[0].Collapse();
+			fileSystemTreeView1.SelectedFolder = CUEControls.ExtraSpecialFolder.MyMusic;
+			fileSystemTreeView1.SelectedNode.Expand();
+		}
+
+		private void resetToOriginalLocationToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			CUEControls.ExtraSpecialFolder dir = (CUEControls.ExtraSpecialFolder)contextMenuStripFileTree.Tag;
+			try
+			{
+				fileSystemTreeView1.IconManager.SetFolderPath(dir, null);
+			}
+			catch (Exception ex)
+			{
+				MessageBox.Show(this, ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			fileSystemTreeView1.Nodes[0].Collapse();
+			fileSystemTreeView1.SelectedFolder = CUEControls.ExtraSpecialFolder.MyMusic;
+			fileSystemTreeView1.SelectedNode.Expand();
+		}
+
+		private void fileSystemTreeView1_MouseDown(object sender, MouseEventArgs e)
+		{
+			if (e.Button == MouseButtons.Right)
+			{				
+				TreeViewHitTestInfo info = fileSystemTreeView1.HitTest(e.Location);
+				if (info.Node != null)
+				{
+					contextMenuStripFileTree.Tag = info.Node.Tag;
+					SelectedNodeName.Text = info.Node.Text;
+					SelectedNodeName.Image = m_icon_mgr.ImageList.Images[info.Node.ImageIndex];
+					if (info.Node.Tag is DirectoryInfo)
+					{
+						resetToOriginalLocationToolStripMenuItem.Visible = false;
+						setAsMyMusicFolderToolStripMenuItem.Visible = true;
+						setAsMyMusicFolderToolStripMenuItem.Image = m_icon_mgr.ImageList.Images[m_icon_mgr.GetIconIndex(CUEControls.ExtraSpecialFolder.MyMusic, true)];
+					}
+					else if (info.Node.Tag is CUEControls.ExtraSpecialFolder && ((CUEControls.ExtraSpecialFolder)info.Node.Tag) == CUEControls.ExtraSpecialFolder.MyMusic)
+					{
+						resetToOriginalLocationToolStripMenuItem.Visible = true;
+						setAsMyMusicFolderToolStripMenuItem.Visible = false;
+					}
+					else
+						return;
+					fileSystemTreeView1.SelectedNode = info.Node;
+					contextMenuStripFileTree.Show(fileSystemTreeView1, e.Location);
+				}					
+			}
+		}
+
 	}
 
 	enum OutputPathGeneration {
diff --git a/CUETools/frmCUETools.de-DE.resx b/CUETools/frmCUETools.de-DE.resx
index 6f83d65..76194b0 100644
--- a/CUETools/frmCUETools.de-DE.resx
+++ b/CUETools/frmCUETools.de-DE.resx
@@ -129,55 +129,10 @@
   <data name="btnBrowseOutput.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="btnBrowseInput.Text" xml:space="preserve">
-    <value>...</value>
-  </data>
-  <data name="btnBrowseInput.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="lblOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 13</value>
-  </data>
-  <data name="lblOutput.Text" xml:space="preserve">
-    <value>&amp;Ausgabe:</value>
-  </data>
-  <data name="lblOutput.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="lblInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>49, 13</value>
-  </data>
-  <data name="lblInput.Text" xml:space="preserve">
-    <value>E&amp;ingabe:</value>
-  </data>
-  <data name="lblInput.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="txtOutputPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 48</value>
-  </data>
-  <data name="txtOutputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>382, 21</value>
-  </data>
   <data name="txtOutputPath.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="txtInputPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 22</value>
-  </data>
-  <data name="txtInputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>382, 21</value>
-  </data>
-  <data name="txtInputPath.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="grpCUEPaths.Text" xml:space="preserve">
-    <value>CUE-Pfade</value>
-  </data>
-  <data name="grpCUEPaths.ToolTip" xml:space="preserve">
-    <value />
-  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="rbEmbedCUE.Size" type="System.Drawing.Size, System.Drawing">
     <value>81, 17</value>
   </data>
@@ -223,12 +178,6 @@
   <data name="rbSingleFile.ToolTip" xml:space="preserve">
     <value>Erstelle einzelne Datei + CUE-Sheet</value>
   </data>
-  <data name="grpOutputStyle.Location" type="System.Drawing.Point, System.Drawing">
-    <value>97, 211</value>
-  </data>
-  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>141, 164</value>
-  </data>
   <data name="grpOutputStyle.Text" xml:space="preserve">
     <value>CUE-Stil</value>
   </data>
@@ -241,9 +190,6 @@
   <data name="btnAbout.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="txtCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 62</value>
-  </data>
   <data name="txtCustomFormat.Text" xml:space="preserve">
     <value>%1:-2\Neu\%-1\%F.cue</value>
   </data>
@@ -259,9 +205,6 @@
   <data name="rbCustomFormat.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="txtCreateSubdirectory.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 20</value>
-  </data>
   <data name="txtCreateSubdirectory.Text" xml:space="preserve">
     <value>Neu</value>
   </data>
@@ -295,9 +238,6 @@
   <data name="rbAppendFilename.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="txtAppendFilename.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 42</value>
-  </data>
   <data name="txtAppendFilename.Text" xml:space="preserve">
     <value>-Neu</value>
   </data>
@@ -310,9 +250,6 @@
   <data name="grpOutputPathGeneration.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="btnCodec.Location" type="System.Drawing.Point, System.Drawing">
-    <value>61, 117</value>
-  </data>
   <data name="btnCodec.ToolTip" xml:space="preserve">
     <value />
   </data>
@@ -352,62 +289,47 @@
   <data name="rbFLAC.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="grpAudioOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 164</value>
-  </data>
   <data name="grpAudioOutput.Text" xml:space="preserve">
     <value>Audio</value>
   </data>
   <data name="grpAudioOutput.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="btnBatch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 307</value>
-  </data>
-  <data name="btnBatch.Text" xml:space="preserve">
-    <value>Stapel...</value>
-  </data>
-  <data name="btnBatch.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="btnFilenameCorrector.Text" xml:space="preserve">
-    <value>Dateinamenkorrektur...</value>
-  </data>
-  <data name="btnFilenameCorrector.ToolTip" xml:space="preserve">
-    <value />
-  </data>
   <data name="btnSettings.Text" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
   <data name="btnSettings.ToolTip" xml:space="preserve">
     <value />
   </data>
+  <data name="rbActionCorrectFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkRecursive.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 17</value>
+  </data>
+  <data name="chkRecursive.Text" xml:space="preserve">
+    <value>Stapel</value>
+  </data>
+  <data name="chkRecursive.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbActionCreateCUESheet.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkMulti.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbActionVerifyAndEncode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpAction.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="label2.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="rbArPlusCRC.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 88</value>
-  </data>
-  <data name="rbArPlusCRC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>129, 17</value>
-  </data>
-  <data name="rbArPlusCRC.Text" xml:space="preserve">
-    <value>Verifiziere AR + CRCs</value>
-  </data>
-  <data name="rbArPlusCRC.ToolTip" xml:space="preserve">
-    <value>Kontaktiere die AccurateRip-Datenbank und versuche, das Image sowohl anhand dieser als auch anhand der CRC-Werte zu verifizieren</value>
-  </data>
-  <data name="rbArAndEncode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 37</value>
-  </data>
-  <data name="rbArAndEncode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 17</value>
-  </data>
-  <data name="rbArAndEncode.Text" xml:space="preserve">
-    <value>Kodieren und verifizieren</value>
-  </data>
-  <data name="rbArAndEncode.ToolTip" xml:space="preserve">
-    <value />
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 13</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
     <value>Datenspur:</value>
@@ -418,54 +340,29 @@
   <data name="txtDataTrackLength.ToolTip" xml:space="preserve">
     <value>Nicht für normale Musik-CDs verwendet. Erweiterte CDs mit Datenspuren können nicht in der Datenbank gefunden werden, es sei denn, Sie kennen die Länge der Datenspur. Sie können sie oft im EAC-Log finden. Falls das EAC-Log beim CUE-Sheet gefunden wird, wird es automatisch ausgelesen, und Sie müssen hier nichts eingeben.</value>
   </data>
-  <data name="rbArApplyOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 20</value>
-  </data>
-  <data name="rbArApplyOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 17</value>
-  </data>
-  <data name="rbArApplyOffset.Text" xml:space="preserve">
-    <value>Verifizieren, &amp;dann kodieren</value>
-  </data>
-  <data name="rbArApplyOffset.ToolTip" xml:space="preserve">
-    <value>Im ersten Durchlauf verifizieren und versuchen, eine Offsetkorrektur zu finden, die das Auslesen nach der AccurateRip-Datenbank korrekt macht. Im zweiten Durchlauf unter Berücksichtigung dieser Korrektur konvertieren.</value>
-  </data>
-  <data name="rbArVerify.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 71</value>
-  </data>
-  <data name="rbArVerify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 17</value>
-  </data>
-  <data name="rbArVerify.Text" xml:space="preserve">
-    <value>&amp;Verifiziere nur AR</value>
-  </data>
-  <data name="rbArVerify.ToolTip" xml:space="preserve">
-    <value>Kontaktiere die AccurateRip-Datenbank und versuche, das Image anhand dieser zu verifizieren</value>
-  </data>
-  <data name="rbArNone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 54</value>
-  </data>
-  <data name="rbArNone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 17</value>
-  </data>
-  <data name="rbArNone.Text" xml:space="preserve">
-    <value>&amp;Nicht verifizieren, kodieren</value>
-  </data>
-  <data name="rbArNone.ToolTip" xml:space="preserve">
-    <value>Die AccurateRip-Datenbank zur Verifizierung nicht kontaktieren</value>
-  </data>
-  <data name="grpAccurateRip.ToolTip" xml:space="preserve">
-    <value />
+  <data name="toolStripStatusLabelAR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
   </data>
   <data name="statusStrip1.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="btnCUECreator.Text" xml:space="preserve">
-    <value>CUE-Sheet erstellen...</value>
-  </data>
-  <data name="btnCUECreator.ToolTip" xml:space="preserve">
-    <value />
-  </data>
   <data name="btnStop.Text" xml:space="preserve">
     <value>&amp;Stopp</value>
   </data>
@@ -508,15 +405,42 @@
   <data name="rbFreedbNever.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>FreeDB-Abfrage</value>
-  </data>
-  <data name="groupBox1.ToolTip" xml:space="preserve">
+  <data name="grpFreedb.ToolTip" xml:space="preserve">
     <value />
   </data>
   <data name="contextMenuStripUDC.ToolTip" xml:space="preserve">
     <value />
   </data>
+  <data name="txtInputPath.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textBatchReport.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="fileSystemTreeView1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpInput.Text" xml:space="preserve">
+    <value>E&amp;ingabe</value>
+  </data>
+  <data name="grpInput.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericWriteOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="lblWriteOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpExtra.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="contextMenuStripFileTree.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="panel1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAEBAAAAAACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAB
@@ -545,9 +469,6 @@
         AAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAA=
 </value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>CUE-Tools</value>
-  </data>
   <data name="$this.ToolTip" xml:space="preserve">
     <value />
   </data>
diff --git a/CUETools/frmCUETools.resx b/CUETools/frmCUETools.resx
index f644486..bdf7317 100644
--- a/CUETools/frmCUETools.resx
+++ b/CUETools/frmCUETools.resx
@@ -117,1577 +117,1765 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnConvert.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 339</value>
-  </data>
-  <data name="btnConvert.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 23</value>
-  </data>
   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnConvert.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="btnConvert.Text" xml:space="preserve">
-    <value>&amp;Go</value>
-  </data>
-  <data name="&gt;&gt;btnConvert.Name" xml:space="preserve">
-    <value>btnConvert</value>
-  </data>
-  <data name="&gt;&gt;btnConvert.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnConvert.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnConvert.ZOrder" xml:space="preserve">
-    <value>16</value>
-  </data>
-  <data name="btnBrowseOutput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>452, 49</value>
-  </data>
-  <data name="btnBrowseOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 23</value>
-  </data>
-  <data name="btnBrowseOutput.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="btnBrowseOutput.Text" xml:space="preserve">
-    <value>Browse...</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseOutput.Name" xml:space="preserve">
-    <value>btnBrowseOutput</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseOutput.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseOutput.Parent" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseOutput.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnBrowseInput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>452, 20</value>
-  </data>
-  <data name="btnBrowseInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 23</value>
-  </data>
-  <data name="btnBrowseInput.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="btnBrowseInput.Text" xml:space="preserve">
-    <value>Browse...</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseInput.Name" xml:space="preserve">
-    <value>btnBrowseInput</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseInput.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseInput.Parent" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;btnBrowseInput.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="lblOutput.AutoSize" type="System.Boolean, mscorlib">
+  <data name="rbUDC1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="lblOutput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 52</value>
-  </data>
-  <data name="lblOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>45, 13</value>
-  </data>
-  <data name="lblOutput.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="lblOutput.Text" xml:space="preserve">
-    <value>&amp;Output:</value>
-  </data>
-  <data name="&gt;&gt;lblOutput.Name" xml:space="preserve">
-    <value>lblOutput</value>
-  </data>
-  <data name="&gt;&gt;lblOutput.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lblOutput.Parent" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;lblOutput.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="lblInput.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="lblInput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 24</value>
-  </data>
-  <data name="lblInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>37, 13</value>
-  </data>
-  <data name="lblInput.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="lblInput.Text" xml:space="preserve">
-    <value>&amp;Input:</value>
-  </data>
-  <data name="&gt;&gt;lblInput.Name" xml:space="preserve">
-    <value>lblInput</value>
-  </data>
-  <data name="&gt;&gt;lblInput.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lblInput.Parent" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;lblInput.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="txtOutputPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>59, 48</value>
-  </data>
-  <data name="txtOutputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>385, 21</value>
-  </data>
-  <data name="txtOutputPath.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;txtOutputPath.Name" xml:space="preserve">
-    <value>txtOutputPath</value>
-  </data>
-  <data name="&gt;&gt;txtOutputPath.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtOutputPath.Parent" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;txtOutputPath.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtInputPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>59, 22</value>
-  </data>
-  <data name="txtInputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>385, 21</value>
-  </data>
-  <data name="txtInputPath.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;txtInputPath.Name" xml:space="preserve">
-    <value>txtInputPath</value>
-  </data>
-  <data name="&gt;&gt;txtInputPath.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtInputPath.Parent" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;txtInputPath.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="grpCUEPaths.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 4</value>
-  </data>
-  <data name="grpCUEPaths.Size" type="System.Drawing.Size, System.Drawing">
-    <value>535, 84</value>
-  </data>
-  <data name="grpCUEPaths.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="grpCUEPaths.Text" xml:space="preserve">
-    <value>CUE Paths</value>
-  </data>
-  <data name="&gt;&gt;grpCUEPaths.Name" xml:space="preserve">
-    <value>grpCUEPaths</value>
-  </data>
-  <data name="&gt;&gt;grpCUEPaths.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grpCUEPaths.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;grpCUEPaths.ZOrder" xml:space="preserve">
-    <value>15</value>
-  </data>
-  <data name="rbEmbedCUE.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="btnConvert.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="rbEmbedCUE.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+  <data name="textBatchReport.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Both</value>
   </data>
-  <data name="rbEmbedCUE.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 19</value>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="txtDataTrackLength.Size" type="System.Drawing.Size, System.Drawing">
+    <value>54, 21</value>
   </data>
-  <data name="rbEmbedCUE.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 17</value>
+  <data name="&gt;&gt;toolStripSeparator1.Name" xml:space="preserve">
+    <value>toolStripSeparator1</value>
   </data>
-  <data name="rbEmbedCUE.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="txtCreateSubdirectory.ToolTip" xml:space="preserve">
+    <value />
   </data>
-  <data name="rbEmbedCUE.Text" xml:space="preserve">
-    <value>&amp;Embedded</value>
+  <data name="txtDataTrackLength.Mask" xml:space="preserve">
+    <value>00:00:00</value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>153, 8</value>
-  </metadata>
-  <data name="rbEmbedCUE.ToolTip" xml:space="preserve">
-    <value>Create single file with embedded CUE sheet.</value>
+  <data name="txtCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
+    <value>251, 21</value>
   </data>
-  <data name="&gt;&gt;rbEmbedCUE.Name" xml:space="preserve">
-    <value>rbEmbedCUE</value>
+  <data name="txtAppendFilename.Size" type="System.Drawing.Size, System.Drawing">
+    <value>251, 21</value>
   </data>
-  <data name="&gt;&gt;rbEmbedCUE.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnResume.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
   </data>
-  <data name="&gt;&gt;rbEmbedCUE.Parent" xml:space="preserve">
-    <value>grpOutputStyle</value>
-  </data>
-  <data name="&gt;&gt;rbEmbedCUE.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="rbGapsLeftOut.AutoSize" type="System.Boolean, mscorlib">
+  <data name="chkMulti.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="rbGapsLeftOut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 87</value>
+  <data name="oGGToolStripMenuItem.Text" xml:space="preserve">
+    <value>OGG</value>
   </data>
-  <data name="rbGapsLeftOut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 17</value>
+  <data name="rbFreedbAlways.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 17</value>
   </data>
-  <data name="rbGapsLeftOut.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="txtPreGapLength.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
-  <data name="rbGapsLeftOut.Text" xml:space="preserve">
-    <value>Gaps Left Out</value>
+  <data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve">
+    <value>CUEControls.FileSystemTreeView, CUEControls, Version=1.0.3368.28004, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="rbGapsLeftOut.ToolTip" xml:space="preserve">
-    <value>Create multiple files with gaps left out</value>
+  <data name="rbGapsPrepended.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbGapsLeftOut.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnAbout.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="&gt;&gt;rbGapsLeftOut.Name" xml:space="preserve">
     <value>rbGapsLeftOut</value>
   </data>
-  <data name="&gt;&gt;rbGapsLeftOut.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbGapsLeftOut.Parent" xml:space="preserve">
-    <value>grpOutputStyle</value>
-  </data>
-  <data name="&gt;&gt;rbGapsLeftOut.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="rbGapsPrepended.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbGapsPrepended.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 70</value>
-  </data>
-  <data name="rbGapsPrepended.Size" type="System.Drawing.Size, System.Drawing">
-    <value>104, 17</value>
-  </data>
-  <data name="rbGapsPrepended.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="rbGapsPrepended.Text" xml:space="preserve">
-    <value>Gaps Prepended</value>
-  </data>
-  <data name="rbGapsPrepended.ToolTip" xml:space="preserve">
-    <value>Create multiple files with gaps prepended</value>
-  </data>
-  <data name="&gt;&gt;rbGapsPrepended.Name" xml:space="preserve">
-    <value>rbGapsPrepended</value>
-  </data>
-  <data name="&gt;&gt;rbGapsPrepended.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbGapsPrepended.Parent" xml:space="preserve">
-    <value>grpOutputStyle</value>
-  </data>
-  <data name="&gt;&gt;rbGapsPrepended.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="rbGapsAppended.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbGapsAppended.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 53</value>
-  </data>
-  <data name="rbGapsAppended.Size" type="System.Drawing.Size, System.Drawing">
-    <value>101, 17</value>
-  </data>
-  <data name="rbGapsAppended.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="rbGapsAppended.Text" xml:space="preserve">
-    <value>Gaps &amp;Appended</value>
-  </data>
-  <data name="rbGapsAppended.ToolTip" xml:space="preserve">
-    <value>Create multiple files with gaps appended</value>
-  </data>
-  <data name="&gt;&gt;rbGapsAppended.Name" xml:space="preserve">
-    <value>rbGapsAppended</value>
-  </data>
-  <data name="&gt;&gt;rbGapsAppended.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbGapsAppended.Parent" xml:space="preserve">
-    <value>grpOutputStyle</value>
-  </data>
-  <data name="&gt;&gt;rbGapsAppended.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="rbSingleFile.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbSingleFile.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 36</value>
-  </data>
-  <data name="rbSingleFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>106, 17</value>
-  </data>
-  <data name="rbSingleFile.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="rbSingleFile.Text" xml:space="preserve">
-    <value>&amp;Single File + CUE</value>
-  </data>
-  <data name="rbSingleFile.ToolTip" xml:space="preserve">
-    <value>Create single file + CUE sheet</value>
-  </data>
-  <data name="&gt;&gt;rbSingleFile.Name" xml:space="preserve">
-    <value>rbSingleFile</value>
-  </data>
-  <data name="&gt;&gt;rbSingleFile.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbSingleFile.Parent" xml:space="preserve">
-    <value>grpOutputStyle</value>
-  </data>
-  <data name="&gt;&gt;rbSingleFile.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="grpOutputStyle.Location" type="System.Drawing.Point, System.Drawing">
-    <value>108, 211</value>
-  </data>
-  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>128, 164</value>
-  </data>
-  <data name="grpOutputStyle.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="grpOutputStyle.Text" xml:space="preserve">
-    <value>CUE Style</value>
-  </data>
-  <data name="&gt;&gt;grpOutputStyle.Name" xml:space="preserve">
-    <value>grpOutputStyle</value>
-  </data>
-  <data name="&gt;&gt;grpOutputStyle.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grpOutputStyle.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;grpOutputStyle.ZOrder" xml:space="preserve">
-    <value>14</value>
-  </data>
-  <data name="btnAbout.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 184</value>
-  </data>
-  <data name="btnAbout.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 23</value>
-  </data>
-  <data name="btnAbout.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="btnAbout.Text" xml:space="preserve">
-    <value>About</value>
-  </data>
-  <data name="&gt;&gt;btnAbout.Name" xml:space="preserve">
-    <value>btnAbout</value>
-  </data>
-  <data name="&gt;&gt;btnAbout.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnAbout.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnAbout.ZOrder" xml:space="preserve">
-    <value>13</value>
-  </data>
-  <data name="txtCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>166, 60</value>
-  </data>
-  <data name="txtCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>226, 21</value>
-  </data>
-  <data name="txtCustomFormat.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="txtCustomFormat.Text" xml:space="preserve">
-    <value>%1:-2\New\%-1\%F.cue</value>
-  </data>
-  <data name="&gt;&gt;txtCustomFormat.Name" xml:space="preserve">
-    <value>txtCustomFormat</value>
-  </data>
-  <data name="&gt;&gt;txtCustomFormat.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtCustomFormat.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;txtCustomFormat.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;btnBrowseOutput.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="rbCustomFormat.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 66</value>
-  </data>
-  <data name="rbCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 17</value>
-  </data>
-  <data name="rbCustomFormat.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="rbCustomFormat.Text" xml:space="preserve">
-    <value>Use custom format:</value>
-  </data>
-  <data name="&gt;&gt;rbCustomFormat.Name" xml:space="preserve">
-    <value>rbCustomFormat</value>
-  </data>
-  <data name="&gt;&gt;rbCustomFormat.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbCustomFormat.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;rbCustomFormat.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="txtCreateSubdirectory.Location" type="System.Drawing.Point, System.Drawing">
-    <value>166, 18</value>
-  </data>
-  <data name="txtCreateSubdirectory.Size" type="System.Drawing.Size, System.Drawing">
-    <value>226, 21</value>
-  </data>
-  <data name="txtCreateSubdirectory.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="txtCreateSubdirectory.Text" xml:space="preserve">
-    <value>New</value>
-  </data>
-  <data name="&gt;&gt;txtCreateSubdirectory.Name" xml:space="preserve">
-    <value>txtCreateSubdirectory</value>
-  </data>
-  <data name="&gt;&gt;txtCreateSubdirectory.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtCreateSubdirectory.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;txtCreateSubdirectory.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="rbDontGenerate.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbDontGenerate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 89</value>
-  </data>
-  <data name="rbDontGenerate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 17</value>
-  </data>
-  <data name="rbDontGenerate.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="rbDontGenerate.Text" xml:space="preserve">
-    <value>&amp;Manual</value>
-  </data>
-  <data name="&gt;&gt;rbDontGenerate.Name" xml:space="preserve">
-    <value>rbDontGenerate</value>
-  </data>
-  <data name="&gt;&gt;rbDontGenerate.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbDontGenerate.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;rbDontGenerate.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="rbCreateSubdirectory.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbCreateSubdirectory.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 20</value>
-  </data>
-  <data name="rbCreateSubdirectory.Size" type="System.Drawing.Size, System.Drawing">
-    <value>125, 17</value>
-  </data>
-  <data name="rbCreateSubdirectory.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rbCreateSubdirectory.Text" xml:space="preserve">
-    <value>C&amp;reate subdirectory:</value>
-  </data>
-  <data name="&gt;&gt;rbCreateSubdirectory.Name" xml:space="preserve">
-    <value>rbCreateSubdirectory</value>
-  </data>
-  <data name="&gt;&gt;rbCreateSubdirectory.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbCreateSubdirectory.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;rbCreateSubdirectory.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="rbAppendFilename.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbAppendFilename.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 43</value>
-  </data>
-  <data name="rbAppendFilename.Size" type="System.Drawing.Size, System.Drawing">
-    <value>122, 17</value>
-  </data>
-  <data name="rbAppendFilename.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="rbAppendFilename.Text" xml:space="preserve">
-    <value>Append to filename:</value>
-  </data>
-  <data name="&gt;&gt;rbAppendFilename.Name" xml:space="preserve">
-    <value>rbAppendFilename</value>
-  </data>
-  <data name="&gt;&gt;rbAppendFilename.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbAppendFilename.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;rbAppendFilename.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="txtAppendFilename.Location" type="System.Drawing.Point, System.Drawing">
-    <value>166, 39</value>
-  </data>
-  <data name="txtAppendFilename.Size" type="System.Drawing.Size, System.Drawing">
-    <value>226, 21</value>
-  </data>
-  <data name="txtAppendFilename.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="txtAppendFilename.Text" xml:space="preserve">
-    <value>-New</value>
-  </data>
-  <data name="&gt;&gt;txtAppendFilename.Name" xml:space="preserve">
-    <value>txtAppendFilename</value>
-  </data>
-  <data name="&gt;&gt;txtAppendFilename.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtAppendFilename.Parent" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;txtAppendFilename.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="grpOutputPathGeneration.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 92</value>
-  </data>
-  <data name="grpOutputPathGeneration.Size" type="System.Drawing.Size, System.Drawing">
-    <value>398, 115</value>
-  </data>
-  <data name="grpOutputPathGeneration.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="grpOutputPathGeneration.Text" xml:space="preserve">
-    <value>Output Path</value>
-  </data>
-  <data name="&gt;&gt;grpOutputPathGeneration.Name" xml:space="preserve">
-    <value>grpOutputPathGeneration</value>
-  </data>
-  <data name="&gt;&gt;grpOutputPathGeneration.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grpOutputPathGeneration.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;grpOutputPathGeneration.ZOrder" xml:space="preserve">
-    <value>12</value>
-  </data>
-  <data name="btnCodec.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
-    <value>Popup</value>
-  </data>
-  <data name="btnCodec.Location" type="System.Drawing.Point, System.Drawing">
-    <value>66, 117</value>
-  </data>
   <data name="btnCodec.Size" type="System.Drawing.Size, System.Drawing">
     <value>20, 20</value>
   </data>
-  <data name="btnCodec.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="rbDontGenerate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 17</value>
   </data>
-  <data name="btnCodec.Text" xml:space="preserve">
-    <value>&gt;</value>
+  <data name="&gt;&gt;rbActionCorrectFilenames.Parent" xml:space="preserve">
+    <value>grpAction</value>
   </data>
-  <data name="&gt;&gt;btnCodec.Name" xml:space="preserve">
-    <value>btnCodec</value>
+  <data name="btnResume.Text" xml:space="preserve">
+    <value>&amp;Resume</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbGapsLeftOut.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;btnPause.Name" xml:space="preserve">
+    <value>btnPause</value>
+  </data>
+  <data name="&gt;&gt;btnStop.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="contextMenuStripUDC.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;txtCreateSubdirectory.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="&gt;&gt;lblWriteOffset.Parent" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="SelectedNodeName.Text" xml:space="preserve">
+    <value>Selected file</value>
+  </data>
+  <data name="contextMenuStripUDC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 142</value>
+  </data>
+  <data name="rbActionEncode.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="btnStop.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 23</value>
+  </data>
+  <data name="rbGapsLeftOut.Text" xml:space="preserve">
+    <value>Gaps Left Out</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;rbEmbedCUE.Parent" xml:space="preserve">
+    <value>grpOutputStyle</value>
+  </data>
+  <data name="&gt;&gt;fileSystemTreeView1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;grpAction.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtCustomFormat.Text" xml:space="preserve">
+    <value>%1:-2\New\%-1\%F.cue</value>
+  </data>
+  <data name="rbActionVerify.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyAndCRCs.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
   <data name="&gt;&gt;btnCodec.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;btnCodec.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
+  <data name="btnConvert.Location" type="System.Drawing.Point, System.Drawing">
+    <value>265, 394</value>
   </data>
-  <data name="&gt;&gt;btnCodec.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="rbActionCreateCUESheet.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 105</value>
   </data>
-  <data name="rbUDC1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;rbDontGenerate.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
   </data>
-  <data name="rbUDC1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 119</value>
+  <data name="rbGapsLeftOut.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
   </data>
-  <data name="rbUDC1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 17</value>
-  </data>
-  <data name="rbUDC1.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="rbUDC1.Text" xml:space="preserve">
-    <value>User</value>
-  </data>
-  <data name="&gt;&gt;rbUDC1.Name" xml:space="preserve">
-    <value>rbUDC1</value>
-  </data>
-  <data name="&gt;&gt;rbUDC1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbUDC1.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;rbUDC1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="rbTTA.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbTTA.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 68</value>
-  </data>
-  <data name="rbTTA.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 17</value>
-  </data>
-  <data name="rbTTA.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="rbTTA.Text" xml:space="preserve">
-    <value>TTA</value>
-  </data>
-  <data name="&gt;&gt;rbTTA.Name" xml:space="preserve">
-    <value>rbTTA</value>
-  </data>
-  <data name="&gt;&gt;rbTTA.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbTTA.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;rbTTA.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="chkLossyWAV.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;txtOutputPath.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
-  <data name="chkLossyWAV.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 141</value>
+  <data name="&gt;&gt;rbActionCreateCUESheet.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="chkLossyWAV.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 17</value>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="chkLossyWAV.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+  <data name="&gt;&gt;contextMenuStripUDC.Name" xml:space="preserve">
+    <value>contextMenuStripUDC</value>
+  </data>
+  <data name="txtPreGapLength.Mask" xml:space="preserve">
+    <value>00:00:00</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 20</value>
+  </data>
+  <data name="btnAbout.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="rbEmbedCUE.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="grpInput.Size" type="System.Drawing.Size, System.Drawing">
+    <value>238, 414</value>
+  </data>
+  <data name="&gt;&gt;chkMulti.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpOutputPathGeneration.Size" type="System.Drawing.Size, System.Drawing">
+    <value>417, 141</value>
+  </data>
+  <data name="&gt;&gt;chkRecursive.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpExtra.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="toolStripMenuItem3.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;btnPause.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
+  <data name="&gt;&gt;btnBrowseOutput.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkRecursive.Parent" xml:space="preserve">
+    <value>grpAction</value>
   </data>
   <data name="chkLossyWAV.Text" xml:space="preserve">
     <value>LossyWAV</value>
   </data>
-  <data name="chkLossyWAV.ToolTip" xml:space="preserve">
-    <value>Create a pair of files - .lossy.wav(flac,etc) and .lwcdf.wav(flac,etc). Lossy file contains (lossy) compressed music, but together with the lwcdf (correction) file the original audio can be reconstructed.</value>
+  <data name="numericWriteOffset.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Right</value>
   </data>
-  <data name="&gt;&gt;chkLossyWAV.Name" xml:space="preserve">
-    <value>chkLossyWAV</value>
+  <data name="&gt;&gt;btnAbout.Name" xml:space="preserve">
+    <value>btnAbout</value>
   </data>
-  <data name="&gt;&gt;chkLossyWAV.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;chkLossyWAV.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;chkLossyWAV.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="rbAPE.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbAPE.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 51</value>
-  </data>
-  <data name="rbAPE.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 17</value>
-  </data>
-  <data name="rbAPE.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="rbAPE.Text" xml:space="preserve">
-    <value>APE</value>
-  </data>
-  <data name="&gt;&gt;rbAPE.Name" xml:space="preserve">
-    <value>rbAPE</value>
-  </data>
-  <data name="&gt;&gt;rbAPE.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbAPE.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;rbAPE.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <data name="rbNoAudio.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;rbEmbedCUE.Name" xml:space="preserve">
+    <value>rbEmbedCUE</value>
   </data>
-  <data name="rbNoAudio.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 102</value>
+  <data name="chkMulti.Location" type="System.Drawing.Point, System.Drawing">
+    <value>89, 148</value>
   </data>
-  <data name="rbNoAudio.Size" type="System.Drawing.Size, System.Drawing">
-    <value>50, 17</value>
+  <data name="toolStripStatusLabelWV.Size" type="System.Drawing.Size, System.Drawing">
+    <value>21, 17</value>
   </data>
-  <data name="rbNoAudio.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="rbNoAudio.Text" xml:space="preserve">
-    <value>&amp;None</value>
-  </data>
-  <data name="rbNoAudio.ToolTip" xml:space="preserve">
-    <value>Don't create any audio files, only CUE sheet</value>
-  </data>
-  <data name="&gt;&gt;rbNoAudio.Name" xml:space="preserve">
-    <value>rbNoAudio</value>
-  </data>
-  <data name="&gt;&gt;rbNoAudio.Type" xml:space="preserve">
+  <data name="&gt;&gt;rbGapsLeftOut.Type" xml:space="preserve">
     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;rbNoAudio.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
+  <data name="&gt;&gt;toolStripStatusLabelFLAC.Name" xml:space="preserve">
+    <value>toolStripStatusLabelFLAC</value>
   </data>
-  <data name="&gt;&gt;rbNoAudio.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="&gt;&gt;resetToOriginalLocationToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="rbWavPack.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;grpAction.Parent" xml:space="preserve">
+    <value>panel1</value>
   </data>
-  <data name="rbWavPack.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 34</value>
+  <data name="&gt;&gt;grpOutputPathGeneration.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="rbWavPack.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 17</value>
+  <data name="&gt;&gt;rbActionVerifyAndCRCs.Parent" xml:space="preserve">
+    <value>grpAction</value>
   </data>
-  <data name="rbWavPack.TabIndex" type="System.Int32, mscorlib">
+  <data name="grpExtra.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpOutputPathGeneration.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="rbWavPack.Text" xml:space="preserve">
-    <value>Wav&amp;Pack</value>
+  <data name="rbAppendFilename.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbGapsPrepended.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="rbActionCorrectFilenames.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="grpExtra.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 336</value>
+  </data>
+  <data name="&gt;&gt;grpInput.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbNoAudio.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;txtCreateSubdirectory.Name" xml:space="preserve">
+    <value>txtCreateSubdirectory</value>
+  </data>
+  <data name="&gt;&gt;txtInputPath.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 17</value>
+  </data>
+  <data name="&gt;&gt;txtAppendFilename.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="btnBrowseOutput.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbActionVerifyThenEncode.Name" xml:space="preserve">
+    <value>rbActionVerifyThenEncode</value>
+  </data>
+  <data name="rbSingleFile.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
   <data name="&gt;&gt;rbWavPack.Name" xml:space="preserve">
     <value>rbWavPack</value>
   </data>
-  <data name="&gt;&gt;rbWavPack.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="rbEmbedCUE.ToolTip" xml:space="preserve">
+    <value>Create single file with embedded CUE sheet.</value>
   </data>
-  <data name="&gt;&gt;rbWavPack.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
+  <data name="btnPause.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;rbWavPack.ZOrder" xml:space="preserve">
-    <value>6</value>
+  <data name="btnBrowseOutput.Text" xml:space="preserve">
+    <value>Browse...</value>
   </data>
-  <data name="rbWAV.AutoSize" type="System.Boolean, mscorlib">
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="rbAppendFilename.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="chkLossyWAV.ToolTip" xml:space="preserve">
+    <value>Create a pair of files - .lossy.wav(flac,etc) and .lwcdf.wav(flac,etc). Lossy file contains (lossy) compressed music, but together with the lwcdf (correction) file the original audio can be reconstructed.</value>
+  </data>
+  <data name="fileSystemTreeView1.Indent" type="System.Int32, mscorlib">
+    <value>19</value>
+  </data>
+  <data name="&gt;&gt;setAsMyMusicFolderToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripStatusLabelAR.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>White</value>
+  </data>
+  <data name="rbFreedbAlways.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="grpOutputPathGeneration.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;txtCreateSubdirectory.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbCreateSubdirectory.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="rbWAV.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 85</value>
+  <data name="&gt;&gt;btnSettings.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="rbWAV.Size" type="System.Drawing.Size, System.Drawing">
-    <value>48, 17</value>
+  <data name="&gt;&gt;rbAppendFilename.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="rbWAV.TabIndex" type="System.Int32, mscorlib">
+  <data name="rbActionCorrectFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;contextMenuStripUDC.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnPause.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="rbAPE.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;rbDontGenerate.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="textBatchReport.Size" type="System.Drawing.Size, System.Drawing">
+    <value>225, 368</value>
+  </data>
+  <data name="&gt;&gt;btnConvert.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="rbCreateSubdirectory.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;rbActionCreateCUESheet.Name" xml:space="preserve">
+    <value>rbActionCreateCUESheet</value>
+  </data>
+  <data name="&gt;&gt;mP3ToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpAction.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="contextMenuStripFileTree.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 76</value>
+  </data>
+  <data name="chkMulti.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnPause.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbUDC1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 119</value>
+  </data>
+  <data name="rbActionCreateCUESheet.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbSingleFile.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="rbWAV.Text" xml:space="preserve">
-    <value>&amp;WAV</value>
+  <data name="&gt;&gt;grpOutputPathGeneration.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
-  <data name="&gt;&gt;rbWAV.Name" xml:space="preserve">
-    <value>rbWAV</value>
+  <data name="&gt;&gt;rbAPE.Name" xml:space="preserve">
+    <value>rbAPE</value>
   </data>
-  <data name="&gt;&gt;rbWAV.Type" xml:space="preserve">
+  <data name="&gt;&gt;lblWriteOffset.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbCreateSubdirectory.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;btnConvert.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;rbGapsPrepended.Name" xml:space="preserve">
+    <value>rbGapsPrepended</value>
+  </data>
+  <data name="rbFreedbIf.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpAction.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 171</value>
+  </data>
+  <data name="&gt;&gt;tAKToolStripMenuItem.Name" xml:space="preserve">
+    <value>tAKToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;rbCreateSubdirectory.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtPreGapLength.Parent" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="chkRecursive.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>685, 447</value>
+  </data>
+  <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>685, 22</value>
+  </data>
+  <data name="rbEmbedCUE.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem2.Name" xml:space="preserve">
+    <value>toolStripMenuItem2</value>
+  </data>
+  <data name="&gt;&gt;rbGapsPrepended.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtAppendFilename.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;txtCustomFormat.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="rbAppendFilename.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="rbGapsLeftOut.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkRecursive.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Pregap</value>
+  </data>
+  <data name="rbActionCorrectFilenames.Text" xml:space="preserve">
+    <value>Correct filenames</value>
+  </data>
+  <data name="btnPause.Text" xml:space="preserve">
+    <value>&amp;Pause</value>
+  </data>
+  <data name="&gt;&gt;rbAPE.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;numericWriteOffset.Name" xml:space="preserve">
+    <value>numericWriteOffset</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="&gt;&gt;numericWriteOffset.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="lblWriteOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericWriteOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.ToolTip" xml:space="preserve">
+    <value>Contact the AccurateRip databse for validation and compare the image against database</value>
+  </data>
+  <data name="&gt;&gt;btnBrowseOutput.Name" xml:space="preserve">
+    <value>btnBrowseOutput</value>
+  </data>
+  <data name="tAKToolStripMenuItem.Text" xml:space="preserve">
+    <value>TAK</value>
+  </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>701, 483</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.Name" xml:space="preserve">
+    <value>chkLossyWAV</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerify.Parent" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="rbDontGenerate.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="btnSettings.Text" xml:space="preserve">
+    <value>Advanced Settings...</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStripFileTree.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpFreedb.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 336</value>
+  </data>
+  <data name="&gt;&gt;resetToOriginalLocationToolStripMenuItem.Name" xml:space="preserve">
+    <value>resetToOriginalLocationToolStripMenuItem</value>
+  </data>
+  <data name="rbFLAC.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtDataTrackLength.PromptChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="rbActionEncode.Text" xml:space="preserve">
+    <value>&amp;Don't verify, encode</value>
+  </data>
+  <data name="lblWriteOffset.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="grpFreedb.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.Type" xml:space="preserve">
     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;rbWAV.Parent" xml:space="preserve">
     <value>grpAudioOutput</value>
   </data>
-  <data name="&gt;&gt;rbWAV.ZOrder" xml:space="preserve">
-    <value>7</value>
+  <data name="$this.ToolTip" xml:space="preserve">
+    <value />
   </data>
-  <data name="rbFLAC.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="&gt;&gt;rbDontGenerate.Name" xml:space="preserve">
+    <value>rbDontGenerate</value>
   </data>
-  <data name="rbFLAC.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 17</value>
+  <data name="txtOutputPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>401, 21</value>
   </data>
-  <data name="rbFLAC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>50, 17</value>
-  </data>
-  <data name="rbFLAC.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rbFLAC.Text" xml:space="preserve">
-    <value>&amp;FLAC</value>
-  </data>
-  <data name="&gt;&gt;rbFLAC.Name" xml:space="preserve">
-    <value>rbFLAC</value>
-  </data>
-  <data name="&gt;&gt;rbFLAC.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbFLAC.Parent" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;rbFLAC.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="grpAudioOutput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 211</value>
-  </data>
-  <data name="grpAudioOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 164</value>
-  </data>
-  <data name="grpAudioOutput.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="grpAudioOutput.Text" xml:space="preserve">
-    <value>Audio Output</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.Name" xml:space="preserve">
-    <value>grpAudioOutput</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;grpAudioOutput.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
-  <data name="btnBatch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 308</value>
-  </data>
-  <data name="btnBatch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 23</value>
-  </data>
-  <data name="btnBatch.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="btnBatch.Text" xml:space="preserve">
-    <value>Batch...</value>
-  </data>
-  <data name="&gt;&gt;btnBatch.Name" xml:space="preserve">
-    <value>btnBatch</value>
-  </data>
-  <data name="&gt;&gt;btnBatch.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnBatch.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnBatch.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="btnFilenameCorrector.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 277</value>
-  </data>
-  <data name="btnFilenameCorrector.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 23</value>
-  </data>
-  <data name="btnFilenameCorrector.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="btnFilenameCorrector.Text" xml:space="preserve">
-    <value>Filename Corrector...</value>
-  </data>
-  <data name="&gt;&gt;btnFilenameCorrector.Name" xml:space="preserve">
-    <value>btnFilenameCorrector</value>
-  </data>
-  <data name="&gt;&gt;btnFilenameCorrector.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnFilenameCorrector.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnFilenameCorrector.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="btnSettings.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 215</value>
-  </data>
-  <data name="btnSettings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 23</value>
-  </data>
-  <data name="btnSettings.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
-  </data>
-  <data name="btnSettings.Text" xml:space="preserve">
-    <value>Advanced Settings...</value>
-  </data>
-  <data name="&gt;&gt;btnSettings.Name" xml:space="preserve">
-    <value>btnSettings</value>
-  </data>
-  <data name="&gt;&gt;btnSettings.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnSettings.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnSettings.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="txtPreGapLength.Location" type="System.Drawing.Point, System.Drawing">
-    <value>77, 117</value>
-  </data>
-  <data name="txtPreGapLength.Mask" xml:space="preserve">
-    <value>00:00:00</value>
-  </data>
-  <data name="txtPreGapLength.PromptChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="txtPreGapLength.Size" type="System.Drawing.Size, System.Drawing">
-    <value>54, 21</value>
-  </data>
-  <data name="txtPreGapLength.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
-  </data>
-  <data name="txtPreGapLength.ToolTip" xml:space="preserve">
-    <value>Pregap is a certain amount of silence or hidden audio before track one. Normally it is known from the CUE sheet, but if converting/verifying a set of separate tracks without a CUE sheet you might want to set this.</value>
-  </data>
-  <data name="&gt;&gt;txtPreGapLength.Name" xml:space="preserve">
-    <value>txtPreGapLength</value>
-  </data>
-  <data name="&gt;&gt;txtPreGapLength.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPreGapLength.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;txtPreGapLength.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 120</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>45, 13</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>17</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>Pregap:</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="rbArPlusCRC.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbArPlusCRC.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="rbArPlusCRC.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 88</value>
-  </data>
-  <data name="rbArPlusCRC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>110, 17</value>
-  </data>
-  <data name="rbArPlusCRC.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
-  </data>
-  <data name="rbArPlusCRC.Text" xml:space="preserve">
-    <value>Verify AR + CRCs</value>
-  </data>
-  <data name="rbArPlusCRC.ToolTip" xml:space="preserve">
-    <value>Contact the AccurateRip databse for validation and compare the image against database</value>
-  </data>
-  <data name="&gt;&gt;rbArPlusCRC.Name" xml:space="preserve">
-    <value>rbArPlusCRC</value>
-  </data>
-  <data name="&gt;&gt;rbArPlusCRC.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbArPlusCRC.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;rbArPlusCRC.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="rbArAndEncode.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbArAndEncode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 37</value>
-  </data>
-  <data name="rbArAndEncode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 17</value>
-  </data>
-  <data name="rbArAndEncode.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="rbArAndEncode.Text" xml:space="preserve">
-    <value>Encode and verify</value>
-  </data>
-  <data name="&gt;&gt;rbArAndEncode.Name" xml:space="preserve">
-    <value>rbArAndEncode</value>
-  </data>
-  <data name="&gt;&gt;rbArAndEncode.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbArAndEncode.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;rbArAndEncode.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 141</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 13</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Data track:</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtDataTrackLength.Location" type="System.Drawing.Point, System.Drawing">
-    <value>77, 138</value>
-  </data>
-  <data name="txtDataTrackLength.Mask" xml:space="preserve">
-    <value>00:00:00</value>
-  </data>
-  <data name="txtDataTrackLength.PromptChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="txtDataTrackLength.Size" type="System.Drawing.Size, System.Drawing">
-    <value>54, 21</value>
-  </data>
-  <data name="txtDataTrackLength.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="txtDataTrackLength.ToolTip" xml:space="preserve">
-    <value>Not used for normal music CDs. Enhanced CDs with data tracks cannot be found in database unless you know the length of the data track. You can often find it in EAC log. If EAC log is found next to the CUE sheet, it will be parsed automaticly and you won't have to enter anything here.</value>
-  </data>
-  <data name="&gt;&gt;txtDataTrackLength.Name" xml:space="preserve">
-    <value>txtDataTrackLength</value>
-  </data>
-  <data name="&gt;&gt;txtDataTrackLength.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtDataTrackLength.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;txtDataTrackLength.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="rbArApplyOffset.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbArApplyOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 20</value>
-  </data>
-  <data name="rbArApplyOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 17</value>
-  </data>
-  <data name="rbArApplyOffset.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rbArApplyOffset.Text" xml:space="preserve">
-    <value>Verify, &amp;then encode</value>
-  </data>
-  <data name="rbArApplyOffset.ToolTip" xml:space="preserve">
-    <value>On the first pass, verify and try to find an offset correction which makes the rip accurate according to the AccurateRip database. On the second pass, convert, possibly applying offset correction.</value>
-  </data>
-  <data name="&gt;&gt;rbArApplyOffset.Name" xml:space="preserve">
-    <value>rbArApplyOffset</value>
-  </data>
-  <data name="&gt;&gt;rbArApplyOffset.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbArApplyOffset.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;rbArApplyOffset.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="rbArVerify.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbArVerify.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 71</value>
-  </data>
-  <data name="rbArVerify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>93, 17</value>
-  </data>
-  <data name="rbArVerify.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="rbArVerify.Text" xml:space="preserve">
-    <value>&amp;Verify AR only</value>
-  </data>
-  <data name="rbArVerify.ToolTip" xml:space="preserve">
-    <value>Contact the AccurateRip databse for validation and compare the image against database</value>
-  </data>
-  <data name="&gt;&gt;rbArVerify.Name" xml:space="preserve">
-    <value>rbArVerify</value>
-  </data>
-  <data name="&gt;&gt;rbArVerify.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbArVerify.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;rbArVerify.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="rbArNone.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbArNone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 54</value>
-  </data>
-  <data name="rbArNone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>123, 17</value>
-  </data>
-  <data name="rbArNone.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="rbArNone.Text" xml:space="preserve">
-    <value>&amp;Don't verify, encode</value>
-  </data>
-  <data name="rbArNone.ToolTip" xml:space="preserve">
-    <value>Don't contact the AccurateRip database for validation</value>
-  </data>
-  <data name="&gt;&gt;rbArNone.Name" xml:space="preserve">
-    <value>rbArNone</value>
-  </data>
-  <data name="&gt;&gt;rbArNone.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbArNone.Parent" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;rbArNone.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="grpAccurateRip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>244, 211</value>
-  </data>
-  <data name="grpAccurateRip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 164</value>
-  </data>
-  <data name="grpAccurateRip.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="grpAccurateRip.Text" xml:space="preserve">
-    <value>AccurateRip</value>
-  </data>
-  <data name="&gt;&gt;grpAccurateRip.Name" xml:space="preserve">
-    <value>grpAccurateRip</value>
-  </data>
-  <data name="&gt;&gt;grpAccurateRip.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;grpAccurateRip.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;grpAccurateRip.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>0, 378</value>
-  </metadata>
-  <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>253, 17</value>
-  </data>
-  <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="toolStripProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 16</value>
-  </data>
-  <data name="toolStripProgressBar1.ToolTipText" xml:space="preserve">
-    <value>Track progress</value>
-  </data>
-  <data name="toolStripProgressBar2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>140, 16</value>
-  </data>
-  <data name="toolStripProgressBar2.ToolTipText" xml:space="preserve">
-    <value>Disk progress</value>
-  </data>
-  <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 378</value>
-  </data>
-  <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>552, 22</value>
-  </data>
-  <data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="statusStrip1.Text" xml:space="preserve">
-    <value>statusStrip1</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.Name" xml:space="preserve">
-    <value>statusStrip1</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="btnCUECreator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnCUECreator.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 246</value>
-  </data>
-  <data name="btnCUECreator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 23</value>
-  </data>
-  <data name="btnCUECreator.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="btnCUECreator.Text" xml:space="preserve">
-    <value>CUE Sheet Creator...</value>
-  </data>
-  <data name="&gt;&gt;btnCUECreator.Name" xml:space="preserve">
-    <value>btnCUECreator</value>
-  </data>
-  <data name="&gt;&gt;btnCUECreator.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnCUECreator.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnCUECreator.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="btnStop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 339</value>
-  </data>
-  <data name="btnStop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 23</value>
-  </data>
-  <data name="btnStop.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="btnStop.Text" xml:space="preserve">
-    <value>&amp;Stop</value>
-  </data>
-  <data name="btnStop.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;btnStop.Name" xml:space="preserve">
-    <value>btnStop</value>
-  </data>
-  <data name="&gt;&gt;btnStop.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnStop.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnStop.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="btnPause.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnPause.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 339</value>
-  </data>
-  <data name="btnPause.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 23</value>
-  </data>
-  <data name="btnPause.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="btnPause.Text" xml:space="preserve">
-    <value>&amp;Pause</value>
-  </data>
-  <data name="btnPause.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;btnPause.Name" xml:space="preserve">
-    <value>btnPause</value>
-  </data>
-  <data name="&gt;&gt;btnPause.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnPause.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnPause.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="btnResume.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="btnResume.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 339</value>
-  </data>
-  <data name="btnResume.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 23</value>
-  </data>
-  <data name="btnResume.TabIndex" type="System.Int32, mscorlib">
-    <value>14</value>
-  </data>
-  <data name="btnResume.Text" xml:space="preserve">
-    <value>&amp;Resume</value>
-  </data>
-  <data name="btnResume.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;btnResume.Name" xml:space="preserve">
-    <value>btnResume</value>
-  </data>
-  <data name="&gt;&gt;btnResume.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnResume.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;btnResume.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="rbFreedbAlways.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbFreedbAlways.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 53</value>
-  </data>
-  <data name="rbFreedbAlways.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 17</value>
-  </data>
-  <data name="rbFreedbAlways.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="rbFreedbAlways.Text" xml:space="preserve">
-    <value>Always</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbAlways.Name" xml:space="preserve">
-    <value>rbFreedbAlways</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbAlways.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbAlways.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbAlways.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="rbFreedbIf.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbFreedbIf.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 36</value>
-  </data>
-  <data name="rbFreedbIf.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 17</value>
-  </data>
-  <data name="rbFreedbIf.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="rbFreedbIf.Text" xml:space="preserve">
-    <value>If needed</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbIf.Name" xml:space="preserve">
-    <value>rbFreedbIf</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbIf.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbIf.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbIf.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="rbFreedbNever.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbFreedbNever.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 19</value>
-  </data>
-  <data name="rbFreedbNever.Size" type="System.Drawing.Size, System.Drawing">
-    <value>54, 17</value>
-  </data>
-  <data name="rbFreedbNever.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rbFreedbNever.Text" xml:space="preserve">
-    <value>Never</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbNever.Name" xml:space="preserve">
-    <value>rbFreedbNever</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbNever.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbNever.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;rbFreedbNever.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 92</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 86</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Freedb lookup</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <metadata name="contextMenuStripUDC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>250, 8</value>
-  </metadata>
-  <data name="toolStripMenuItem2.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 22</value>
-  </data>
-  <data name="toolStripMenuItem2.Text" xml:space="preserve">
-    <value>Lossless:</value>
-  </data>
-  <data name="tAKToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 22</value>
-  </data>
-  <data name="tAKToolStripMenuItem.Text" xml:space="preserve">
-    <value>TAK</value>
-  </data>
-  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 22</value>
-  </data>
-  <data name="toolStripMenuItem1.Text" xml:space="preserve">
-    <value>ALAC</value>
-  </data>
-  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>116, 6</value>
-  </data>
-  <data name="toolStripMenuItem3.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
+  <data name="rbUDC1.Text" xml:space="preserve">
+    <value>User</value>
   </data>
   <data name="toolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 22</value>
   </data>
+  <data name="&gt;&gt;rbActionVerifyAndCRCs.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbAPE.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnResume.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 23</value>
+  </data>
+  <data name="&gt;&gt;txtInputPath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbNever.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
+    <value>toolStripMenuItem1</value>
+  </data>
+  <data name="btnBrowseOutput.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 23</value>
+  </data>
+  <data name="&gt;&gt;rbGapsLeftOut.Parent" xml:space="preserve">
+    <value>grpOutputStyle</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>41, 13</value>
+  </data>
+  <data name="btnCodec.Location" type="System.Drawing.Point, System.Drawing">
+    <value>66, 117</value>
+  </data>
+  <data name="btnConvert.Size" type="System.Drawing.Size, System.Drawing">
+    <value>131, 23</value>
+  </data>
+  <data name="&gt;&gt;txtPreGapLength.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbNoAudio.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmCUETools</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 17</value>
+  </data>
+  <data name="grpAudioOutput.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Text" xml:space="preserve">
+    <value>Encode and verify</value>
+  </data>
+  <data name="&gt;&gt;statusStrip1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpAction.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 159</value>
+  </data>
+  <data name="&gt;&gt;btnBrowseOutput.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="rbFreedbIf.Size" type="System.Drawing.Size, System.Drawing">
+    <value>72, 17</value>
+  </data>
+  <data name="rbAPE.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 51</value>
+  </data>
+  <data name="&gt;&gt;rbActionCreateCUESheet.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="rbWAV.Text" xml:space="preserve">
+    <value>&amp;WAV</value>
+  </data>
+  <data name="fileSystemTreeView1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnStop.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;rbDontGenerate.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpInput.Text" xml:space="preserve">
+    <value>Input</value>
+  </data>
+  <data name="toolStripStatusLabel2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>White</value>
+  </data>
+  <data name="btnAbout.Location" type="System.Drawing.Point, System.Drawing">
+    <value>265, 366</value>
+  </data>
+  <data name="&gt;&gt;grpExtra.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="rbNoAudio.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 102</value>
+  </data>
+  <data name="rbFreedbNever.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="rbDontGenerate.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;grpFreedb.Name" xml:space="preserve">
+    <value>grpFreedb</value>
+  </data>
+  <data name="rbNoAudio.Text" xml:space="preserve">
+    <value>&amp;None</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnConvert.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;toolStripSeparator2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grpExtra.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="btnResume.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>202, 6</value>
+  </data>
+  <data name="btnCodec.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;btnSettings.Name" xml:space="preserve">
+    <value>btnSettings</value>
+  </data>
+  <data name="txtInputPath.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;chkRecursive.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtOutputPath.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyAndEncode.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtDataTrackLength.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripMenuItem2.Text" xml:space="preserve">
+    <value>Lossless:</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbIf.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;chkMulti.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;grpInput.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="rbActionVerify.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 71</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem3.Name" xml:space="preserve">
+    <value>toolStripMenuItem3</value>
+  </data>
+  <data name="rbWAV.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;txtPreGapLength.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="rbActionVerify.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelFLAC.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbNoAudio.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 17</value>
+  </data>
+  <data name="lblWriteOffset.Text" xml:space="preserve">
+    <value>Offset</value>
+  </data>
+  <data name="rbAppendFilename.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabel2.Name" xml:space="preserve">
+    <value>toolStripStatusLabel2</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>252, 2</value>
+  </data>
+  <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 22</value>
+  </data>
+  <data name="&gt;&gt;btnResume.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="chkRecursive.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 148</value>
+  </data>
+  <data name="toolStripStatusLabelFLAC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>21, 17</value>
+  </data>
+  <data name="rbWavPack.Text" xml:space="preserve">
+    <value>Wav&amp;Pack</value>
+  </data>
+  <data name="&gt;&gt;mP3ToolStripMenuItem.Name" xml:space="preserve">
+    <value>mP3ToolStripMenuItem</value>
+  </data>
+  <data name="grpInput.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="btnStop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbAPE.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="rbDontGenerate.Text" xml:space="preserve">
+    <value>&amp;Manual</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>433, 420</value>
+  </data>
+  <data name="&gt;&gt;btnAbout.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="$this.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>1200, 483</value>
+  </data>
+  <data name="rbFreedbNever.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbSingleFile.Name" xml:space="preserve">
+    <value>rbSingleFile</value>
+  </data>
+  <data name="toolStripStatusLabelProcessed.Text" xml:space="preserve">
+    <value>Processed: 0</value>
+  </data>
+  <data name="rbFreedbAlways.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbGapsLeftOut.ToolTip" xml:space="preserve">
+    <value>Create multiple files with gaps left out</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.ToolTip" xml:space="preserve">
+    <value>On the first pass, verify and try to find an offset correction which makes the rip accurate according to the AccurateRip database. On the second pass, convert, possibly applying offset correction.</value>
+  </data>
+  <data name="chkLossyWAV.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="rbGapsAppended.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;grpInput.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyThenEncode.Parent" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="&gt;&gt;txtPreGapLength.Name" xml:space="preserve">
+    <value>txtPreGapLength</value>
+  </data>
+  <data name="&gt;&gt;btnResume.Name" xml:space="preserve">
+    <value>btnResume</value>
+  </data>
+  <data name="txtPreGapLength.Size" type="System.Drawing.Size, System.Drawing">
+    <value>54, 21</value>
+  </data>
+  <data name="&gt;&gt;btnStop.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="lblWriteOffset.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;rbActionCreateCUESheet.Parent" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelWV.Name" xml:space="preserve">
+    <value>toolStripStatusLabelWV</value>
+  </data>
+  <data name="&gt;&gt;btnStop.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbGapsPrepended.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;rbAppendFilename.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpAudioOutput.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 171</value>
+  </data>
+  <data name="toolStripStatusLabelProcessed.Size" type="System.Drawing.Size, System.Drawing">
+    <value>72, 17</value>
+  </data>
+  <data name="&gt;&gt;btnPause.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;numericWriteOffset.Parent" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="&gt;&gt;txtCreateSubdirectory.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.Name" xml:space="preserve">
+    <value>rbUDC1</value>
+  </data>
+  <data name="toolStripProgressBar1.ToolTipText" xml:space="preserve">
+    <value>Track progress</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="rbSingleFile.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;grpAction.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="rbAPE.Text" xml:space="preserve">
+    <value>APE</value>
+  </data>
+  <data name="textBatchReport.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
+    <value>toolTip1</value>
+  </data>
+  <data name="&gt;&gt;btnResume.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="rbGapsPrepended.Size" type="System.Drawing.Size, System.Drawing">
+    <value>104, 17</value>
+  </data>
+  <data name="grpInput.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 5</value>
+  </data>
+  <data name="&gt;&gt;grpOutputPathGeneration.Name" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="rbWavPack.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 34</value>
+  </data>
+  <data name="txtDataTrackLength.ToolTip" xml:space="preserve">
+    <value>Not used for normal music CDs. Enhanced CDs with data tracks cannot be found in database unless you know the length of the data track. You can often find it in EAC log. If EAC log is found next to the CUE sheet, it will be parsed automaticly and you won't have to enter anything here.</value>
+  </data>
+  <data name="rbFLAC.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;btnConvert.Name" xml:space="preserve">
+    <value>btnConvert</value>
+  </data>
+  <data name="rbActionVerify.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnSettings.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbActionVerifyThenEncode.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnPause.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;rbActionCorrectFilenames.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbWavPack.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 17</value>
+  </data>
+  <data name="toolStripStatusLabelAR.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>Overlay</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 17</value>
+  </data>
+  <data name="&gt;&gt;grpFreedb.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="toolStripMenuItem3.Text" xml:space="preserve">
     <value>Lossy:</value>
   </data>
-  <data name="mP3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 22</value>
+  <data name="&gt;&gt;txtAppendFilename.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="&gt;&gt;rbCustomFormat.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;rbAPE.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="rbWavPack.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="btnPause.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grpOutputStyle.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnAbout.Text" xml:space="preserve">
+    <value>About</value>
+  </data>
+  <data name="&gt;&gt;contextMenuStripFileTree.Name" xml:space="preserve">
+    <value>contextMenuStripFileTree</value>
+  </data>
+  <data name="&gt;&gt;grpOutputStyle.Name" xml:space="preserve">
+    <value>grpOutputStyle</value>
+  </data>
+  <data name="btnConvert.Text" xml:space="preserve">
+    <value>&amp;Go</value>
+  </data>
+  <data name="&gt;&gt;txtInputPath.Name" xml:space="preserve">
+    <value>txtInputPath</value>
+  </data>
+  <data name="rbTTA.Size" type="System.Drawing.Size, System.Drawing">
+    <value>44, 17</value>
+  </data>
+  <data name="rbActionCorrectFilenames.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="rbFreedbAlways.Text" xml:space="preserve">
+    <value>Always</value>
+  </data>
+  <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 425</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyAndCRCs.Name" xml:space="preserve">
+    <value>rbActionVerifyAndCRCs</value>
+  </data>
+  <data name="&gt;&gt;textBatchReport.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;rbActionCorrectFilenames.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbAlways.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripSeparator1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="numericWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
+    <value>76, 56</value>
+  </data>
+  <data name="rbActionEncode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbFLAC.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;btnCodec.Name" xml:space="preserve">
+    <value>btnCodec</value>
+  </data>
+  <data name="btnSettings.Location" type="System.Drawing.Point, System.Drawing">
+    <value>265, 336</value>
+  </data>
+  <data name="&gt;&gt;rbGapsPrepended.Parent" xml:space="preserve">
+    <value>grpOutputStyle</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="chkRecursive.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtPreGapLength.ToolTip" xml:space="preserve">
+    <value>Pregap is a certain amount of silence or hidden audio before track one. Normally it is known from the CUE sheet, but if converting/verifying a set of separate tracks without a CUE sheet you might want to set this.</value>
+  </data>
+  <data name="btnSettings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="lblWriteOffset.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbAPE.Size" type="System.Drawing.Size, System.Drawing">
+    <value>44, 17</value>
+  </data>
+  <data name="&gt;&gt;txtDataTrackLength.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="btnStop.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPE.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbAlways.Name" xml:space="preserve">
+    <value>rbFreedbAlways</value>
+  </data>
+  <data name="numericWriteOffset.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="rbSingleFile.Text" xml:space="preserve">
+    <value>&amp;Single File + CUE</value>
+  </data>
+  <data name="rbDontGenerate.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 113</value>
+  </data>
+  <data name="btnBrowseOutput.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="rbFreedbIf.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbFLAC.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="contextMenuStripFileTree.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;grpFreedb.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="fileSystemTreeView1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 43</value>
+  </data>
+  <data name="toolStripStatusLabelAR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="&gt;&gt;txtAppendFilename.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;chkMulti.Name" xml:space="preserve">
+    <value>chkMulti</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="rbCreateSubdirectory.Text" xml:space="preserve">
+    <value>C&amp;reate subdirectory:</value>
+  </data>
+  <data name="rbCreateSubdirectory.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbCustomFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbAPE.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="txtDataTrackLength.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
   <data name="mP3ToolStripMenuItem.Text" xml:space="preserve">
     <value>MP3</value>
   </data>
+  <data name="&gt;&gt;oGGToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbActionCreateCUESheet.Size" type="System.Drawing.Size, System.Drawing">
+    <value>118, 17</value>
+  </data>
+  <data name="txtCreateSubdirectory.Location" type="System.Drawing.Point, System.Drawing">
+    <value>160, 43</value>
+  </data>
+  <data name="&gt;&gt;txtCustomFormat.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="grpFreedb.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
+    <value>265, 394</value>
+  </data>
+  <data name="SelectedNodeName.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelWV.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbFreedbNever.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbActionCreateCUESheet.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="rbCreateSubdirectory.Size" type="System.Drawing.Size, System.Drawing">
+    <value>125, 17</value>
+  </data>
+  <data name="resetToOriginalLocationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="&gt;&gt;txtCustomFormat.Name" xml:space="preserve">
+    <value>txtCustomFormat</value>
+  </data>
+  <data name="grpAudioOutput.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 159</value>
+  </data>
+  <data name="rbFreedbIf.Text" xml:space="preserve">
+    <value>If needed</value>
+  </data>
   <data name="oGGToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 22</value>
   </data>
-  <data name="oGGToolStripMenuItem.Text" xml:space="preserve">
-    <value>OGG</value>
+  <data name="chkLossyWAV.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="contextMenuStripUDC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 142</value>
+  <data name="&gt;&gt;numericWriteOffset.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;contextMenuStripUDC.Name" xml:space="preserve">
-    <value>contextMenuStripUDC</value>
+  <data name="btnPause.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 23</value>
   </data>
-  <data name="&gt;&gt;contextMenuStripUDC.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <data name="rbActionVerifyAndEncode.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
   </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>552, 400</value>
+  <data name="rbFreedbIf.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
+  <data name="&gt;&gt;rbCreateSubdirectory.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="statusStrip1.Text" xml:space="preserve">
+    <value>statusStrip1</value>
+  </data>
+  <data name="&gt;&gt;rbCustomFormat.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="grpAudioOutput.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbWAV.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpInput.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="&gt;&gt;rbGapsAppended.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grpFreedb.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;rbWAV.Name" xml:space="preserve">
+    <value>rbWAV</value>
+  </data>
+  <data name="rbSingleFile.ToolTip" xml:space="preserve">
+    <value>Create single file + CUE sheet</value>
+  </data>
+  <data name="rbWavPack.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="toolStripMenuItem2.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="rbGapsLeftOut.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 17</value>
+  </data>
+  <data name="grpInput.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbTTA.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="rbSingleFile.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="panel1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbGapsAppended.Size" type="System.Drawing.Size, System.Drawing">
+    <value>101, 17</value>
+  </data>
+  <data name="toolStripProgressBar2.ToolTipText" xml:space="preserve">
+    <value>Disk progress</value>
+  </data>
+  <data name="grpFreedb.Text" xml:space="preserve">
+    <value>Freedb lookup</value>
+  </data>
+  <data name="rbTTA.Text" xml:space="preserve">
+    <value>TTA</value>
+  </data>
+  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>116, 6</value>
+  </data>
+  <data name="rbFLAC.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;lblWriteOffset.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="btnBrowseOutput.Location" type="System.Drawing.Point, System.Drawing">
+    <value>340, 110</value>
+  </data>
+  <data name="&gt;&gt;grpExtra.Name" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>CUETools 2.0</value>
+  </data>
+  <data name="rbFreedbAlways.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="rbFLAC.Text" xml:space="preserve">
+    <value>&amp;FLAC</value>
+  </data>
+  <data name="grpOutputPathGeneration.Text" xml:space="preserve">
+    <value>Output Path</value>
+  </data>
+  <data name="rbFreedbAlways.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="txtOutputPath.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbFLAC.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageBeforeText</value>
+  </data>
+  <data name="rbWavPack.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtInputPath.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
+    <value>38, 13</value>
+  </data>
+  <data name="toolStripStatusLabelAR.Size" type="System.Drawing.Size, System.Drawing">
+    <value>21, 17</value>
+  </data>
+  <data name="rbActionVerify.ToolTip" xml:space="preserve">
+    <value>Contact the AccurateRip databse for validation and compare the image against database</value>
+  </data>
+  <data name="rbSingleFile.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 17</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Text" xml:space="preserve">
+    <value>Verify, &amp;then encode</value>
+  </data>
+  <data name="rbActionVerify.Text" xml:space="preserve">
+    <value>&amp;Verify AR only</value>
+  </data>
+  <data name="txtInputPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 16</value>
+  </data>
+  <data name="rbActionCreateCUESheet.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;grpOutputPathGeneration.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="toolStripStatusLabelWV.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerify.Name" xml:space="preserve">
+    <value>rbActionVerify</value>
+  </data>
+  <data name="&gt;&gt;toolStripMenuItem3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelAR.Name" xml:space="preserve">
+    <value>toolStripStatusLabelAR</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="setAsMyMusicFolderToolStripMenuItem.Text" xml:space="preserve">
+    <value>Set as My Music folder</value>
+  </data>
+  <data name="rbTTA.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="textBatchReport.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbGapsAppended.ToolTip" xml:space="preserve">
+    <value>Create multiple files with gaps appended</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripStatusLabel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>21, 17</value>
+  </data>
+  <data name="rbActionCorrectFilenames.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;chkMulti.Parent" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelProcessed.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtCreateSubdirectory.Text" xml:space="preserve">
+    <value>New</value>
+  </data>
+  <data name="&gt;&gt;rbUDC1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 22</value>
+  </data>
+  <data name="&gt;&gt;btnResume.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="statusStrip1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnCodec.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyAndEncode.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="rbFreedbNever.Size" type="System.Drawing.Size, System.Drawing">
+    <value>54, 17</value>
+  </data>
+  <data name="grpAction.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="toolStripProgressBar2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>140, 16</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Size" type="System.Drawing.Size, System.Drawing">
+    <value>110, 17</value>
+  </data>
+  <data name="rbUDC1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="chkRecursive.Text" xml:space="preserve">
+    <value>Recursive</value>
+  </data>
+  <data name="&gt;&gt;txtOutputPath.Name" xml:space="preserve">
+    <value>txtOutputPath</value>
+  </data>
+  <data name="rbActionCreateCUESheet.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 37</value>
+  </data>
+  <data name="txtAppendFilename.Location" type="System.Drawing.Point, System.Drawing">
+    <value>160, 64</value>
+  </data>
+  <data name="&gt;&gt;textBatchReport.Name" xml:space="preserve">
+    <value>textBatchReport</value>
+  </data>
+  <data name="&gt;&gt;txtAppendFilename.Name" xml:space="preserve">
+    <value>txtAppendFilename</value>
+  </data>
+  <data name="&gt;&gt;oGGToolStripMenuItem.Name" xml:space="preserve">
+    <value>oGGToolStripMenuItem</value>
+  </data>
+  <data name="btnPause.Location" type="System.Drawing.Point, System.Drawing">
+    <value>330, 394</value>
+  </data>
+  <data name="grpOutputPathGeneration.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="rbGapsLeftOut.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 87</value>
+  </data>
+  <data name="&gt;&gt;toolStripProgressBar1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>140, 16</value>
+  </data>
+  <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyThenEncode.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;toolStripSeparator2.Name" xml:space="preserve">
+    <value>toolStripSeparator2</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbIf.Name" xml:space="preserve">
+    <value>rbFreedbIf</value>
+  </data>
+  <data name="toolStripStatusLabelFLAC.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="rbFreedbAlways.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 53</value>
+  </data>
+  <data name="textBatchReport.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;rbSingleFile.Parent" xml:space="preserve">
+    <value>grpOutputStyle</value>
+  </data>
+  <data name="grpExtra.Text" xml:space="preserve">
+    <value>Extra</value>
+  </data>
+  <data name="grpFreedb.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 81</value>
+  </data>
+  <data name="grpAction.Text" xml:space="preserve">
+    <value>Action</value>
+  </data>
+  <data name="textBatchReport.WordWrap" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="rbTTA.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 68</value>
+  </data>
+  <data name="tAKToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 22</value>
+  </data>
+  <data name="&gt;&gt;txtOutputPath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtOutputPath.Parent" xml:space="preserve">
+    <value>grpOutputPathGeneration</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 38</value>
+  </data>
+  <data name="chkLossyWAV.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="numericWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
+    <value>54, 21</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyAndEncode.Parent" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbAlways.Parent" xml:space="preserve">
+    <value>grpFreedb</value>
+  </data>
+  <data name="&gt;&gt;btnSettings.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="rbFreedbNever.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAppendFilename.Size" type="System.Drawing.Size, System.Drawing">
+    <value>122, 17</value>
+  </data>
+  <data name="rbActionVerify.Size" type="System.Drawing.Size, System.Drawing">
+    <value>93, 17</value>
+  </data>
+  <data name="rbEmbedCUE.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 19</value>
+  </data>
+  <data name="chkMulti.Size" type="System.Drawing.Size, System.Drawing">
+    <value>62, 17</value>
+  </data>
+  <data name="txtDataTrackLength.Location" type="System.Drawing.Point, System.Drawing">
+    <value>76, 35</value>
+  </data>
+  <data name="&gt;&gt;rbTTA.Name" xml:space="preserve">
+    <value>rbTTA</value>
+  </data>
+  <data name="rbAppendFilename.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 67</value>
+  </data>
+  <data name="&gt;&gt;btnSettings.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;rbActionCorrectFilenames.Name" xml:space="preserve">
+    <value>rbActionCorrectFilenames</value>
+  </data>
+  <data name="rbActionEncode.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>293, 17</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Data track</value>
+  </data>
+  <data name="&gt;&gt;rbAppendFilename.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="chkLossyWAV.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 17</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerifyAndEncode.Name" xml:space="preserve">
+    <value>rbActionVerifyAndEncode</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="rbNoAudio.ToolTip" xml:space="preserve">
+    <value>Don't create any audio files, only CUE sheet</value>
+  </data>
+  <data name="btnResume.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbFLAC.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="txtCreateSubdirectory.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="btnStop.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="btnBrowseOutput.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;grpOutputStyle.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;txtDataTrackLength.Parent" xml:space="preserve">
+    <value>grpExtra</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>57, 13</value>
+  </data>
+  <data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve">
+    <value>grpInput</value>
+  </data>
+  <data name="txtCreateSubdirectory.Size" type="System.Drawing.Size, System.Drawing">
+    <value>251, 21</value>
+  </data>
+  <data name="&gt;&gt;rbCustomFormat.Name" xml:space="preserve">
+    <value>rbCustomFormat</value>
+  </data>
+  <data name="btnSettings.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="rbUDC1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="fileSystemTreeView1.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="txtAppendFilename.Text" xml:space="preserve">
+    <value>-New</value>
+  </data>
+  <data name="grpAudioOutput.Text" xml:space="preserve">
+    <value>Audio Output</value>
+  </data>
+  <data name="&gt;&gt;setAsMyMusicFolderToolStripMenuItem.Name" xml:space="preserve">
+    <value>setAsMyMusicFolderToolStripMenuItem</value>
+  </data>
+  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
+    <value>142, 171</value>
+  </data>
+  <data name="&gt;&gt;rbAppendFilename.Name" xml:space="preserve">
+    <value>rbAppendFilename</value>
+  </data>
+  <data name="rbGapsPrepended.ToolTip" xml:space="preserve">
+    <value>Create multiple files with gaps prepended</value>
+  </data>
+  <data name="&gt;&gt;rbGapsPrepended.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="rbCustomFormat.Text" xml:space="preserve">
+    <value>Use custom format:</value>
+  </data>
+  <data name="&gt;&gt;btnAbout.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripMenuItem1.Text" xml:space="preserve">
+    <value>ALAC</value>
+  </data>
+  <data name="&gt;&gt;rbGapsAppended.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="rbWAV.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="rbAppendFilename.Text" xml:space="preserve">
+    <value>Append to filename:</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Text" xml:space="preserve">
+    <value>Verify AR + CRCs</value>
+  </data>
+  <data name="rbCustomFormat.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="mP3ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 22</value>
+  </data>
+  <data name="rbUDC1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>47, 17</value>
+  </data>
+  <data name="chkMulti.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="textBatchReport.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="&gt;&gt;fileSystemTreeView1.Name" xml:space="preserve">
+    <value>fileSystemTreeView1</value>
+  </data>
+  <data name="grpExtra.Size" type="System.Drawing.Size, System.Drawing">
+    <value>141, 81</value>
+  </data>
+  <data name="toolStripStatusLabelAR.ToolTipText" xml:space="preserve">
+    <value>Album found in AccurateRip database.</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="rbFreedbIf.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 36</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 88</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1717,82 +1905,442 @@
         AAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAA=
 </value>
   </data>
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>CenterScreen</value>
+  <data name="btnResume.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>CUETools 1.9.5a</value>
+  <data name="rbNoAudio.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
   </data>
-  <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
-    <value>toolStripStatusLabel1</value>
+  <data name="rbCreateSubdirectory.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 44</value>
   </data>
-  <data name="&gt;&gt;toolStripStatusLabel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;rbEmbedCUE.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolStripProgressBar1.Name" xml:space="preserve">
-    <value>toolStripProgressBar1</value>
+  <data name="txtCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
+    <value>160, 85</value>
   </data>
-  <data name="&gt;&gt;toolStripProgressBar1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;rbActionEncode.Name" xml:space="preserve">
+    <value>rbActionEncode</value>
+  </data>
+  <data name="&gt;&gt;rbGapsAppended.Parent" xml:space="preserve">
+    <value>grpOutputStyle</value>
+  </data>
+  <data name="&gt;&gt;lblWriteOffset.Name" xml:space="preserve">
+    <value>lblWriteOffset</value>
+  </data>
+  <data name="grpOutputStyle.Text" xml:space="preserve">
+    <value>CUE Style</value>
+  </data>
+  <data name="&gt;&gt;SelectedNodeName.Name" xml:space="preserve">
+    <value>SelectedNodeName</value>
+  </data>
+  <data name="rbActionEncode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 54</value>
+  </data>
+  <data name="rbActionCorrectFilenames.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 122</value>
+  </data>
+  <data name="rbFreedbNever.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 19</value>
+  </data>
+  <data name="chkMulti.Text" xml:space="preserve">
+    <value>Multiple</value>
+  </data>
+  <data name="rbEmbedCUE.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="rbWAV.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;rbEmbedCUE.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtCustomFormat.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbAlways.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;chkRecursive.Name" xml:space="preserve">
+    <value>chkRecursive</value>
+  </data>
+  <data name="&gt;&gt;rbActionEncode.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="rbGapsAppended.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 53</value>
+  </data>
+  <data name="&gt;&gt;statusStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbUDC1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="grpOutputStyle.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;SelectedNodeName.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbFLAC.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>0, 0, 0, 0</value>
+  </data>
+  <data name="resetToOriginalLocationToolStripMenuItem.Text" xml:space="preserve">
+    <value>Reset to original location</value>
+  </data>
+  <data name="&gt;&gt;txtInputPath.Parent" xml:space="preserve">
+    <value>grpInput</value>
+  </data>
+  <data name="txtCustomFormat.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="&gt;&gt;toolStripProgressBar2.Name" xml:space="preserve">
     <value>toolStripProgressBar2</value>
   </data>
-  <data name="&gt;&gt;toolStripProgressBar2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="rbFLAC.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
   </data>
-  <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
-    <value>toolTip1</value>
+  <data name="txtInputPath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;rbGapsAppended.Name" xml:space="preserve">
+    <value>rbGapsAppended</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem2.Name" xml:space="preserve">
-    <value>toolStripMenuItem2</value>
+  <data name="btnConvert.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="&gt;&gt;tAKToolStripMenuItem.Name" xml:space="preserve">
-    <value>tAKToolStripMenuItem</value>
+  <data name="txtInputPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 21</value>
+  </data>
+  <data name="&gt;&gt;grpInput.Name" xml:space="preserve">
+    <value>grpInput</value>
+  </data>
+  <data name="&gt;&gt;chkLossyWAV.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="textBatchReport.Location" type="System.Drawing.Point, System.Drawing">
+    <value>7, 40</value>
+  </data>
+  <data name="rbEmbedCUE.Text" xml:space="preserve">
+    <value>&amp;Embedded</value>
+  </data>
+  <data name="&gt;&gt;rbFLAC.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="chkRecursive.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;btnStop.Name" xml:space="preserve">
+    <value>btnStop</value>
+  </data>
+  <data name="rbFLAC.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 17</value>
+  </data>
+  <data name="txtPreGapLength.PromptChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;rbCreateSubdirectory.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;toolStripProgressBar1.Name" xml:space="preserve">
+    <value>toolStripProgressBar1</value>
+  </data>
+  <data name="rbDontGenerate.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="txtAppendFilename.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnCodec.Text" xml:space="preserve">
+    <value>&gt;</value>
+  </data>
+  <data name="rbFreedbNever.Text" xml:space="preserve">
+    <value>Never</value>
+  </data>
+  <data name="btnAbout.Size" type="System.Drawing.Size, System.Drawing">
+    <value>131, 23</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbNever.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="rbGapsPrepended.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 70</value>
+  </data>
+  <data name="rbCustomFormat.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;grpAction.Name" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="rbEmbedCUE.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 17</value>
+  </data>
+  <data name="rbCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 90</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.Name" xml:space="preserve">
+    <value>grpAudioOutput</value>
   </data>
   <data name="&gt;&gt;tAKToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
-    <value>toolStripMenuItem1</value>
+  <data name="txtCustomFormat.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
   </data>
-  <data name="&gt;&gt;toolStripSeparator1.Name" xml:space="preserve">
-    <value>toolStripSeparator1</value>
+  <data name="rbDontGenerate.ToolTip" xml:space="preserve">
+    <value />
   </data>
-  <data name="&gt;&gt;toolStripSeparator1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="rbWAV.Size" type="System.Drawing.Size, System.Drawing">
+    <value>48, 17</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem3.Name" xml:space="preserve">
-    <value>toolStripMenuItem3</value>
+  <data name="&gt;&gt;rbWavPack.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="rbGapsPrepended.Text" xml:space="preserve">
+    <value>Gaps Prepended</value>
   </data>
-  <data name="&gt;&gt;mP3ToolStripMenuItem.Name" xml:space="preserve">
-    <value>mP3ToolStripMenuItem</value>
+  <data name="chkLossyWAV.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 143</value>
   </data>
-  <data name="&gt;&gt;mP3ToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="rbGapsAppended.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;oGGToolStripMenuItem.Name" xml:space="preserve">
-    <value>oGGToolStripMenuItem</value>
+  <data name="lblWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 58</value>
   </data>
-  <data name="&gt;&gt;oGGToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>5</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmCUETools</value>
+  <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
+    <value>toolStripStatusLabel1</value>
   </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="rbGapsAppended.Text" xml:space="preserve">
+    <value>Gaps &amp;Appended</value>
   </data>
+  <data name="&gt;&gt;statusStrip1.Name" xml:space="preserve">
+    <value>statusStrip1</value>
+  </data>
+  <data name="&gt;&gt;grpOutputStyle.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;grpAudioOutput.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="rbCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 17</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbIf.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnSettings.Size" type="System.Drawing.Size, System.Drawing">
+    <value>131, 23</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerify.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;grpExtra.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbSingleFile.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 36</value>
+  </data>
+  <data name="rbActionCreateCUESheet.Text" xml:space="preserve">
+    <value>Create dummy CUE</value>
+  </data>
+  <data name="rbActionCorrectFilenames.Size" type="System.Drawing.Size, System.Drawing">
+    <value>109, 17</value>
+  </data>
+  <data name="rbTTA.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbSingleFile.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="rbFLAC.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 17</value>
+  </data>
+  <data name="&gt;&gt;rbNoAudio.Name" xml:space="preserve">
+    <value>rbNoAudio</value>
+  </data>
+  <data name="btnAbout.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;rbActionEncode.Parent" xml:space="preserve">
+    <value>grpAction</value>
+  </data>
+  <data name="rbActionEncode.ToolTip" xml:space="preserve">
+    <value>Don't contact the AccurateRip database for validation</value>
+  </data>
+  <data name="rbCustomFormat.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="rbGapsAppended.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;toolStripProgressBar2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="SelectedNodeName.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="fileSystemTreeView1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 365</value>
+  </data>
+  <data name="&gt;&gt;rbFLAC.Name" xml:space="preserve">
+    <value>rbFLAC</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbNever.Parent" xml:space="preserve">
+    <value>grpFreedb</value>
+  </data>
+  <data name="&gt;&gt;rbActionEncode.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;rbActionVerify.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnStop.Text" xml:space="preserve">
+    <value>&amp;Stop</value>
+  </data>
+  <data name="&gt;&gt;rbWavPack.Parent" xml:space="preserve">
+    <value>grpAudioOutput</value>
+  </data>
+  <data name="rbActionEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>123, 17</value>
+  </data>
+  <data name="btnCodec.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="toolStripStatusLabelAR.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 8.25pt</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbIf.Parent" xml:space="preserve">
+    <value>grpFreedb</value>
+  </data>
+  <data name="chkMulti.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;rbFreedbNever.Name" xml:space="preserve">
+    <value>rbFreedbNever</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelProcessed.Name" xml:space="preserve">
+    <value>toolStripStatusLabelProcessed</value>
+  </data>
+  <data name="setAsMyMusicFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>205, 22</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabelAR.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="rbTTA.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;btnAbout.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="toolStripStatusLabelWV.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>White</value>
+  </data>
+  <data name="&gt;&gt;textBatchReport.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="toolStripStatusLabel2.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;textBatchReport.Parent" xml:space="preserve">
+    <value>grpInput</value>
+  </data>
+  <data name="&gt;&gt;rbCreateSubdirectory.Name" xml:space="preserve">
+    <value>rbCreateSubdirectory</value>
+  </data>
+  <data name="btnResume.Location" type="System.Drawing.Point, System.Drawing">
+    <value>330, 394</value>
+  </data>
+  <data name="rbFreedbIf.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="grpOutputStyle.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 159</value>
+  </data>
+  <data name="grpOutputStyle.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="&gt;&gt;rbWavPack.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="fileSystemTreeView1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="&gt;&gt;txtDataTrackLength.Name" xml:space="preserve">
+    <value>txtDataTrackLength</value>
+  </data>
+  <data name="rbWavPack.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="chkRecursive.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 17</value>
+  </data>
+  <data name="rbWAV.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 85</value>
+  </data>
+  <data name="&gt;&gt;rbCustomFormat.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnCodec.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+    <value>Popup</value>
+  </data>
+  <data name="txtOutputPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 16</value>
+  </data>
+  <data name="&gt;&gt;btnConvert.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtPreGapLength.Location" type="System.Drawing.Point, System.Drawing">
+    <value>76, 14</value>
+  </data>
+  <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>153, 8</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>54</value>
+  </metadata>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="contextMenuStripFileTree.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>424, 8</value>
+  </metadata>
+  <metadata name="contextMenuStripUDC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>250, 8</value>
+  </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 425</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/CUETools/frmCUETools.ru-RU.resx b/CUETools/frmCUETools.ru-RU.resx
index 7bc0c51..7db0971 100644
--- a/CUETools/frmCUETools.ru-RU.resx
+++ b/CUETools/frmCUETools.ru-RU.resx
@@ -117,40 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnConvert.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 346</value>
-  </data>
   <data name="btnConvert.Text" xml:space="preserve">
     <value>Поехали</value>
   </data>
-  <data name="grpCUEPaths.Text" xml:space="preserve">
-    <value>Пути к файлам</value>
-  </data>
   <data name="btnBrowseOutput.Text" xml:space="preserve">
     <value>Выбор...</value>
   </data>
-  <data name="btnBrowseInput.Text" xml:space="preserve">
-    <value>Выбор...</value>
-  </data>
-  <data name="lblOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 13</value>
-  </data>
-  <data name="lblOutput.Text" xml:space="preserve">
-    <value>Выход:</value>
-  </data>
-  <data name="lblInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>36, 13</value>
-  </data>
-  <data name="lblInput.Text" xml:space="preserve">
-    <value>&amp;Вход:</value>
-  </data>
-  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>130, 164</value>
-  </data>
   <data name="grpOutputStyle.Text" xml:space="preserve">
     <value>Стиль CUE</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="rbEmbedCUE.Size" type="System.Drawing.Size, System.Drawing">
     <value>86, 17</value>
   </data>
@@ -196,30 +172,18 @@
   <data name="rbSingleFile.ToolTip" xml:space="preserve">
     <value>Создать образ диска в виде одного аудио-файла и .cue файла</value>
   </data>
-  <data name="btnAbout.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 191</value>
-  </data>
   <data name="btnAbout.Text" xml:space="preserve">
     <value>О программе</value>
   </data>
-  <data name="grpOutputPathGeneration.Size" type="System.Drawing.Size, System.Drawing">
-    <value>392, 113</value>
-  </data>
   <data name="grpOutputPathGeneration.Text" xml:space="preserve">
     <value>Путь для выходных файлов</value>
   </data>
-  <data name="txtCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 21</value>
-  </data>
   <data name="rbCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
     <value>89, 17</value>
   </data>
   <data name="rbCustomFormat.Text" xml:space="preserve">
     <value>По шаблону:</value>
   </data>
-  <data name="txtCreateSubdirectory.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 21</value>
-  </data>
   <data name="rbDontGenerate.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 17</value>
   </data>
@@ -238,9 +202,6 @@
   <data name="rbAppendFilename.Text" xml:space="preserve">
     <value>Суффикс к имени:</value>
   </data>
-  <data name="txtAppendFilename.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 21</value>
-  </data>
   <data name="grpAudioOutput.Text" xml:space="preserve">
     <value>Формат аудио</value>
   </data>
@@ -250,41 +211,74 @@
   <data name="rbNoAudio.Text" xml:space="preserve">
     <value>Без аудио</value>
   </data>
-  <data name="btnBatch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 315</value>
-  </data>
-  <data name="btnBatch.Text" xml:space="preserve">
-    <value>Обработать папку...</value>
-  </data>
-  <data name="btnFilenameCorrector.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 284</value>
-  </data>
-  <data name="btnFilenameCorrector.Text" xml:space="preserve">
-    <value>Исправить имена...</value>
-  </data>
-  <data name="btnSettings.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 222</value>
-  </data>
   <data name="btnSettings.Text" xml:space="preserve">
     <value>Настройки...</value>
   </data>
-  <data name="grpAccurateRip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>250, 211</value>
+  <data name="rbActionCorrectFilenames.Size" type="System.Drawing.Size, System.Drawing">
+    <value>153, 17</value>
   </data>
-  <data name="grpAccurateRip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 164</value>
+  <data name="rbActionCorrectFilenames.Text" xml:space="preserve">
+    <value>Исправить имена файлов</value>
   </data>
-  <data name="rbArPlusCRC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>115, 17</value>
+  <data name="chkRecursive.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 17</value>
   </data>
-  <data name="rbArPlusCRC.Text" xml:space="preserve">
-    <value>Проверить + CRC</value>
+  <data name="chkRecursive.Text" xml:space="preserve">
+    <value>В папке</value>
   </data>
-  <data name="rbArAndEncode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 17</value>
+  <data name="rbActionCreateCUESheet.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 17</value>
   </data>
-  <data name="rbArAndEncode.Text" xml:space="preserve">
-    <value>Записать и проверить</value>
+  <data name="rbActionCreateCUESheet.Text" xml:space="preserve">
+    <value>Создать .cue</value>
+  </data>
+  <data name="chkMulti.Location" type="System.Drawing.Point, System.Drawing">
+    <value>81, 148</value>
+  </data>
+  <data name="chkMulti.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 17</value>
+  </data>
+  <data name="chkMulti.Text" xml:space="preserve">
+    <value>Несколько</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Size" type="System.Drawing.Size, System.Drawing">
+    <value>109, 17</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Text" xml:space="preserve">
+    <value>Проверка + CRC</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>154, 17</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Text" xml:space="preserve">
+    <value>Конвертация + проверка</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 17</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Text" xml:space="preserve">
+    <value>Проверка, конвертация</value>
+  </data>
+  <data name="rbActionVerify.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 17</value>
+  </data>
+  <data name="rbActionVerify.Text" xml:space="preserve">
+    <value>Только проверка</value>
+  </data>
+  <data name="rbActionEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 17</value>
+  </data>
+  <data name="rbActionEncode.Text" xml:space="preserve">
+    <value>Конвертация</value>
+  </data>
+  <data name="grpAction.Text" xml:space="preserve">
+    <value>Действие</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>41, 13</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Pregap</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 13</value>
@@ -295,57 +289,68 @@
   <data name="txtDataTrackLength.ToolTip" xml:space="preserve">
     <value>Не используется для обычных музыкальных дисков. "Улучшенные" компакт диски с треком данных не найдутся в базе данных, если не указать длину трека данных. Её часто можно найти в логе EAC. Если лог EAC лежит в той же папке что и .cue, и имеет такое же имя как .cue файл, то он будет проанализирован автоматически и тут опять же ничего не надо будет вводить.</value>
   </data>
-  <data name="rbArApplyOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 17</value>
-  </data>
-  <data name="rbArApplyOffset.Text" xml:space="preserve">
-    <value>Проверить и записать</value>
-  </data>
-  <data name="rbArApplyOffset.ToolTip" xml:space="preserve">
-    <value>На первом проходе проверить точность рипа по базе AccurateRip с учетом возможных смещений.  На втором проходе, сконвертировать, возможно с применением коррекции смещения (в зависимости от настроек)</value>
-  </data>
-  <data name="rbArVerify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 17</value>
-  </data>
-  <data name="rbArVerify.Text" xml:space="preserve">
-    <value>Только проверить</value>
-  </data>
-  <data name="rbArVerify.ToolTip" xml:space="preserve">
-    <value>Проверить точность рипа по базе AccurateRip с учетом возможных смещений</value>
-  </data>
-  <data name="rbArNone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 17</value>
-  </data>
-  <data name="rbArNone.Text" xml:space="preserve">
-    <value>Не проверять</value>
-  </data>
-  <data name="rbArNone.ToolTip" xml:space="preserve">
-    <value>Сконвертировать, не обращаясь к базе данных AccurateRip</value>
-  </data>
-  <data name="btnCUECreator.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 253</value>
-  </data>
-  <data name="btnCUECreator.Text" xml:space="preserve">
-    <value>Создать CUE...</value>
-  </data>
-  <data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 346</value>
+  <data name="toolStripStatusLabelAR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
   </data>
   <data name="btnStop.Text" xml:space="preserve">
     <value>Стоп</value>
   </data>
-  <data name="btnPause.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 346</value>
-  </data>
   <data name="btnPause.Text" xml:space="preserve">
     <value>Пауза</value>
   </data>
-  <data name="btnResume.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 346</value>
-  </data>
   <data name="btnResume.Text" xml:space="preserve">
     <value>&amp;Поехали</value>
   </data>
+  <data name="rbFreedbAlways.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 17</value>
+  </data>
+  <data name="rbFreedbAlways.Text" xml:space="preserve">
+    <value>Всегда</value>
+  </data>
+  <data name="rbFreedbIf.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 17</value>
+  </data>
+  <data name="rbFreedbIf.Text" xml:space="preserve">
+    <value>Если надо</value>
+  </data>
+  <data name="rbFreedbNever.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 17</value>
+  </data>
+  <data name="rbFreedbNever.Text" xml:space="preserve">
+    <value>Никогда</value>
+  </data>
+  <data name="grpFreedb.Text" xml:space="preserve">
+    <value>Поиск в Freedb</value>
+  </data>
+  <data name="grpInput.Text" xml:space="preserve">
+    <value>Исходный файл</value>
+  </data>
+  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 13</value>
+  </data>
+  <data name="lblWriteOffset.Text" xml:space="preserve">
+    <value>Смещение</value>
+  </data>
+  <data name="grpExtra.Text" xml:space="preserve">
+    <value>Дополнительно</value>
+  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAEBAAAAAACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAB
diff --git a/CUETools/frmChoice.Designer.cs b/CUETools/frmChoice.Designer.cs
index 9ad57f3..4651d73 100644
--- a/CUETools/frmChoice.Designer.cs
+++ b/CUETools/frmChoice.Designer.cs
@@ -41,31 +41,24 @@ namespace JDP
 			this.Start = new System.Windows.Forms.ColumnHeader();
 			this.Length = new System.Windows.Forms.ColumnHeader();
 			this.btnEdit = new System.Windows.Forms.Button();
+			this.chkFixEncoding = new System.Windows.Forms.CheckBox();
 			this.SuspendLayout();
 			// 
 			// button1
 			// 
-			this.button1.AccessibleDescription = null;
-			this.button1.AccessibleName = null;
-			resources.ApplyResources(this.button1, "button1");
-			this.button1.BackgroundImage = null;
 			this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button1.Font = null;
+			resources.ApplyResources(this.button1, "button1");
 			this.button1.Name = "button1";
 			this.button1.UseVisualStyleBackColor = true;
 			// 
 			// listChoices
 			// 
-			this.listChoices.AccessibleDescription = null;
-			this.listChoices.AccessibleName = null;
-			resources.ApplyResources(this.listChoices, "listChoices");
-			this.listChoices.BackgroundImage = null;
 			this.listChoices.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.columnHeader1});
-			this.listChoices.Font = null;
 			this.listChoices.FullRowSelect = true;
 			this.listChoices.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
 			this.listChoices.HideSelection = false;
+			resources.ApplyResources(this.listChoices, "listChoices");
 			this.listChoices.MultiSelect = false;
 			this.listChoices.Name = "listChoices";
 			this.listChoices.ShowItemToolTips = true;
@@ -89,26 +82,19 @@ namespace JDP
 			// 
 			// textBox1
 			// 
-			this.textBox1.AccessibleDescription = null;
-			this.textBox1.AccessibleName = null;
-			resources.ApplyResources(this.textBox1, "textBox1");
-			this.textBox1.BackgroundImage = null;
 			this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			resources.ApplyResources(this.textBox1, "textBox1");
 			this.textBox1.Name = "textBox1";
 			this.textBox1.ReadOnly = true;
 			// 
 			// listTracks
 			// 
-			this.listTracks.AccessibleDescription = null;
-			this.listTracks.AccessibleName = null;
 			resources.ApplyResources(this.listTracks, "listTracks");
-			this.listTracks.BackgroundImage = null;
 			this.listTracks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.Title,
             this.TrackNo,
             this.Start,
             this.Length});
-			this.listTracks.Font = null;
 			this.listTracks.FullRowSelect = true;
 			this.listTracks.GridLines = true;
 			this.listTracks.LabelEdit = true;
@@ -139,31 +125,30 @@ namespace JDP
 			// 
 			// btnEdit
 			// 
-			this.btnEdit.AccessibleDescription = null;
-			this.btnEdit.AccessibleName = null;
 			resources.ApplyResources(this.btnEdit, "btnEdit");
-			this.btnEdit.BackgroundImage = null;
-			this.btnEdit.Font = null;
 			this.btnEdit.Name = "btnEdit";
 			this.btnEdit.UseVisualStyleBackColor = true;
 			this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
 			// 
+			// chkFixEncoding
+			// 
+			resources.ApplyResources(this.chkFixEncoding, "chkFixEncoding");
+			this.chkFixEncoding.Name = "chkFixEncoding";
+			this.chkFixEncoding.UseVisualStyleBackColor = true;
+			this.chkFixEncoding.CheckedChanged += new System.EventHandler(this.chkFixEncoding_CheckedChanged);
+			// 
 			// frmChoice
 			// 
 			this.AcceptButton = this.button1;
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
+			this.Controls.Add(this.chkFixEncoding);
 			this.Controls.Add(this.btnEdit);
 			this.Controls.Add(this.listTracks);
 			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.listChoices);
 			this.Controls.Add(this.button1);
-			this.Font = null;
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.Name = "frmChoice";
 			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
@@ -187,5 +172,6 @@ namespace JDP
 		private System.Windows.Forms.ColumnHeader Length;
 		private System.Windows.Forms.Button btnEdit;
 		private System.Windows.Forms.ColumnHeader Start;
+		private System.Windows.Forms.CheckBox chkFixEncoding;
 	}
 }
\ No newline at end of file
diff --git a/CUETools/frmChoice.cs b/CUETools/frmChoice.cs
index 6b08efc..52c4e9c 100644
--- a/CUETools/frmChoice.cs
+++ b/CUETools/frmChoice.cs
@@ -26,50 +26,47 @@ namespace JDP
 			button1.Select();
 		}
 
+		private ListViewItem ToItem(object i)
+		{
+			string text = "";
+			int image = -1;
+			if (i is string)
+				text = i as string;
+			else if (i is CUEToolsSourceFile)
+			{
+				text = (i as CUEToolsSourceFile).path;
+				image = 0;
+			}
+			else if (i is MusicBrainz.Release)
+			{
+				ReleaseInfo r = new ReleaseInfo(CUE, i as MusicBrainz.Release);
+				text = r.Text;
+				image = 2;
+				i = r;
+			}
+			else if (i is Freedb.CDEntry)
+			{
+				ReleaseInfo r = new ReleaseInfo(CUE, i as Freedb.CDEntry);
+				text = r.Text;
+				image = 1;
+				i = r;
+			}
+			ListViewItem item = new ListViewItem(text, image);
+			item.Tag = i;
+			return item;
+		}
+
 		public IEnumerable<object> Choices
 		{
 			set
 			{
-				bool isCD = false;
 				foreach(object i in value)
 				{
-					string text = "";
-					int image = -1;
-					if (i is string)
-						text = i as string;
-					else if (i is CUEToolsSourceFile)
-					{
-						text = (i as CUEToolsSourceFile).path;
-						image = 0;
-					}
-					else if (i is MusicBrainz.Release)
-					{
-						MusicBrainz.Release release = i as MusicBrainz.Release;
-						text = String.Format("{0}: {1} - {2}",
-							release.GetEvents().Count > 0 ? release.GetEvents()[0].Date.Substring(0, 4) : "YYYY",
-							release.GetArtist(),
-							release.GetTitle());
-						image = 2;
-						isCD = true;
-					}
-					else if (i is Freedb.CDEntry)
-					{
-						CDEntry cdEntry = i as CDEntry;
-						text = String.Format("{0}: {1} - {2}",
-							cdEntry.Year,
-							cdEntry.Artist,
-							cdEntry.Title);
-						image = 1;
-						isCD = true;
-					}
-					ListViewItem item = new ListViewItem(text, image);
-					item.Tag = i;
+					ListViewItem item = ToItem(i);
 					listChoices.Items.Add(item);
 				}
-				if (isCD)
+				if (CUE != null)
 				{
-					if (CUE == null)
-						throw new Exception("selecting release information, but cue sheet has not been set");
 					string text = String.Format("{0}: {1} - {2}",
 						CUE.Year == "" ? "YYYY" : CUE.Year,
 						CUE.Artist == "" ? "Unknown Artist" : CUE.Artist,
@@ -105,12 +102,9 @@ namespace JDP
 		private void frmChoice_FormClosing(object sender, FormClosingEventArgs e)
 		{
 			object item = ChosenObject;
-			if (e.CloseReason != CloseReason.None || DialogResult != DialogResult.OK || item == null)
+			if (e.CloseReason != CloseReason.None || DialogResult != DialogResult.OK || item == null || !(item is ReleaseInfo))
 				return;
-			if (item is MusicBrainz.Release)
-				CUE.FillFromMusicBrainz((MusicBrainz.Release)item);
-			else if (item is CDEntry)
-				CUE.FillFromFreedb((CDEntry)item);
+			(item as ReleaseInfo).FillCUE();
 		}
 
 		private void AutoResizeTracks()
@@ -128,39 +122,37 @@ namespace JDP
 			object item = ChosenObject;
 			if (item != null && item is CUEToolsSourceFile)
 			{
-				textBox1.Text = (item as CUEToolsSourceFile).contents.Replace("\r\n", "\r").Replace("\r", "\r\n");
+				textBox1.Text = (item as CUEToolsSourceFile).contents.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", "\r\n");
+				chkFixEncoding.Visible = false;
 			}
-			else if (item != null && item is MusicBrainz.Release)
+			else if (item != null && item is ReleaseInfo)
 			{
-				MusicBrainz.Release release = item as MusicBrainz.Release;
+				ReleaseInfo r = (item as ReleaseInfo);
 				listTracks.Items.Clear();
-				foreach (MusicBrainz.Track track in release.GetTracks())
-				{
-					listTracks.Items.Add(new ListViewItem(new string[] { 
-						track.GetTitle(), 
-						(listTracks.Items.Count + 1).ToString(),
-						CUE == null ? "" : CUE.TOC[listTracks.Items.Count + 1].StartMSF,
-						CUE == null ? "" : CUE.TOC[listTracks.Items.Count + 1].LengthMSF
-					}));
-				}
-				AutoResizeTracks();
-			}
-			else if (item != null && item is CDEntry)
-			{
-				CDEntry cdEntry = item as CDEntry;
-				
-				listTracks.Items.Clear();
-				for (int i = 0; i < cdEntry.Tracks.Count; i++)
-				{
-					listTracks.Items.Add(new ListViewItem(new string[] { 
-						cdEntry.Tracks[i].Title, 						
+				if (r.musicbrainz != null)
+					foreach (MusicBrainz.Track track in r.musicbrainz.GetTracks())
+					{
+						listTracks.Items.Add(new ListViewItem(new string[] { 
+							track.GetTitle(), 
+							(listTracks.Items.Count + 1).ToString(),
+							CUE == null ? "" : CUE.TOC[listTracks.Items.Count + CUE.TOC.FirstAudio].StartMSF,
+							CUE == null ? "" : CUE.TOC[listTracks.Items.Count + CUE.TOC.FirstAudio].LengthMSF
+						}));
+					}
+				if (r.freedb != null)
+					for (int i = 0; i < r.freedb.Tracks.Count; i++)
+					{
+						listTracks.Items.Add(new ListViewItem(new string[] { 
+						r.freedb.Tracks[i].Title,
 						(i + 1).ToString(),
-						CDImageLayout.TimeToString((uint)cdEntry.Tracks[i].FrameOffset - 150),
-						CDImageLayout.TimeToString((i + 1 < cdEntry.Tracks.Count) ? (uint) (cdEntry.Tracks[i + 1].FrameOffset - cdEntry.Tracks[i].FrameOffset) :
-							(CUE == null || i >= CUE.TOC.TrackCount) ? 0 : CUE.TOC[i + 1].Length)
+						CDImageLayout.TimeToString((uint)r.freedb.Tracks[i].FrameOffset - 150),
+						CDImageLayout.TimeToString((i + 1 < r.freedb.Tracks.Count) ? (uint) (r.freedb.Tracks[i + 1].FrameOffset - r.freedb.Tracks[i].FrameOffset) :
+							(CUE == null || i >= CUE.TOC.TrackCount) ? 0 : CUE.TOC[i + CUE.TOC.FirstAudio].Length)
 					}));
-				}
+					}
 				AutoResizeTracks();
+				chkFixEncoding.Visible = r.freedb != null;
+				chkFixEncoding.Checked = r.freedb_latin1 != null;
 			}
 			else if (item != null && item is CUESheet)
 			{
@@ -176,10 +168,12 @@ namespace JDP
 					}));
 				}
 				AutoResizeTracks();
+				chkFixEncoding.Visible = false;
 			}
 			else
 			{
 				listTracks.Items.Clear();
+				chkFixEncoding.Visible = false;
 				textBox1.Text = "";
 			}
 		}
@@ -189,10 +183,8 @@ namespace JDP
 			object item = ChosenObject;
 			if (item == null || CUE == null)
 				return;
-			if (item is MusicBrainz.Release)
-				CUE.FillFromMusicBrainz((MusicBrainz.Release)item);
-			else if (item is CDEntry)
-				CUE.FillFromFreedb((CDEntry)item);
+			if (item is ReleaseInfo)
+				(item as ReleaseInfo).FillCUE();
 			else if (!(item is CUESheet))
 				return;
 			listChoices.Items[0].Selected = true;
@@ -251,5 +243,97 @@ namespace JDP
 			    }
 			}
 		}
+
+		private void chkFixEncoding_CheckedChanged(object sender, EventArgs e)
+		{
+			if (listChoices.SelectedItems.Count > 0)
+			{
+				ListViewItem item = listChoices.Items[listChoices.SelectedItems[0].Index];
+				if (item.Tag is ReleaseInfo)
+				{
+					ReleaseInfo r = item.Tag as ReleaseInfo;
+					if ((r.freedb_latin1 == null) == chkFixEncoding.Checked)
+					{
+						r.FixEncoding();
+						item.Text = r.Text;
+						for (int i = 0; i < r.freedb.Tracks.Count; i++)
+							listTracks.Items[i].Text = r.freedb.Tracks[i].Title;
+					}
+				}
+			}
+		}
+	}
+
+	sealed class ReleaseInfo
+	{
+		public Freedb.CDEntry freedb_latin1;
+		public Freedb.CDEntry freedb;
+		public MusicBrainz.Release musicbrainz;
+		public CUESheet CUE;
+		private Encoding iso;
+
+		public ReleaseInfo(CUESheet cue, Freedb.CDEntry release)
+		{
+			CUE = cue;
+			iso = Encoding.GetEncoding("iso-8859-1");
+			freedb_latin1 = null;
+			freedb = release;
+		}
+
+		public ReleaseInfo(CUESheet cue, MusicBrainz.Release release)
+		{
+			CUE = cue;
+			iso = Encoding.GetEncoding("iso-8859-1");
+			musicbrainz = release;
+		}
+
+		private string FixEncoding(string src)
+		{
+			return Encoding.Default.GetString(iso.GetBytes(src));
+		}
+
+		public string Text
+		{
+			get
+			{
+				if (musicbrainz != null)
+					return string.Format("{0}: {1} - {2}",
+						musicbrainz.GetEvents().Count > 0 ? musicbrainz.GetEvents()[0].Date.Substring(0, 4) : "YYYY",
+						musicbrainz.GetArtist(),
+						musicbrainz.GetTitle());
+				if (freedb != null)
+					return string.Format("{0}: {1} - {2}",
+						freedb.Year,
+						freedb.Artist,
+						freedb.Title);
+				return null;
+			}
+		}
+
+		public void FixEncoding()
+		{
+			if (freedb == null)
+				return;
+			if (freedb_latin1 != null)
+			{
+				freedb = freedb_latin1;
+				freedb_latin1 = null;
+				return;
+			}
+			freedb_latin1 = freedb;
+			freedb = new Freedb.CDEntry(freedb_latin1);
+			freedb.Artist = FixEncoding(freedb.Artist);
+			freedb.Title = FixEncoding(freedb.Title);
+			foreach (Freedb.Track tr in freedb.Tracks)
+				tr.Title = FixEncoding(tr.Title);
+		}
+
+		public void FillCUE()
+		{
+			if (musicbrainz != null)
+				CUE.FillFromMusicBrainz(musicbrainz);
+			else if (freedb != null)
+				CUE.FillFromFreedb(freedb);
+		}
 	}
 }
\ No newline at end of file
diff --git a/CUETools/frmChoice.resx b/CUETools/frmChoice.resx
index ebd73c6..34e2385 100644
--- a/CUETools/frmChoice.resx
+++ b/CUETools/frmChoice.resx
@@ -117,28 +117,50 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>488, 293</value>
+  </data>
+  <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="listChoices.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+  <data name="button1.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
   </data>
-  <data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="listTracks.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="button1.Text" xml:space="preserve">
+    <value>Ok</value>
   </data>
   <data name="&gt;&gt;button1.Name" xml:space="preserve">
     <value>button1</value>
   </data>
+  <data name="&gt;&gt;button1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;button1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="columnHeader1.Width" type="System.Int32, mscorlib">
+    <value>520</value>
+  </data>
+  <data name="listChoices.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 12</value>
+  </data>
+  <data name="listChoices.Size" type="System.Drawing.Size, System.Drawing">
+    <value>551, 72</value>
+  </data>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
-        CwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEEAQABEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAo
+        CwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -185,142 +207,81 @@
         AesB7wMAAf8CBAHsDP8HrgERAQABDwHrAbwB/wEAAq4DAAHvAesB7wTzAe8B6wHvBwAB7wbrAe8EABD/
         AQAJrgEPAQABEwERAa4GAAbrBQABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/4EA
         AfgBHwIAAYABAQH4AR8B4AEHBAAB4AEHAcABAwQAAcABAwGAAQEEAAGAAQEGAAGAAQE2AAGAAQEBgAEB
-        BAABgAEBAcABAwQAAcABAwHgAQcEAAHgAQcB8AEPAgABgAEBAfgBHxYACw==
+        BAABgAEBAcABAwQAAcABAwHgAQcEAAHgAQcB8AEPAgABgAEBAfgBHws=
 </value>
   </data>
-  <data name="columnHeader1.Width" type="System.Int32, mscorlib">
-    <value>540</value>
+  <data name="listChoices.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
   </data>
-  <data name="TrackNo.DisplayIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="&gt;&gt;listChoices.Name" xml:space="preserve">
+    <value>listChoices</value>
   </data>
-  <data name="&gt;&gt;listTracks.Type" xml:space="preserve">
+  <data name="&gt;&gt;listChoices.Type" xml:space="preserve">
     <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;imageList1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;listChoices.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="&gt;&gt;listChoices.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
-  <data name="TrackNo.Text" xml:space="preserve">
-    <value>#</value>
+  <data name="textBox1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Courier New, 8pt</value>
   </data>
-  <data name="&gt;&gt;columnHeader1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 90</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>488, 293</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>575, 328</value>
-  </data>
-  <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;Length.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="textBox1.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="textBox1.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
     <value>Vertical</value>
   </data>
-  <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>551, 197</value>
   </data>
+  <data name="textBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
   <data name="&gt;&gt;textBox1.Name" xml:space="preserve">
     <value>textBox1</value>
   </data>
-  <data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="listChoices.Size" type="System.Drawing.Size, System.Drawing">
-    <value>551, 72</value>
-  </data>
-  <data name="&gt;&gt;listChoices.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="Start.Text" xml:space="preserve">
-    <value>Start</value>
-  </data>
-  <data name="&gt;&gt;Start.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;listChoices.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;listTracks.Name" xml:space="preserve">
-    <value>listTracks</value>
-  </data>
-  <data name="textBox1.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Start.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
-    <value>Right</value>
-  </data>
   <data name="&gt;&gt;textBox1.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;button1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="&gt;&gt;listChoices.Name" xml:space="preserve">
-    <value>listChoices</value>
+  <data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>CenterParent</value>
+  <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
   <data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 90</value>
   </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.Name" xml:space="preserve">
-    <value>btnEdit</value>
-  </data>
-  <data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
     <value>551, 197</value>
   </data>
-  <data name="&gt;&gt;TrackNo.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
+    <value>26</value>
   </data>
-  <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>407, 293</value>
-  </data>
-  <data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="btnEdit.Text" xml:space="preserve">
-    <value>Edit</value>
-  </data>
-  <data name="&gt;&gt;Title.Name" xml:space="preserve">
-    <value>Title</value>
-  </data>
-  <data name="btnEdit.Visible" type="System.Boolean, mscorlib">
+  <data name="listTracks.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="&gt;&gt;btnEdit.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;listTracks.Name" xml:space="preserve">
+    <value>listTracks</value>
   </data>
-  <data name="button1.Text" xml:space="preserve">
-    <value>Ok</value>
+  <data name="&gt;&gt;listTracks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
   <data name="Title.DisplayIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -328,73 +289,139 @@
   <data name="Title.Text" xml:space="preserve">
     <value>Title</value>
   </data>
-  <data name="textBox1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Courier New, 8pt</value>
-  </data>
-  <data name="&gt;&gt;Title.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Select the best match</value>
-  </data>
   <data name="Title.Width" type="System.Int32, mscorlib">
     <value>360</value>
   </data>
-  <data name="&gt;&gt;listChoices.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="TrackNo.DisplayIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
-  <data name="&gt;&gt;TrackNo.Name" xml:space="preserve">
-    <value>TrackNo</value>
-  </data>
-  <data name="&gt;&gt;columnHeader1.Name" xml:space="preserve">
-    <value>columnHeader1</value>
-  </data>
-  <data name="button1.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="&gt;&gt;button1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 90</value>
-  </data>
-  <data name="listChoices.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 12</value>
-  </data>
-  <data name="&gt;&gt;imageList1.Name" xml:space="preserve">
-    <value>imageList1</value>
+  <data name="TrackNo.Text" xml:space="preserve">
+    <value>#</value>
   </data>
   <data name="TrackNo.Width" type="System.Int32, mscorlib">
     <value>30</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmChoice</value>
-  </data>
-  <data name="Length.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="&gt;&gt;Start.Name" xml:space="preserve">
+  <data name="Start.Text" xml:space="preserve">
     <value>Start</value>
   </data>
-  <data name="textBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="&gt;&gt;Length.Name" xml:space="preserve">
-    <value>Length</value>
-  </data>
-  <data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
-    <value>27</value>
+  <data name="Start.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Right</value>
   </data>
   <data name="Length.Text" xml:space="preserve">
     <value>Length</value>
   </data>
+  <data name="Length.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Right</value>
+  </data>
+  <data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>407, 293</value>
+  </data>
+  <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
+    <value>27</value>
+  </data>
+  <data name="btnEdit.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="btnEdit.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Name" xml:space="preserve">
+    <value>btnEdit</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="chkFixEncoding.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkFixEncoding.Location" type="System.Drawing.Point, System.Drawing">
+    <value>315, 297</value>
+  </data>
+  <data name="chkFixEncoding.Size" type="System.Drawing.Size, System.Drawing">
+    <value>86, 17</value>
+  </data>
+  <data name="chkFixEncoding.TabIndex" type="System.Int32, mscorlib">
+    <value>28</value>
+  </data>
+  <data name="chkFixEncoding.Text" xml:space="preserve">
+    <value>Fix encoding</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.Name" xml:space="preserve">
+    <value>chkFixEncoding</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>575, 328</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterParent</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Select the best match</value>
+  </data>
+  <data name="&gt;&gt;columnHeader1.Name" xml:space="preserve">
+    <value>columnHeader1</value>
+  </data>
+  <data name="&gt;&gt;columnHeader1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;imageList1.Name" xml:space="preserve">
+    <value>imageList1</value>
+  </data>
+  <data name="&gt;&gt;imageList1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Title.Name" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="&gt;&gt;Title.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TrackNo.Name" xml:space="preserve">
+    <value>TrackNo</value>
+  </data>
+  <data name="&gt;&gt;TrackNo.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Start.Name" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="&gt;&gt;Start.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Length.Name" xml:space="preserve">
+    <value>Length</value>
+  </data>
+  <data name="&gt;&gt;Length.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmChoice</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CUETools/frmFilenameCorrector.Designer.cs b/CUETools/frmFilenameCorrector.Designer.cs
index 983db3f..e52e273 100644
--- a/CUETools/frmFilenameCorrector.Designer.cs
+++ b/CUETools/frmFilenameCorrector.Designer.cs
@@ -29,23 +29,16 @@ namespace JDP {
 			// 
 			// lblDescription
 			// 
-			this.lblDescription.AccessibleDescription = null;
-			this.lblDescription.AccessibleName = null;
 			resources.ApplyResources(this.lblDescription, "lblDescription");
-			this.lblDescription.Font = null;
 			this.lblDescription.Name = "lblDescription";
 			// 
 			// frmFilenameCorrector
 			// 
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			this.AllowDrop = true;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
 			this.Controls.Add(this.lblDescription);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.Name = "frmFilenameCorrector";
 			this.TopMost = true;
diff --git a/CUETools/frmFilenameCorrector.resx b/CUETools/frmFilenameCorrector.resx
index c5934c9..5cd3924 100644
--- a/CUETools/frmFilenameCorrector.resx
+++ b/CUETools/frmFilenameCorrector.resx
@@ -117,13 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>Manual</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>286, 159</value>
+  <data name="lblDescription.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 8</value>
   </data>
   <data name="lblDescription.Size" type="System.Drawing.Size, System.Drawing">
     <value>272, 144</value>
@@ -132,43 +128,47 @@
   <data name="lblDescription.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="&gt;&gt;lblDescription.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmFilenameCorrector</value>
+  <data name="lblDescription.Text" xml:space="preserve">
+    <value>Drop CUE sheets here to correct the audio filenames contained inside. The audio files must be located in the same folder as the CUE sheet. The number of audio files in that folder must match the number of files referenced by the CUE sheet. The audio files must be named such that when sorted they are in order by track number.  To correct multiple CUE sheets at once, you can drop the search results for *.cue.</value>
   </data>
   <data name="lblDescription.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
   </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Filename Corrector</value>
-  </data>
   <data name="&gt;&gt;lblDescription.Name" xml:space="preserve">
     <value>lblDescription</value>
   </data>
-  <data name="lblDescription.Text" xml:space="preserve">
-    <value>Drop CUE sheets here to correct the audio filenames contained inside. The audio files must be located in the same folder as the CUE sheet. The number of audio files in that folder must match the number of files referenced by the CUE sheet. The audio files must be named such that when sorted they are in order by track number.  To correct multiple CUE sheets at once, you can drop the search results for *.cue.</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="lblDescription.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
   <data name="&gt;&gt;lblDescription.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;lblDescription.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
   <data name="&gt;&gt;lblDescription.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>286, 159</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>Manual</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Filename Corrector</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmFilenameCorrector</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CUETools/frmReport.Designer.cs b/CUETools/frmReport.Designer.cs
index 8d7c838..e34dc9a 100644
--- a/CUETools/frmReport.Designer.cs
+++ b/CUETools/frmReport.Designer.cs
@@ -35,36 +35,26 @@ namespace JDP
 			// 
 			// btnClose
 			// 
-			this.btnClose.AccessibleDescription = null;
-			this.btnClose.AccessibleName = null;
 			resources.ApplyResources(this.btnClose, "btnClose");
-			this.btnClose.BackgroundImage = null;
 			this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnClose.Font = null;
 			this.btnClose.Name = "btnClose";
 			this.btnClose.UseVisualStyleBackColor = true;
 			// 
 			// txtReport
 			// 
-			this.txtReport.AccessibleDescription = null;
-			this.txtReport.AccessibleName = null;
 			resources.ApplyResources(this.txtReport, "txtReport");
 			this.txtReport.BackColor = System.Drawing.SystemColors.Control;
-			this.txtReport.BackgroundImage = null;
+			this.txtReport.BorderStyle = System.Windows.Forms.BorderStyle.None;
 			this.txtReport.Name = "txtReport";
 			this.txtReport.ReadOnly = true;
 			// 
 			// frmReport
 			// 
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
 			this.CancelButton = this.btnClose;
 			this.Controls.Add(this.txtReport);
 			this.Controls.Add(this.btnClose);
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "frmReport";
diff --git a/CUETools/frmReport.resx b/CUETools/frmReport.resx
index dff638b..9885e65 100644
--- a/CUETools/frmReport.resx
+++ b/CUETools/frmReport.resx
@@ -118,90 +118,96 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>Manual</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtReport.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtReport.Name" xml:space="preserve">
-    <value>txtReport</value>
+  <data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>556, 376</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmReport</value>
-  </data>
-  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>400, 300</value>
-  </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="txtReport.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
-    <value>Vertical</value>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>478, 354</value>
   </data>
   <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 23</value>
   </data>
-  <data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Status Report</value>
-  </data>
-  <data name="txtReport.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Courier New, 8.25pt</value>
-  </data>
-  <data name="&gt;&gt;txtReport.ZOrder" xml:space="preserve">
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>Close</value>
   </data>
-  <data name="txtReport.Size" type="System.Drawing.Size, System.Drawing">
-    <value>540, 327</value>
-  </data>
-  <data name="&gt;&gt;txtReport.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
     <value>btnClose</value>
   </data>
-  <data name="txtReport.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;txtReport.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="txtReport.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
   <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>243, 345</value>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtReport.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtReport.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Courier New, 8.25pt</value>
+  </data>
+  <data name="txtReport.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 8</value>
+  </data>
+  <data name="txtReport.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtReport.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Both</value>
+  </data>
+  <data name="txtReport.Size" type="System.Drawing.Size, System.Drawing">
+    <value>536, 340</value>
+  </data>
+  <data name="txtReport.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="txtReport.WordWrap" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;txtReport.Name" xml:space="preserve">
+    <value>txtReport</value>
+  </data>
+  <data name="&gt;&gt;txtReport.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtReport.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtReport.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>556, 389</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>400, 300</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterParent</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Status Report</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmReport</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CUETools/frmSettings.Designer.cs b/CUETools/frmSettings.Designer.cs
index 5e591a6..4c80b89 100644
--- a/CUETools/frmSettings.Designer.cs
+++ b/CUETools/frmSettings.Designer.cs
@@ -27,6 +27,7 @@ namespace JDP {
 			System.Windows.Forms.Button btnCancel;
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSettings));
 			this.grpGeneral = new System.Windows.Forms.GroupBox();
+			this.chkSingleInstance = new System.Windows.Forms.CheckBox();
 			this.chkOverwriteTags = new System.Windows.Forms.CheckBox();
 			this.chkExtractLog = new System.Windows.Forms.CheckBox();
 			this.chkReducePriority = new System.Windows.Forms.CheckBox();
@@ -35,10 +36,8 @@ namespace JDP {
 			this.chkCreateM3U = new System.Windows.Forms.CheckBox();
 			this.chkFillUpCUE = new System.Windows.Forms.CheckBox();
 			this.chkEmbedLog = new System.Windows.Forms.CheckBox();
-			this.numericWriteOffset = new System.Windows.Forms.NumericUpDown();
 			this.chkAutoCorrectFilenames = new System.Windows.Forms.CheckBox();
 			this.chkPreserveHTOA = new System.Windows.Forms.CheckBox();
-			this.lblWriteOffset = new System.Windows.Forms.Label();
 			this.numericFLACCompressionLevel = new System.Windows.Forms.NumericUpDown();
 			this.lblFLACCompressionLevel = new System.Windows.Forms.Label();
 			this.chkFLACVerify = new System.Windows.Forms.CheckBox();
@@ -111,12 +110,12 @@ namespace JDP {
 			this.label4 = new System.Windows.Forms.Label();
 			this.label3 = new System.Windows.Forms.Label();
 			this.label2 = new System.Windows.Forms.Label();
+			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
 			this.tabPage4 = new System.Windows.Forms.TabPage();
 			this.grpHDCD = new System.Windows.Forms.GroupBox();
 			this.chkHDCDDetect = new System.Windows.Forms.CheckBox();
 			btnCancel = new System.Windows.Forms.Button();
 			this.grpGeneral.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericFLACCompressionLevel)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).BeginInit();
 			this.groupBox1.SuspendLayout();
@@ -159,6 +158,7 @@ namespace JDP {
 			this.grpGeneral.AccessibleName = null;
 			resources.ApplyResources(this.grpGeneral, "grpGeneral");
 			this.grpGeneral.BackgroundImage = null;
+			this.grpGeneral.Controls.Add(this.chkSingleInstance);
 			this.grpGeneral.Controls.Add(this.chkOverwriteTags);
 			this.grpGeneral.Controls.Add(this.chkExtractLog);
 			this.grpGeneral.Controls.Add(this.chkReducePriority);
@@ -167,15 +167,24 @@ namespace JDP {
 			this.grpGeneral.Controls.Add(this.chkCreateM3U);
 			this.grpGeneral.Controls.Add(this.chkFillUpCUE);
 			this.grpGeneral.Controls.Add(this.chkEmbedLog);
-			this.grpGeneral.Controls.Add(this.numericWriteOffset);
 			this.grpGeneral.Controls.Add(this.chkAutoCorrectFilenames);
 			this.grpGeneral.Controls.Add(this.chkPreserveHTOA);
-			this.grpGeneral.Controls.Add(this.lblWriteOffset);
 			this.grpGeneral.Font = null;
 			this.grpGeneral.Name = "grpGeneral";
 			this.grpGeneral.TabStop = false;
 			this.toolTip1.SetToolTip(this.grpGeneral, resources.GetString("grpGeneral.ToolTip"));
 			// 
+			// chkSingleInstance
+			// 
+			this.chkSingleInstance.AccessibleDescription = null;
+			this.chkSingleInstance.AccessibleName = null;
+			resources.ApplyResources(this.chkSingleInstance, "chkSingleInstance");
+			this.chkSingleInstance.BackgroundImage = null;
+			this.chkSingleInstance.Font = null;
+			this.chkSingleInstance.Name = "chkSingleInstance";
+			this.toolTip1.SetToolTip(this.chkSingleInstance, resources.GetString("chkSingleInstance.ToolTip"));
+			this.chkSingleInstance.UseVisualStyleBackColor = true;
+			// 
 			// chkOverwriteTags
 			// 
 			this.chkOverwriteTags.AccessibleDescription = null;
@@ -265,25 +274,6 @@ namespace JDP {
 			this.toolTip1.SetToolTip(this.chkEmbedLog, resources.GetString("chkEmbedLog.ToolTip"));
 			this.chkEmbedLog.UseVisualStyleBackColor = true;
 			// 
-			// numericWriteOffset
-			// 
-			this.numericWriteOffset.AccessibleDescription = null;
-			this.numericWriteOffset.AccessibleName = null;
-			resources.ApplyResources(this.numericWriteOffset, "numericWriteOffset");
-			this.numericWriteOffset.Font = null;
-			this.numericWriteOffset.Maximum = new decimal(new int[] {
-            99999,
-            0,
-            0,
-            0});
-			this.numericWriteOffset.Minimum = new decimal(new int[] {
-            99999,
-            0,
-            0,
-            -2147483648});
-			this.numericWriteOffset.Name = "numericWriteOffset";
-			this.toolTip1.SetToolTip(this.numericWriteOffset, resources.GetString("numericWriteOffset.ToolTip"));
-			// 
 			// chkAutoCorrectFilenames
 			// 
 			this.chkAutoCorrectFilenames.AccessibleDescription = null;
@@ -306,15 +296,6 @@ namespace JDP {
 			this.toolTip1.SetToolTip(this.chkPreserveHTOA, resources.GetString("chkPreserveHTOA.ToolTip"));
 			this.chkPreserveHTOA.UseVisualStyleBackColor = true;
 			// 
-			// lblWriteOffset
-			// 
-			this.lblWriteOffset.AccessibleDescription = null;
-			this.lblWriteOffset.AccessibleName = null;
-			resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset");
-			this.lblWriteOffset.Font = null;
-			this.lblWriteOffset.Name = "lblWriteOffset";
-			this.toolTip1.SetToolTip(this.lblWriteOffset, resources.GetString("lblWriteOffset.ToolTip"));
-			// 
 			// numericFLACCompressionLevel
 			// 
 			this.numericFLACCompressionLevel.AccessibleDescription = null;
@@ -1008,6 +989,7 @@ namespace JDP {
 			this.tabControl2.Controls.Add(this.tabPage8);
 			this.tabControl2.Controls.Add(this.tabPage9);
 			this.tabControl2.Font = null;
+			this.tabControl2.ImageList = this.imageList1;
 			this.tabControl2.Multiline = true;
 			this.tabControl2.Name = "tabControl2";
 			this.tabControl2.SelectedIndex = 0;
@@ -1018,6 +1000,7 @@ namespace JDP {
 			this.tabPage5.AccessibleDescription = null;
 			this.tabPage5.AccessibleName = null;
 			resources.ApplyResources(this.tabPage5, "tabPage5");
+			this.tabPage5.BackColor = System.Drawing.Color.Transparent;
 			this.tabPage5.BackgroundImage = null;
 			this.tabPage5.Controls.Add(this.numericFLACCompressionLevel);
 			this.tabPage5.Controls.Add(this.lblFLACCompressionLevel);
@@ -1242,6 +1225,13 @@ namespace JDP {
 			this.label2.Name = "label2";
 			this.toolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
 			// 
+			// imageList1
+			// 
+			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+			this.imageList1.Images.SetKeyName(0, "flac");
+			this.imageList1.Images.SetKeyName(1, "wv");
+			// 
 			// tabPage4
 			// 
 			this.tabPage4.AccessibleDescription = null;
@@ -1306,7 +1296,6 @@ namespace JDP {
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmSettings_FormClosing);
 			this.grpGeneral.ResumeLayout(false);
 			this.grpGeneral.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericFLACCompressionLevel)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).EndInit();
 			this.groupBox1.ResumeLayout(false);
@@ -1347,7 +1336,6 @@ namespace JDP {
 
 		private System.Windows.Forms.GroupBox grpGeneral;
 		private System.Windows.Forms.CheckBox chkPreserveHTOA;
-		private System.Windows.Forms.Label lblWriteOffset;
 		private System.Windows.Forms.Label lblFLACCompressionLevel;
 		private System.Windows.Forms.CheckBox chkFLACVerify;
 		private System.Windows.Forms.Button btnOK;
@@ -1360,7 +1348,6 @@ namespace JDP {
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.CheckBox chkWriteArTagsOnConvert;
 		private System.Windows.Forms.NumericUpDown numericFLACCompressionLevel;
-		private System.Windows.Forms.NumericUpDown numericWriteOffset;
 		private System.Windows.Forms.ToolTip toolTip1;
 		private System.Windows.Forms.NumericUpDown numFixWhenPercent;
 		private System.Windows.Forms.Label labelFixWhenPercent;
@@ -1433,6 +1420,8 @@ namespace JDP {
 		private System.Windows.Forms.TextBox textUDC1Encoder;
 		private System.Windows.Forms.CheckBox chkUDC1APEv2;
 		private System.Windows.Forms.CheckBox chkUDC1ID3v2;
+		private System.Windows.Forms.ImageList imageList1;
+		private System.Windows.Forms.CheckBox chkSingleInstance;
 
 	}
 }
\ No newline at end of file
diff --git a/CUETools/frmSettings.cs b/CUETools/frmSettings.cs
index d963df9..eb9a480 100644
--- a/CUETools/frmSettings.cs
+++ b/CUETools/frmSettings.cs
@@ -8,7 +8,6 @@ using CUETools.Processor;
 
 namespace JDP {
 	public partial class frmSettings : Form {
-		int _writeOffset;
 		bool _reducePriority;
 		CUEConfig _config;
 
@@ -18,7 +17,6 @@ namespace JDP {
 
 		private void frmSettings_Load(object sender, EventArgs e) {
 			chkReducePriority.Checked = _reducePriority;
-			numericWriteOffset.Value = _writeOffset;
 			chkPreserveHTOA.Checked = _config.preserveHTOA;
 			chkAutoCorrectFilenames.Checked = _config.autoCorrectFilenames;
 			numericFLACCompressionLevel.Value = _config.flacCompressionLevel;
@@ -69,6 +67,7 @@ namespace JDP {
 			chkHDCDLW16.Checked = _config.decodeHDCDtoLW16;
 			chkHDCD24bit.Checked = _config.decodeHDCDto24bit;
 			chkOverwriteTags.Checked = _config.overwriteCUEData;
+			chkSingleInstance.Checked = _config.oneInstance;
 
 			textUDC1Extension.Text = _config.udc1Extension;
 			textUDC1Decoder.Text = _config.udc1Decoder;
@@ -83,11 +82,6 @@ namespace JDP {
 		private void frmSettings_FormClosing(object sender, FormClosingEventArgs e) {
 		}
 
-		public int WriteOffset {
-			get { return _writeOffset; }
-			set { _writeOffset = value; }
-		}
-
 		public bool ReducePriority
 		{
 			get { return _reducePriority; }
@@ -105,7 +99,6 @@ namespace JDP {
 
 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			_writeOffset = (int)numericWriteOffset.Value;
 			_reducePriority = chkReducePriority.Checked;
 			_config.preserveHTOA = chkPreserveHTOA.Checked;
 			_config.autoCorrectFilenames = chkAutoCorrectFilenames.Checked;
@@ -154,6 +147,7 @@ namespace JDP {
 			_config.decodeHDCDtoLW16 = chkHDCDLW16.Checked;
 			_config.decodeHDCDto24bit = chkHDCD24bit.Checked;
 			_config.overwriteCUEData = chkOverwriteTags.Checked;
+			_config.oneInstance = chkSingleInstance.Checked;
 
 			_config.udc1Extension = textUDC1Extension.Text;
 			_config.udc1Decoder = textUDC1Decoder.Text;
diff --git a/CUETools/frmSettings.resx b/CUETools/frmSettings.resx
index ceaae02..cd29b01 100644
--- a/CUETools/frmSettings.resx
+++ b/CUETools/frmSettings.resx
@@ -178,7 +178,7 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
   </data>
   <data name="grpAudioFilenames.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -198,9 +198,6 @@
   <data name="chkTruncateExtra4206Samples.ToolTip" xml:space="preserve">
     <value>Some erroneous FLAC encoders add extra 4608 zero samples at the end of each file. These extra samples can be detected  and removed.</value>
   </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>OK</value>
-  </data>
   <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
     <value>toolTip1</value>
   </data>
@@ -276,9 +273,6 @@
   <data name="&gt;&gt;rbWVHigh.Type" xml:space="preserve">
     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;numericWriteOffset.Name" xml:space="preserve">
-    <value>numericWriteOffset</value>
-  </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 63</value>
   </data>
@@ -292,7 +286,7 @@
     <value>Write AccurateRip tags</value>
   </data>
   <data name="tabPage6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
   </data>
   <data name="chkUDC1ID3v2.Size" type="System.Drawing.Size, System.Drawing">
     <value>79, 17</value>
@@ -363,6 +357,9 @@
   <data name="lblTrackFilenameFormat.Text" xml:space="preserve">
     <value>Track format:</value>
   </data>
+  <data name="&gt;&gt;imageList1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="tabPage7.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
@@ -381,6 +378,9 @@
   <data name="chkReplaceSpaces.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
+  <data name="&gt;&gt;chkSingleInstance.Name" xml:space="preserve">
+    <value>chkSingleInstance</value>
+  </data>
   <data name="&gt;&gt;label5.Name" xml:space="preserve">
     <value>label5</value>
   </data>
@@ -535,10 +535,10 @@
     <value>38, 21</value>
   </data>
   <data name="chkAutoCorrectFilenames.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 61</value>
+    <value>12, 55</value>
   </data>
-  <data name="&gt;&gt;numericWriteOffset.Type" xml:space="preserve">
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;textUDC1EncParams.Parent" xml:space="preserve">
+    <value>tabPage9</value>
   </data>
   <data name="rbWVVeryHigh.ToolTip" xml:space="preserve">
     <value />
@@ -597,9 +597,6 @@
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
     <value>54, 13</value>
   </data>
-  <data name="&gt;&gt;lblWriteOffset.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;lblFLACCompressionLevel.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
@@ -609,6 +606,9 @@
   <data name="chkHDCD24bit.ToolTip" xml:space="preserve">
     <value>When not using lossyWAV, extend to 24 bit for compatibility</value>
   </data>
+  <data name="&gt;&gt;tabPage5.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;rbWVVeryHigh.Type" xml:space="preserve">
     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -675,8 +675,8 @@
   <data name="&gt;&gt;rbAPEnormal.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <data name="rbAPEextrahigh.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 57</value>
+  <data name="&gt;&gt;chkWVStoreMD5.Name" xml:space="preserve">
+    <value>chkWVStoreMD5</value>
   </data>
   <data name="&gt;&gt;chkFillUpCUE.Name" xml:space="preserve">
     <value>chkFillUpCUE</value>
@@ -756,8 +756,8 @@
   <data name="textUDC1EncParams.Location" type="System.Drawing.Point, System.Drawing">
     <value>89, 114</value>
   </data>
-  <data name="&gt;&gt;chkFilenamesANSISafe.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>OK</value>
   </data>
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
     <value>73, 23</value>
@@ -789,15 +789,9 @@
   <data name="&gt;&gt;chkCreateM3U.Parent" xml:space="preserve">
     <value>grpGeneral</value>
   </data>
-  <data name="&gt;&gt;numericWriteOffset.Parent" xml:space="preserve">
-    <value>grpGeneral</value>
-  </data>
   <data name="&gt;&gt;lblSingleFilenameFormat.Name" xml:space="preserve">
     <value>lblSingleFilenameFormat</value>
   </data>
-  <data name="numericWriteOffset.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
     <value>62, 13</value>
   </data>
@@ -840,6 +834,12 @@
   <data name="tabPage7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 3, 3, 3</value>
   </data>
+  <data name="&gt;&gt;txtTrackFilenameFormat.Name" xml:space="preserve">
+    <value>txtTrackFilenameFormat</value>
+  </data>
+  <data name="chkSingleInstance.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
   <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -885,9 +885,6 @@
   <data name="&gt;&gt;chkEncodeWhenZeroOffset.Name" xml:space="preserve">
     <value>chkEncodeWhenZeroOffset</value>
   </data>
-  <data name="lblWriteOffset.ToolTip" xml:space="preserve">
-    <value />
-  </data>
   <data name="chkRemoveSpecial.Text" xml:space="preserve">
     <value>Remove special characters except:</value>
   </data>
@@ -916,7 +913,7 @@
     <value>8</value>
   </data>
   <data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;grpGeneral.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -930,11 +927,8 @@
   <data name="&gt;&gt;grpHDCD.Parent" xml:space="preserve">
     <value>tabPage4</value>
   </data>
-  <data name="chkCreateM3U.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="textUDC1Decoder.Location" type="System.Drawing.Point, System.Drawing">
-    <value>89, 33</value>
+  <data name="&gt;&gt;chkFilenamesANSISafe.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="labelEncodeWhenConfidence.Text" xml:space="preserve">
     <value>with confidence &gt;=</value>
@@ -976,7 +970,7 @@
     <value>label4</value>
   </data>
   <data name="&gt;&gt;chkEmbedLog.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;rbWVHigh.Parent" xml:space="preserve">
     <value>tabPage6</value>
@@ -1005,6 +999,9 @@
   <data name="rbWVNormal.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 23</value>
   </data>
+  <data name="&gt;&gt;imageList1.Name" xml:space="preserve">
+    <value>imageList1</value>
+  </data>
   <data name="&gt;&gt;tabPage9.Parent" xml:space="preserve">
     <value>tabControl2</value>
   </data>
@@ -1014,6 +1011,9 @@
   <data name="&gt;&gt;chkArFixOffset.Name" xml:space="preserve">
     <value>chkArFixOffset</value>
   </data>
+  <data name="chkSingleInstance.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="rbWVFast.Text" xml:space="preserve">
     <value>Fast</value>
   </data>
@@ -1062,9 +1062,6 @@
   <data name="chkWriteARTagsOnVerify.Size" type="System.Drawing.Size, System.Drawing">
     <value>137, 17</value>
   </data>
-  <data name="chkEmbedLog.Text" xml:space="preserve">
-    <value>Embed log file as a tag</value>
-  </data>
   <data name="&gt;&gt;chkFilenamesANSISafe.Parent" xml:space="preserve">
     <value>grpAudioFilenames</value>
   </data>
@@ -1075,7 +1072,7 @@
     <value>Detect HDCD encoding</value>
   </data>
   <data name="tabPage7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
   </data>
   <data name="&gt;&gt;chkEmbedLog.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1110,15 +1107,15 @@
   <data name="&gt;&gt;numericLossyWAVQuality.Type" xml:space="preserve">
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="label2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
   <data name="chkFilenamesANSISafe.Size" type="System.Drawing.Size, System.Drawing">
     <value>128, 17</value>
   </data>
-  <data name="&gt;&gt;lblWriteOffset.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
   <data name="&gt;&gt;textUDC1Encoder.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
@@ -1174,7 +1171,7 @@
     <value>1</value>
   </data>
   <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
   </data>
   <data name="labelEncodeWhenPercent.Size" type="System.Drawing.Size, System.Drawing">
     <value>121, 13</value>
@@ -1198,7 +1195,7 @@
     <value>520, 249</value>
   </data>
   <data name="&gt;&gt;chkFillUpCUE.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="&gt;&gt;numericFLACCompressionLevel.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -1209,14 +1206,14 @@
   <data name="chkEmbedLog.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="&gt;&gt;lblWriteOffset.Name" xml:space="preserve">
-    <value>lblWriteOffset</value>
+  <data name="&gt;&gt;chkSingleInstance.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;txtSingleFilenameFormat.Parent" xml:space="preserve">
     <value>grpAudioFilenames</value>
   </data>
   <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
   </data>
   <data name="chkWriteARTagsOnVerify.Text" xml:space="preserve">
     <value>Write AccurateRip tags</value>
@@ -1254,9 +1251,6 @@
   <data name="&gt;&gt;chkRemoveSpecial.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="numericWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>133, 20</value>
-  </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>45, 13</value>
   </data>
@@ -1275,8 +1269,8 @@
   <data name="&gt;&gt;textUDC1EncParams.Name" xml:space="preserve">
     <value>textUDC1EncParams</value>
   </data>
-  <data name="&gt;&gt;txtTrackFilenameFormat.Name" xml:space="preserve">
-    <value>txtTrackFilenameFormat</value>
+  <data name="chkCreateM3U.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="chkCreateCUEFileWhenEmbedded.ToolTip" xml:space="preserve">
     <value />
@@ -1294,7 +1288,7 @@
     <value>0</value>
   </data>
   <data name="tabPage9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
   </data>
   <data name="rbAPEhigh.Size" type="System.Drawing.Size, System.Drawing">
     <value>46, 17</value>
@@ -1311,9 +1305,6 @@
   <data name="chkCreateM3U.Text" xml:space="preserve">
     <value>Create .m3u playlists</value>
   </data>
-  <data name="numericWriteOffset.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
-    <value>Right</value>
-  </data>
   <data name="&gt;&gt;textUDC1Decoder.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -1359,9 +1350,6 @@
   <data name="&gt;&gt;numEncodeWhenConfidence.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
-  <data name="numericWriteOffset.ToolTip" xml:space="preserve">
-    <value />
-  </data>
   <data name="chkArFixOffset.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
   </data>
@@ -1398,9 +1386,6 @@
   <data name="lblTrackFilenameFormat.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="lblWriteOffset.Text" xml:space="preserve">
-    <value>Write offset (samples):</value>
-  </data>
   <data name="chkUDC1APEv2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -1459,7 +1444,7 @@
     <value>tabPage6</value>
   </data>
   <data name="chkOverwriteTags.Location" type="System.Drawing.Point, System.Drawing">
-    <value>30, 198</value>
+    <value>30, 191</value>
   </data>
   <data name="chkWriteArLogOnConvert.ToolTip" xml:space="preserve">
     <value />
@@ -1489,7 +1474,7 @@
     <value />
   </data>
   <data name="chkTruncateExtra4206Samples.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 146</value>
+    <value>12, 140</value>
   </data>
   <data name="&gt;&gt;tabPage3.Parent" xml:space="preserve">
     <value>tabControl1</value>
@@ -1500,9 +1485,6 @@
   <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
     <value>btnOK</value>
   </data>
-  <data name="&gt;&gt;numericWriteOffset.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
   <data name="chkAutoCorrectFilenames.ToolTip" xml:space="preserve">
     <value>Preprocess with filename corrector if unable to locate audio files</value>
   </data>
@@ -1581,6 +1563,9 @@
   <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;chkSingleInstance.Parent" xml:space="preserve">
+    <value>grpGeneral</value>
+  </data>
   <data name="rbWVNormal.Text" xml:space="preserve">
     <value>Normal</value>
   </data>
@@ -1593,9 +1578,6 @@
   <data name="chkReducePriority.Text" xml:space="preserve">
     <value>Reduce process priority to Idle</value>
   </data>
-  <data name="numFixWhenConfidence.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
   <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
     <value>543, 287</value>
   </data>
@@ -1620,8 +1602,8 @@
   <data name="&gt;&gt;chkFilenamesANSISafe.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="lblWriteOffset.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="numFixWhenConfidence.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
   </data>
   <data name="chkExtractLog.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 17</value>
@@ -1671,6 +1653,9 @@
   <data name="&gt;&gt;lblSingleFilenameFormat.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;chkSingleInstance.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;chkHDCDLW16.Parent" xml:space="preserve">
     <value>grpHDCD</value>
   </data>
@@ -1711,7 +1696,7 @@
     <value>CUETools</value>
   </data>
   <data name="tabPage5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
   </data>
   <data name="&gt;&gt;chkPreserveHTOA.Name" xml:space="preserve">
     <value>chkPreserveHTOA</value>
@@ -1719,6 +1704,9 @@
   <data name="chkKeepOriginalFilenames.ToolTip" xml:space="preserve">
     <value />
   </data>
+  <data name="chkSingleInstance.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 21</value>
+  </data>
   <data name="tabControl2.ToolTip" xml:space="preserve">
     <value />
   </data>
@@ -1735,7 +1723,7 @@
     <value>tabPage8</value>
   </data>
   <data name="tabPage9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
   </data>
   <data name="&gt;&gt;numEncodeWhenConfidence.Name" xml:space="preserve">
     <value>numEncodeWhenConfidence</value>
@@ -1807,7 +1795,7 @@
     <value />
   </data>
   <data name="&gt;&gt;chkTruncateExtra4206Samples.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="label5.ToolTip" xml:space="preserve">
     <value />
@@ -1831,13 +1819,13 @@
     <value>4</value>
   </data>
   <data name="&gt;&gt;chkOverwriteTags.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
   <data name="chkEmbedLog.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 78</value>
+    <value>12, 72</value>
   </data>
   <data name="&gt;&gt;lblTrackFilenameFormat.ZOrder" xml:space="preserve">
     <value>6</value>
@@ -1861,7 +1849,7 @@
     <value>0</value>
   </data>
   <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
   </data>
   <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>226, 6</value>
@@ -1876,7 +1864,7 @@
     <value>Compression level:</value>
   </data>
   <data name="chkExtractLog.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 95</value>
+    <value>12, 89</value>
   </data>
   <data name="chkFillUpCUE.ToolTip" xml:space="preserve">
     <value />
@@ -1893,8 +1881,8 @@
   <data name="&gt;&gt;chkEncodeWhenZeroOffset.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="lblWriteOffset.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="chkEmbedLog.Text" xml:space="preserve">
+    <value>Embed log file as a tag</value>
   </data>
   <data name="chkWriteARTagsOnVerify.ToolTip" xml:space="preserve">
     <value>Add ACCURATERIPCOUNT/ACCURATERIPCOUNTALLOFFSETS/ACCURATERIPTOTAL tags to input files. You can set up foobar2000 to show those values, and see if your music was ripped correctly or how popular it is.</value>
@@ -1908,14 +1896,17 @@
   <data name="txtSpecialExceptions.Text" xml:space="preserve">
     <value>-()</value>
   </data>
+  <data name="chkSingleInstance.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 17</value>
+  </data>
   <data name="&gt;&gt;numWVExtraMode.Type" xml:space="preserve">
     <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="chkWVExtraMode.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="&gt;&gt;tabPage5.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="rbAPEextrahigh.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 57</value>
   </data>
   <data name="chkUDC1ID3v2.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -2001,17 +1992,14 @@
   <data name="labelEncodeWhenConfidence.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
-  <data name="&gt;&gt;chkWVStoreMD5.Name" xml:space="preserve">
-    <value>chkWVStoreMD5</value>
-  </data>
   <data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.Parent" xml:space="preserve">
     <value>grpGeneral</value>
   </data>
   <data name="tabPage3.Location" type="System.Drawing.Point, System.Drawing">
     <value>4, 22</value>
   </data>
-  <data name="lblWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 23</value>
+  <data name="textUDC1Decoder.Location" type="System.Drawing.Point, System.Drawing">
+    <value>89, 33</value>
   </data>
   <data name="tabPage5.Text" xml:space="preserve">
     <value>FLAC</value>
@@ -2100,9 +2088,6 @@
   <data name="chkReplaceSpaces.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="numericWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>62, 21</value>
-  </data>
   <data name="chkEncodeWhenZeroOffset.Size" type="System.Drawing.Size, System.Drawing">
     <value>100, 17</value>
   </data>
@@ -2142,9 +2127,6 @@
   <data name="&gt;&gt;label6.Name" xml:space="preserve">
     <value>label6</value>
   </data>
-  <data name="&gt;&gt;lblWriteOffset.Parent" xml:space="preserve">
-    <value>grpGeneral</value>
-  </data>
   <data name="label5.Text" xml:space="preserve">
     <value>Encoder</value>
   </data>
@@ -2152,7 +2134,7 @@
     <value>grpAudioFilenames</value>
   </data>
   <data name="chkReducePriority.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 163</value>
+    <value>12, 38</value>
   </data>
   <data name="&gt;&gt;numWVExtraMode.Name" xml:space="preserve">
     <value>numWVExtraMode</value>
@@ -2164,7 +2146,7 @@
     <value>grpGeneral</value>
   </data>
   <data name="&gt;&gt;chkReducePriority.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="chkWriteArTagsOnConvert.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 149</value>
@@ -2196,6 +2178,9 @@
   <data name="&gt;&gt;txtSingleFilenameFormat.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="rbWVNormal.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -2218,7 +2203,7 @@
     <value />
   </data>
   <data name="chkCreateM3U.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 112</value>
+    <value>12, 106</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>62, 13</value>
@@ -2247,8 +2232,8 @@
   <data name="lblFLACCompressionLevel.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 8</value>
   </data>
-  <data name="label2.ToolTip" xml:space="preserve">
-    <value />
+  <data name="chkSingleInstance.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <data name="label4.ToolTip" xml:space="preserve">
     <value />
@@ -2301,9 +2286,6 @@
   <data name="&gt;&gt;grpAudioFilenames.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;lblSingleFilenameFormat.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
   <data name="labelEncodeWhenPercent.Location" type="System.Drawing.Point, System.Drawing">
     <value>108, 21</value>
   </data>
@@ -2355,6 +2337,9 @@
   <data name="&gt;&gt;chkCreateM3U.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="chkSingleInstance.Text" xml:space="preserve">
+    <value>One instance of application</value>
+  </data>
   <data name="&gt;&gt;tabControl2.Name" xml:space="preserve">
     <value>tabControl2</value>
   </data>
@@ -2370,8 +2355,73 @@
   <data name="rbAPEnormal.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="rbWVNormal.ToolTip" xml:space="preserve">
-    <value />
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm
+        DQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBEAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABEAMAAQEBAAEgBgABEBUAAf8DAAH/AR0BaQEUAf8BHQFpARQB/wMAAf8BHQFpARQB/wEdAWkBFAH/
+        AwAB/wMAAf8BHQEcAR0B/wElASQBJQH/ARQBGAEUAf8DAAH/AwAB/wMAAf8DAAX/AQkBBQEDAf8BCgEG
+        AQMB/wEKAQYBAwH/AQoBBgEDAf8BCwEGAQMB/wEMAQcBBAH/AQoBBgEDAf8BCgEGAQMB/wEKAQYBAwH/
+        AQoBBgEDAf8BCgEGAQMB/wEKAQYBAwH/AQoBBgEDAf8BCQEFAQMF/4AAAVYBWQFWAf8BLQEsAS0B/wE1
+        Ad8BPgH/ATUB3wE+Af8DAAH/ATUB3wE+Af8BNQHfAT4B/wMAAf8DAAH/AYwBjgGMAf8B1gHTAdYB/wHW
+        AdMB1gH/AVYBVQFWAf8DAAH/AwAB/wMAAf8BCgEGAQMB/wHOAY4BXQH/Ac4BjgFdAf8B1AGTAWAB/wHO
+        AY4BXQH/AaYBbwFLAf8BHgETAQwB/wHOAY4BXQH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFd
+        Af8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BCgEGAQMB/4AAAW8BcQFvAf8BLQEsAS0B/wE1Ad8BPgH/
+        ATUB3wE+Af8DAAH/ATUB3wE+Af8BNQHfAT4B/wMAAf8DAAH/AbUBtgG1Cf8BbwFxAW8B/wMAAf8DAAH/
+        AwAB/wEMAQcBBAH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8B0AGQAV0B/wMAAf8BlQFj
+        AUEB/wHOAY4BXQH/AdIBkAFfAf8B0wGRAV8B/wHTAZEBXwH/AdMBkQFfAf8BzgGOAV0B/wHOAY4BXQH/
+        AQsBBgEDAf+AAAFvAXEBbwH/AS0BLAEtAf8BAAEgAQAB/wEEASwBBAH/AwAB/wEEASwBDAH/AQQBJAEE
+        Af8DAAH/AwAB/wG1AbIBtQn/AW8BbQFvAf8DAAH/AwAB/wMAAf8BDAEHAQQB/wHOAY4BXQH/Ac4BjgFd
+        Af8BzgGOAV0B/wHQAY8BXQH/Ac4BjgFdAf8BGwERAQkB/wEnARoBEAH/Ac4BjgFdAf8BzgGOAV0B/wHO
+        AY4BXQH/Ac4BjgFdAf8B0AGPAV4B/wHOAY4BXQH/Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEs
+        AS0B/wElAa4BLQH/ASUBrgEtAf8DAAH/ASUBrgEtAf8BJQGuAS0B/wMAAf8DAAH/AbUBsgG1Cf8BbwFt
+        AW8B/wMAAf8DAAH/AwAB/wEMAQcBBAH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BzgGO
+        AV0B/wGYAWUBQwH/AwAB/wMAAf8DAAH/ATMBIQEVAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BzgGO
+        AV0B/wELAQYBAwH/gAABbwFxAW8B/wEtASwBLQH/ATUB3wE+Af8BNQHfAT4B/wMAAf8BNQHfAT4B/wE1
+        Ad8BPgH/AwAB/wMAAf8BtQGyAbUJ/wFvAW0BbwH/AwAB/wMAAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHS
+        AZEBXgH/Ac4BjgFdAf8B0QGQAV4B/wHOAY4BXQH/Ac4BjgFdAf8DAAH/AU0BNAEiAf8BrQFzAU4B/wEs
+        AR0BEwH/AwAB/wHOAY4BXQH/Ac4BjgFdAf8BzgGOAV0B/wELAQYBAwH/gAABbwFxAW8B/wEtASwBLQH/
+        ATUB3wE+Af8BNQHfAT4B/wMAAf8BNQHfAT4B/wE1Ad8BPgH/AwAB/wMAAf8BrQGuAa0J/wFnAWkBZwH/
+        AwAB/wMAAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHRAZABXgH/Ac4BjgFdAf8BkQFgAUAB/wHOAY4BXQH/
+        Ac4BjgFdAf8BPQEoARoB/wEEAQIBAAH/Ac4BjgFdAf8BzgGOAV0B/wMAAf8BQQEsARwB/wHOAY4BXQH/
+        Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEsAS0B/wEAASQBJQH/AQABLAEtAf8DAAH/AQABLAEt
+        Af8BAAEkASUB/wMAAf8DAAH/Aa0BqgGtCf8BZwFlAWcB/wMAAf8DAAH/AwAB/wEMAQcBBAH/Ac4BjgFd
+        Af8BzgGOAV0B/wHOAY4BXQH/AwAB/wGrAXIBTAH/Ac4BjgFdAf8BuQF7AVIB/wMAAf8BzgGOAV0B/wHO
+        AY4BXQH/AQQBAgEBAf8BEAEIAQYB/wHOAY4BXQH/Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEs
+        AS0B/wEAAZ4BnAH/AQABngGcAf8DAAH/AQABngGcAf8BAAGeAZwB/wEUASABHRn/ASUBJAElAf8DAAH/
+        AQwBBwEEAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8DAAH/ARkBEAEKAf8BzgGOAV0B/wHEAYcBWgH/
+        AwAB/wMAAf8DAAH/AwAB/wGHAVgBOgH/Ac4BjgFdAf8BzgGOAV0B/wELAQYBAwH/gAABbwFxAW8B/wEt
+        ASwBLQH/AQAD/wEAA/8DAAH/AQAD/wEAA/8DABn/ASUBJAElAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHO
+        AY4BXQH/Ac4BjgFdAf8DAAH/AwAB/wGqAXABSwH/AZkBZgFEAf8DAAH/AwAB/wGiAWoBRwH/Ac4BjgFd
+        Af8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEsAS0B/wEAA/8BAAP/
+        AwAB/wEAA/8BAAP/AwAB/wFWAVEBTgH/Ad4B2wHeCf8BtQGyAbUB/wF3AXkBdwH/AQQBCAEEAf8DAAH/
+        AQwBBwEEAf8BzgGOAV0B/wHOAY4BXQH/AZ4BaAFGAf8DAAH/AV0BPgEqAf8BEwEMAQcB/wFhAUEBLAH/
+        ARsBEgEKAf8BJwEaAREB/wFBASsBHAH/Ac4BjgFdAf8B0QGQAV4B/wHOAY4BXQH/Ac4BjgFdAf8BCwEG
+        AQMB/4AAAW8BcQFvAf8BLQEsAS0B/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BlAGWAZQJ/wG1
+        AbYBtQH/AwAB/wMAAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHOAY4BXQH/AXMBTgE1Af8DAAH/Ac4BjgFd
+        Af8DAAH/AwAB/wFTATgBJgH/Aa4BdQFOAf8DAAH/Ac4BjgFdAf8BzgGOAV0B/wHTAZEBXwH/AdQBkwFg
+        Af8BCwEGAQMB/4AAAZwBmgGcAf8BLQEsAS0B/wIAAaUB/wIAAaUB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
+        AS0BLAEtEf8BvQG6Ab0B/wMAAf8BDAEHAQQB/wHOAY4BXQH/Ac4BjgFdAf8BQQErAR0B/wMAAf8BzgGO
+        AV0B/wFsAUkBMAH/AwAB/wGDAVYBOgH/Ac4BjgFdAf8DAAH/ATIBIAEWAf8BzgGOAV0B/wHOAY4BXQH/
+        AdQBkwFgAf8BCwEGAQMB/4AAAZQBkgGUAf8BLQEsAS0B/wIAAv8CAAL/AwAB/wMAAf8DAAH/AwAB/wMA
+        Af8DAAH/AZwBmgGcDf8BlAGWAZQB/wMAAf8BDAEHAQQB/wHOAY4BXQH/Ac4BjgFdAf8BAgIAAf8BJAEY
+        AQ8B/wHOAY4BXQH/Ac4BjgFdAf8DAAH/AZ8BaQFHAf8BzgGOAV0B/wGLAVsBPQH/AwAB/wHOAY4BXQH/
+        Ac4BjgFdAf8BzgGOAV0B/wELAQYBAwH/gAABpQGmAaUB/wGUAZIBlAH/AgABpQH/AgABtQH/AS0BLAEt
+        Af8BLQEsAS0B/wEtASwBLQH/AS0BLAEtAf8BLQEsAS0B/wEtASwBLQH/AS0BMAEtAf8BTgFRAU4B/wGt
+        AaoBrQH/Aa0BqgGtAf8BRgFJAUYB/wMAAf8BCgEGAQMB/wHOAY4BXQH/Ac4BjgFdAf8BcwFNATQB/wGl
+        AW4BSQH/Ac4BjgFdAf8BzgGOAV0B/wGYAWUBQwH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/AW4BSwEy
+        Af8BrgFzAU4B/wHOAY4BXQH/Ac4BjgFdAf8BCgEGAQMB/4AAAd4B2wHeAf8BpQGmAaUB/wGlAaYBpQH/
+        AXcBdQF3Af8BbwFxAW8B/wFvAXEBbwH/AW8BcQFvAf8BbwFxAW8B/wFvAXEBbwH/AW8BcQFvAf8BbwFx
+        AW8B/wFvAXEBbwH/AW8BcQFvAf8BLQEsAS0B/wEtASwBLQH/AwAF/wEKAQYBAwH/AQsBBwEDAf8BDAEH
+        AQQB/wEMAQcBAwH/AQsBBwEDAf8BCwEHAQMB/wEMAQcBAwH/AQwBBwEDAf8BCwEHAQMB/wELAQcBAwH/
+        AQwBBwEEAf8BDAEHAQMB/wELAQcBAwH/AQoBBgEDBf+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEB
+        AQABAQUAAYAXAAP/lwAL
+</value>
+  </data>
+  <data name="tabPage6.ImageKey" xml:space="preserve">
+    <value>wv</value>
   </data>
   <data name="&gt;&gt;chkRemoveSpecial.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -2398,7 +2448,7 @@
     <value>textUDC1Extension</value>
   </data>
   <data name="&gt;&gt;chkExtractLog.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="tabPage2.ToolTip" xml:space="preserve">
     <value />
@@ -2499,8 +2549,8 @@
   <data name="&gt;&gt;chkTruncateExtra4206Samples.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;textUDC1EncParams.Parent" xml:space="preserve">
-    <value>tabPage9</value>
+  <data name="tabPage5.ImageKey" xml:space="preserve">
+    <value>flac</value>
   </data>
   <data name="btnCancel.ToolTip" xml:space="preserve">
     <value />
@@ -2512,13 +2562,13 @@
     <value />
   </data>
   <data name="chkCreateCUEFileWhenEmbedded.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 129</value>
+    <value>12, 123</value>
   </data>
   <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
   <data name="&gt;&gt;chkCreateM3U.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="rbAPEinsane.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 74</value>
@@ -2539,7 +2589,7 @@
     <value>1</value>
   </data>
   <data name="tabPage8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
   </data>
   <data name="&gt;&gt;tabControl1.Name" xml:space="preserve">
     <value>tabControl1</value>
@@ -2596,7 +2646,7 @@
     <value>Yes</value>
   </data>
   <data name="chkPreserveHTOA.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 44</value>
+    <value>12, 157</value>
   </data>
   <data name="&gt;&gt;chkUDC1ID3v2.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -2674,7 +2724,7 @@
     <value>chkWriteARLogOnVerify</value>
   </data>
   <data name="chkFillUpCUE.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 181</value>
+    <value>12, 174</value>
   </data>
   <data name="&gt;&gt;label1.Parent" xml:space="preserve">
     <value>tabPage8</value>
@@ -2685,8 +2735,8 @@
   <data name="&gt;&gt;chkWVExtraMode.Type" xml:space="preserve">
     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 13</value>
+  <data name="&gt;&gt;lblSingleFilenameFormat.ZOrder" xml:space="preserve">
+    <value>7</value>
   </data>
   <data name="&gt;&gt;tabPage6.Name" xml:space="preserve">
     <value>tabPage6</value>
@@ -2736,4 +2786,7 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>114, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/CUETools/frmSettings.ru-RU.resx b/CUETools/frmSettings.ru-RU.resx
index f2a0815..d7c4d1a 100644
--- a/CUETools/frmSettings.ru-RU.resx
+++ b/CUETools/frmSettings.ru-RU.resx
@@ -120,16 +120,46 @@
   <data name="btnCancel.Text" xml:space="preserve">
     <value>Отмена</value>
   </data>
-  <data name="grpGeneral.Text" xml:space="preserve">
-    <value>Общие</value>
+  <data name="btnCancel.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="chkSingleInstance.Size" type="System.Drawing.Size, System.Drawing">
+    <value>182, 17</value>
+  </data>
+  <data name="chkSingleInstance.Text" xml:space="preserve">
+    <value>Только одно окно приложения</value>
+  </data>
+  <data name="chkSingleInstance.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkOverwriteTags.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 17</value>
+  </data>
+  <data name="chkOverwriteTags.Text" xml:space="preserve">
+    <value>Игнорируя информацию из .cue</value>
+  </data>
+  <data name="chkOverwriteTags.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkExtractLog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 17</value>
+  </data>
+  <data name="chkExtractLog.Text" xml:space="preserve">
+    <value>Извлечь .log в файл</value>
+  </data>
+  <data name="chkExtractLog.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkReducePriority.Size" type="System.Drawing.Size, System.Drawing">
     <value>180, 17</value>
   </data>
   <data name="chkReducePriority.Text" xml:space="preserve">
     <value>Понизить приоритет процесса</value>
   </data>
+  <data name="chkReducePriority.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkTruncateExtra4206Samples.Size" type="System.Drawing.Size, System.Drawing">
     <value>202, 17</value>
   </data>
@@ -145,18 +175,27 @@
   <data name="chkCreateCUEFileWhenEmbedded.Text" xml:space="preserve">
     <value>Создавать .cue даже при встраивании</value>
   </data>
+  <data name="chkCreateCUEFileWhenEmbedded.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkCreateM3U.Size" type="System.Drawing.Size, System.Drawing">
     <value>166, 17</value>
   </data>
   <data name="chkCreateM3U.Text" xml:space="preserve">
     <value>Создавать плейлисты .m3u</value>
   </data>
+  <data name="chkCreateM3U.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkFillUpCUE.Size" type="System.Drawing.Size, System.Drawing">
     <value>221, 17</value>
   </data>
   <data name="chkFillUpCUE.Text" xml:space="preserve">
     <value>Пополнить .cue информацией из тэгов</value>
   </data>
+  <data name="chkFillUpCUE.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkEmbedLog.Size" type="System.Drawing.Size, System.Drawing">
     <value>156, 17</value>
   </data>
@@ -181,11 +220,17 @@
   <data name="chkPreserveHTOA.Text" xml:space="preserve">
     <value>Сохранять HTOA при разбивке на треки</value>
   </data>
-  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 13</value>
+  <data name="chkPreserveHTOA.ToolTip" xml:space="preserve">
+    <value />
   </data>
-  <data name="lblWriteOffset.Text" xml:space="preserve">
-    <value>Смещение (сэмплов):</value>
+  <data name="grpGeneral.Text" xml:space="preserve">
+    <value>Общие</value>
+  </data>
+  <data name="grpGeneral.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericFLACCompressionLevel.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="lblFLACCompressionLevel.Size" type="System.Drawing.Size, System.Drawing">
     <value>94, 13</value>
@@ -193,50 +238,77 @@
   <data name="lblFLACCompressionLevel.Text" xml:space="preserve">
     <value>Уровень сжатия:</value>
   </data>
+  <data name="lblFLACCompressionLevel.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkFLACVerify.Size" type="System.Drawing.Size, System.Drawing">
     <value>94, 17</value>
   </data>
   <data name="chkFLACVerify.Text" xml:space="preserve">
     <value>Верификация</value>
   </data>
+  <data name="chkFLACVerify.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnOK.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkWVStoreMD5.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 17</value>
   </data>
   <data name="chkWVStoreMD5.Text" xml:space="preserve">
     <value>MD5-хеширование</value>
   </data>
+  <data name="chkWVStoreMD5.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numWVExtraMode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkWVExtraMode.Size" type="System.Drawing.Size, System.Drawing">
     <value>89, 17</value>
   </data>
   <data name="chkWVExtraMode.Text" xml:space="preserve">
     <value>Доп. режим:</value>
   </data>
+  <data name="chkWVExtraMode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="rbWVVeryHigh.Size" type="System.Drawing.Size, System.Drawing">
     <value>103, 17</value>
   </data>
   <data name="rbWVVeryHigh.Text" xml:space="preserve">
     <value>Очень высокий</value>
   </data>
+  <data name="rbWVVeryHigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="rbWVHigh.Size" type="System.Drawing.Size, System.Drawing">
     <value>68, 17</value>
   </data>
   <data name="rbWVHigh.Text" xml:space="preserve">
     <value>Высокий</value>
   </data>
+  <data name="rbWVHigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="rbWVNormal.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 17</value>
   </data>
   <data name="rbWVNormal.Text" xml:space="preserve">
     <value>Средний</value>
   </data>
+  <data name="rbWVNormal.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="rbWVFast.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 17</value>
   </data>
   <data name="rbWVFast.Text" xml:space="preserve">
     <value>Быстрый</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Проверить и записать</value>
+  <data name="rbWVFast.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="chkEncodeWhenZeroOffset.Location" type="System.Drawing.Point, System.Drawing">
     <value>150, 77</value>
@@ -247,6 +319,9 @@
   <data name="chkEncodeWhenZeroOffset.Text" xml:space="preserve">
     <value>и нулевым смещением</value>
   </data>
+  <data name="chkEncodeWhenZeroOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkArFixOffset.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 100</value>
   </data>
@@ -256,6 +331,9 @@
   <data name="chkArFixOffset.Text" xml:space="preserve">
     <value>Исправлять смещение если</value>
   </data>
+  <data name="chkArFixOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkWriteArLogOnConvert.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 181</value>
   </data>
@@ -265,6 +343,9 @@
   <data name="chkWriteArLogOnConvert.Text" xml:space="preserve">
     <value>Записывать отчет AccurateRip</value>
   </data>
+  <data name="chkWriteArLogOnConvert.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkWriteArTagsOnConvert.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 164</value>
   </data>
@@ -286,9 +367,15 @@
   <data name="labelEncodeWhenPercent.Text" xml:space="preserve">
     <value>% проверенных треков &gt;=</value>
   </data>
+  <data name="labelEncodeWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="numEncodeWhenPercent.Location" type="System.Drawing.Point, System.Drawing">
     <value>250, 35</value>
   </data>
+  <data name="numEncodeWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="labelEncodeWhenConfidence.Location" type="System.Drawing.Point, System.Drawing">
     <value>125, 58</value>
   </data>
@@ -298,15 +385,24 @@
   <data name="labelEncodeWhenConfidence.Text" xml:space="preserve">
     <value>с достоверностью &gt;=</value>
   </data>
+  <data name="labelEncodeWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="numEncodeWhenConfidence.Location" type="System.Drawing.Point, System.Drawing">
     <value>250, 56</value>
   </data>
+  <data name="numEncodeWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkArNoUnverifiedAudio.Size" type="System.Drawing.Size, System.Drawing">
     <value>176, 17</value>
   </data>
   <data name="chkArNoUnverifiedAudio.Text" xml:space="preserve">
     <value>Конвертировать только если</value>
   </data>
+  <data name="chkArNoUnverifiedAudio.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="labelFixWhenConfidence.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -324,9 +420,15 @@
   <data name="labelFixWhenConfidence.Text" xml:space="preserve">
     <value>с достоверностью &gt;=</value>
   </data>
+  <data name="labelFixWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="numFixWhenConfidence.Location" type="System.Drawing.Point, System.Drawing">
     <value>251, 137</value>
   </data>
+  <data name="numFixWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="labelFixWhenPercent.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
   </data>
@@ -342,9 +444,21 @@
   <data name="labelFixWhenPercent.Text" xml:space="preserve">
     <value>% проверенных треков &gt;=</value>
   </data>
+  <data name="labelFixWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="numFixWhenPercent.Location" type="System.Drawing.Point, System.Drawing">
     <value>250, 116</value>
   </data>
+  <data name="numFixWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Проверить и записать</value>
+  </data>
+  <data name="groupBox1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkFilenamesANSISafe.Size" type="System.Drawing.Size, System.Drawing">
     <value>207, 17</value>
   </data>
@@ -402,27 +516,39 @@
   <data name="chkHDCDLW16.ToolTip" xml:space="preserve">
     <value>При конвертации в lossyWAV, обрезать до 16 бит</value>
   </data>
-  <data name="grpAudioFilenames.Text" xml:space="preserve">
-    <value>Имена аудиофайлов</value>
-  </data>
   <data name="chkKeepOriginalFilenames.Size" type="System.Drawing.Size, System.Drawing">
     <value>157, 17</value>
   </data>
   <data name="chkKeepOriginalFilenames.Text" xml:space="preserve">
     <value>Сохранять оригинальные</value>
   </data>
+  <data name="chkKeepOriginalFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtSpecialExceptions.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkRemoveSpecial.Size" type="System.Drawing.Size, System.Drawing">
     <value>223, 17</value>
   </data>
   <data name="chkRemoveSpecial.Text" xml:space="preserve">
     <value>Удалять специальные символы кроме:</value>
   </data>
+  <data name="chkRemoveSpecial.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkReplaceSpaces.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 17</value>
   </data>
   <data name="chkReplaceSpaces.Text" xml:space="preserve">
     <value>Заменять пробелы подчеркиванями</value>
   </data>
+  <data name="chkReplaceSpaces.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtTrackFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="lblTrackFilenameFormat.Location" type="System.Drawing.Point, System.Drawing">
     <value>10, 75</value>
   </data>
@@ -432,14 +558,44 @@
   <data name="lblTrackFilenameFormat.Text" xml:space="preserve">
     <value>Трек:</value>
   </data>
+  <data name="lblTrackFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="lblSingleFilenameFormat.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 13</value>
   </data>
   <data name="lblSingleFilenameFormat.Text" xml:space="preserve">
     <value>Образ диска:</value>
   </data>
-  <data name="groupBox3.Text" xml:space="preserve">
-    <value>При проверке</value>
+  <data name="lblSingleFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtSingleFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpAudioFilenames.Text" xml:space="preserve">
+    <value>Имена аудиофайлов</value>
+  </data>
+  <data name="grpAudioFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEinsane.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEextrahigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEhigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEnormal.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEfast.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage1.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="chkWriteARLogOnVerify.Location" type="System.Drawing.Point, System.Drawing">
     <value>5, 181</value>
@@ -450,8 +606,26 @@
   <data name="chkWriteARLogOnVerify.Text" xml:space="preserve">
     <value>Записывать отчет AccurateRip</value>
   </data>
-  <data name="tabPage3.Text" xml:space="preserve">
-    <value>Форматы</value>
+  <data name="chkWriteARLogOnVerify.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="groupBox3.Text" xml:space="preserve">
+    <value>При проверке</value>
+  </data>
+  <data name="groupBox3.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage5.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage6.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage7.ToolTip" xml:space="preserve">
+    <value />
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>59, 13</value>
@@ -459,16 +633,153 @@
   <data name="label1.Text" xml:space="preserve">
     <value>Качество:</value>
   </data>
+  <data name="label1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericLossyWAVQuality.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage8.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkUDC1ID3v2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkUDC1APEv2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label6.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label5.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1EncParams.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Encoder.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Params.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Decoder.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Extension.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label4.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label3.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage9.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm
+        DQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABEAMAAQEBAAEgBgABEBUAAf8DAAH/ARwBaAETAf8BHAFoARMB/wMAAf8BHAFoARMB/wEcAWgBEwH/
+        AwAB/wMAAf8BHAEbARwB/wEkASMBJAH/ARMBFwETAf8DAAH/AwAB/wMAAf8DAAX/AQgBBAECAf8BCQEF
+        AQIB/wEJAQUBAgH/AQkBBQECAf8BCgEFAQIB/wELAQYBAwH/AQkBBQECAf8BCQEFAQIB/wEJAQUBAgH/
+        AQkBBQECAf8BCQEFAQIB/wEJAQUBAgH/AQkBBQECAf8BCAEEAQIF/4AAAVUBWAFVAf8BLAErASwB/wE0
+        Ad8BPQH/ATQB3wE9Af8DAAH/ATQB3wE9Af8BNAHfAT0B/wMAAf8DAAH/AYwBjgGMAf8B1gHTAdYB/wHW
+        AdMB1gH/AVUBVAFVAf8DAAH/AwAB/wMAAf8BCQEFAQIB/wHOAY4BXAH/Ac4BjgFcAf8B1AGTAV8B/wHO
+        AY4BXAH/AaYBbgFKAf8BHQESAQsB/wHOAY4BXAH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFc
+        Af8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BCQEFAQIB/4AAAW4BcAFuAf8BLAErASwB/wE0Ad8BPQH/
+        ATQB3wE9Af8DAAH/ATQB3wE9Af8BNAHfAT0B/wMAAf8DAAH/AbUBtgG1Cf8BbgFwAW4B/wMAAf8DAAH/
+        AwAB/wELAQYBAwH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8B0AGQAVwB/wMAAf8BlQFi
+        AUAB/wHOAY4BXAH/AdIBkAFeAf8B0wGRAV4B/wHTAZEBXgH/AdMBkQFeAf8BzgGOAVwB/wHOAY4BXAH/
+        AQoBBQECAf+AAAFuAXABbgH/ASwBKwEsAf8BAAEfAQAB/wEDASsBAwH/AwAB/wEDASsBCwH/AQMBIwED
+        Af8DAAH/AwAB/wG1AbIBtQn/AW4BbAFuAf8DAAH/AwAB/wMAAf8BCwEGAQMB/wHOAY4BXAH/Ac4BjgFc
+        Af8BzgGOAVwB/wHQAY8BXAH/Ac4BjgFcAf8BGgEQAQgB/wEmARkBDwH/Ac4BjgFcAf8BzgGOAVwB/wHO
+        AY4BXAH/Ac4BjgFcAf8B0AGPAV0B/wHOAY4BXAH/Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAEr
+        ASwB/wEkAa4BLAH/ASQBrgEsAf8DAAH/ASQBrgEsAf8BJAGuASwB/wMAAf8DAAH/AbUBsgG1Cf8BbgFs
+        AW4B/wMAAf8DAAH/AwAB/wELAQYBAwH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BzgGO
+        AVwB/wGYAWQBQgH/AwAB/wMAAf8DAAH/ATIBIAEUAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BzgGO
+        AVwB/wEKAQUBAgH/gAABbgFwAW4B/wEsASsBLAH/ATQB3wE9Af8BNAHfAT0B/wMAAf8BNAHfAT0B/wE0
+        Ad8BPQH/AwAB/wMAAf8BtQGyAbUJ/wFuAWwBbgH/AwAB/wMAAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHS
+        AZEBXQH/Ac4BjgFcAf8B0QGQAV0B/wHOAY4BXAH/Ac4BjgFcAf8DAAH/AUwBMwEhAf8BrQFyAU0B/wEr
+        ARwBEgH/AwAB/wHOAY4BXAH/Ac4BjgFcAf8BzgGOAVwB/wEKAQUBAgH/gAABbgFwAW4B/wEsASsBLAH/
+        ATQB3wE9Af8BNAHfAT0B/wMAAf8BNAHfAT0B/wE0Ad8BPQH/AwAB/wMAAf8BrQGuAa0J/wFmAWgBZgH/
+        AwAB/wMAAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHRAZABXQH/Ac4BjgFcAf8BkQFfAT8B/wHOAY4BXAH/
+        Ac4BjgFcAf8BPAEnARkB/wEDAQEBAAH/Ac4BjgFcAf8BzgGOAVwB/wMAAf8BQAErARsB/wHOAY4BXAH/
+        Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAErASwB/wEAASMBJAH/AQABKwEsAf8DAAH/AQABKwEs
+        Af8BAAEjASQB/wMAAf8DAAH/Aa0BqgGtCf8BZgFkAWYB/wMAAf8DAAH/AwAB/wELAQYBAwH/Ac4BjgFc
+        Af8BzgGOAVwB/wHOAY4BXAH/AwAB/wGrAXEBSwH/Ac4BjgFcAf8BuQF6AVEB/wMAAf8BzgGOAVwB/wHO
+        AY4BXAH/AQMBAQEAAf8BDwEHAQUB/wHOAY4BXAH/Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAEr
+        ASwB/wEAAZ4BnAH/AQABngGcAf8DAAH/AQABngGcAf8BAAGeAZwB/wETAR8BHBn/ASQBIwEkAf8DAAH/
+        AQsBBgEDAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8DAAH/ARgBDwEJAf8BzgGOAVwB/wHEAYcBWQH/
+        AwAB/wMAAf8DAAH/AwAB/wGHAVcBOQH/Ac4BjgFcAf8BzgGOAVwB/wEKAQUBAgH/gAABbgFwAW4B/wEs
+        ASsBLAH/AQAD/wEAA/8DAAH/AQAD/wEAA/8DABn/ASQBIwEkAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHO
+        AY4BXAH/Ac4BjgFcAf8DAAH/AwAB/wGqAW8BSgH/AZkBZQFDAf8DAAH/AwAB/wGiAWkBRgH/Ac4BjgFc
+        Af8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAErASwB/wEAA/8BAAP/
+        AwAB/wEAA/8BAAP/AwAB/wFVAVABTQH/Ad4B2wHeCf8BtQGyAbUB/wF2AXgBdgH/AQMBBwEDAf8DAAH/
+        AQsBBgEDAf8BzgGOAVwB/wHOAY4BXAH/AZ4BZwFFAf8DAAH/AVwBPQEpAf8BEgELAQYB/wFgAUABKwH/
+        ARoBEQEJAf8BJgEZARAB/wFAASoBGwH/Ac4BjgFcAf8B0QGQAV0B/wHOAY4BXAH/Ac4BjgFcAf8BCgEF
+        AQIB/4AAAW4BcAFuAf8BLAErASwB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BlAGWAZQJ/wG1
+        AbYBtQH/AwAB/wMAAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHOAY4BXAH/AXIBTQE0Af8DAAH/Ac4BjgFc
+        Af8DAAH/AwAB/wFSATcBJQH/Aa4BdAFNAf8DAAH/Ac4BjgFcAf8BzgGOAVwB/wHTAZEBXgH/AdQBkwFf
+        Af8BCgEFAQIB/4AAAZwBmgGcAf8BLAErASwB/wIAAaUB/wIAAaUB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
+        ASwBKwEsEf8BvQG6Ab0B/wMAAf8BCwEGAQMB/wHOAY4BXAH/Ac4BjgFcAf8BQAEqARwB/wMAAf8BzgGO
+        AVwB/wFrAUgBLwH/AwAB/wGDAVUBOQH/Ac4BjgFcAf8DAAH/ATEBHwEVAf8BzgGOAVwB/wHOAY4BXAH/
+        AdQBkwFfAf8BCgEFAQIB/4AAAZQBkgGUAf8BLAErASwB/wIAAv8CAAL/AwAB/wMAAf8DAAH/AwAB/wMA
+        Af8DAAH/AZwBmgGcDf8BlAGWAZQB/wMAAf8BCwEGAQMB/wHOAY4BXAH/Ac4BjgFcAf8BAQIAAf8BIwEX
+        AQ4B/wHOAY4BXAH/Ac4BjgFcAf8DAAH/AZ8BaAFGAf8BzgGOAVwB/wGLAVoBPAH/AwAB/wHOAY4BXAH/
+        Ac4BjgFcAf8BzgGOAVwB/wEKAQUBAgH/gAABpQGmAaUB/wGUAZIBlAH/AgABpQH/AgABtQH/ASwBKwEs
+        Af8BLAErASwB/wEsASsBLAH/ASwBKwEsAf8BLAErASwB/wEsASsBLAH/ASwBLwEsAf8BTQFQAU0B/wGt
+        AaoBrQH/Aa0BqgGtAf8BRQFIAUUB/wMAAf8BCQEFAQIB/wHOAY4BXAH/Ac4BjgFcAf8BcgFMATMB/wGl
+        AW0BSAH/Ac4BjgFcAf8BzgGOAVwB/wGYAWQBQgH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/AW0BSgEx
+        Af8BrgFyAU0B/wHOAY4BXAH/Ac4BjgFcAf8BCQEFAQIB/4AAAd4B2wHeAf8BpQGmAaUB/wGlAaYBpQH/
+        AXYBdAF2Af8BbgFwAW4B/wFuAXABbgH/AW4BcAFuAf8BbgFwAW4B/wFuAXABbgH/AW4BcAFuAf8BbgFw
+        AW4B/wFuAXABbgH/AW4BcAFuAf8BLAErASwB/wEsASsBLAH/AwAF/wEJAQUBAgH/AQoBBgECAf8BCwEG
+        AQMB/wELAQYBAgH/AQoBBgECAf8BCgEGAQIB/wELAQYBAgH/AQsBBgECAf8BCgEGAQIB/wEKAQYBAgH/
+        AQsBBgEDAf8BCwEGAQIB/wEKAQYBAgH/AQkBBQECBf+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEB
+        AQABAQUAAYAXAAP/gQAL
+</value>
+  </data>
+  <data name="tabControl2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>Форматы</value>
+  </data>
+  <data name="tabPage3.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="grpHDCD.Text" xml:space="preserve">
     <value>Параметры</value>
   </data>
+  <data name="grpHDCD.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="chkHDCDDetect.Size" type="System.Drawing.Size, System.Drawing">
     <value>120, 17</value>
   </data>
   <data name="chkHDCDDetect.Text" xml:space="preserve">
     <value>Определять HDCD</value>
   </data>
+  <data name="chkHDCDDetect.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage4.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabControl1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Продвинутые настройки</value>
   </data>
+  <data name="$this.ToolTip" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/Freedb/CDEntry.cs b/Freedb/CDEntry.cs
index fe7b8d7..48dbcb1 100644
--- a/Freedb/CDEntry.cs
+++ b/Freedb/CDEntry.cs
@@ -26,7 +26,7 @@ namespace Freedb
 	/// <summary>
 	/// Summary description for CDEntry.
 	/// </summary>
-	public class CDEntry
+	public class CDEntry : ICloneable
 	{
 
 
@@ -196,6 +196,24 @@ namespace Freedb
 			}
 		}
 
+		public CDEntry(CDEntry src)
+		{
+			m_Discid = src.m_Discid;
+			m_Artist = src.m_Artist;
+			m_Title = src.m_Title;
+			m_Year = src.m_Year;
+			m_Genre = src.m_Genre;
+			m_ExtendedData = src.m_ExtendedData;
+			m_PlayOrder = src.m_PlayOrder;
+			m_Tracks = new TrackCollection();
+			foreach (Track tr in src.m_Tracks)
+				m_Tracks.Add(new Track(tr));
+		}
+
+		public object Clone()
+		{
+			return new CDEntry(this);
+		}
 
 		private bool Parse(StringCollection data)
 		{
diff --git a/Freedb/Track.cs b/Freedb/Track.cs
index bfe4008..dab2251 100644
--- a/Freedb/Track.cs
+++ b/Freedb/Track.cs
@@ -23,7 +23,7 @@ namespace Freedb
 	/// <summary>
 	/// Summary description for Track.
 	/// </summary>
-	public class Track
+	public class Track : ICloneable
 	{
 
 		private string m_Title;
@@ -108,8 +108,21 @@ namespace Freedb
 			m_Title = title;
 			m_ExtendedData = extendedData;
 		}
-	
-	
-	
+
+		/// <summary>
+		/// Create an instance of a Track passing in a track
+		/// </summary>
+		/// <param name="title"></param>
+		public Track(Track src)
+		{
+			m_Title = src.m_Title;
+			m_ExtendedData = src.m_ExtendedData;
+			m_FrameOffset = src.m_FrameOffset;
+		}
+
+		public object Clone()
+		{
+			return new Track(this);
+		}
 	}
 }