diff --git a/doc/Changelog.html b/doc/Changelog.html
index 67786c7c..932f8734 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -17,6 +17,7 @@ a:visited { color: #0000EE; }
 <h3>LameXP - Version History</h3><br>
 
 <a name="4.06"></a>Changes between v4.05 and v4.06 [<font color="darkred">unreleased</font>]:<br><ul>
+<li>Updated Opus encoder/decoder libraries to v1.0.1 and Opus-Tools to v0.1.5 (2012-09-22)
 <li>Updated Qt runtime libraries to v4.8.3 (2012-09-13), compiled with MSVC 10.0
 <li>Updated MediaInfo to v0.7.60 (2012-09-07), compiled with ICL 12.1.7 and MSVC 10.0
 <li>Fixed a bug with the "Store temporary files in your system's default TEMP director" checkbox
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index b9724e93..12b4c781 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -835,7 +835,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="50"/>
-        <location filename="../../gui/MainWindow.ui" line="4201"/>
+        <location filename="../../gui/MainWindow.ui" line="4207"/>
         <source>Source Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -862,7 +862,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="274"/>
-        <location filename="../../gui/MainWindow.ui" line="4209"/>
+        <location filename="../../gui/MainWindow.ui" line="4215"/>
         <source>Output Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -908,7 +908,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="584"/>
-        <location filename="../../gui/MainWindow.ui" line="4225"/>
+        <location filename="../../gui/MainWindow.ui" line="4231"/>
         <source>Meta Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -949,7 +949,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="762"/>
-        <location filename="../../gui/MainWindow.ui" line="4217"/>
+        <location filename="../../gui/MainWindow.ui" line="4223"/>
         <source>Compression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1040,7 +1040,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="1381"/>
-        <location filename="../../gui/MainWindow.ui" line="4233"/>
+        <location filename="../../gui/MainWindow.ui" line="4239"/>
         <source>Advanced Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1367,7 +1367,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="3188"/>
-        <location filename="../../gui/MainWindow.ui" line="3725"/>
+        <location filename="../../gui/MainWindow.ui" line="3825"/>
         <source>Speech</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1477,109 +1477,109 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3655"/>
+        <location filename="../../gui/MainWindow.ui" line="3742"/>
         <source>Optimize for Signal Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3697"/>
+        <location filename="../../gui/MainWindow.ui" line="3870"/>
         <source>Encoding Complexity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3720"/>
+        <location filename="../../gui/MainWindow.ui" line="3820"/>
         <source>Music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3730"/>
+        <location filename="../../gui/MainWindow.ui" line="3830"/>
         <source>(Undefined)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3738"/>
+        <location filename="../../gui/MainWindow.ui" line="3729"/>
         <source>Frame Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3819"/>
+        <location filename="../../gui/MainWindow.ui" line="3860"/>
         <source>Use Experimental Encoder Perceptual Tuning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3908"/>
+        <location filename="../../gui/MainWindow.ui" line="3914"/>
         <source>Reset Advanced Options </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3974"/>
+        <location filename="../../gui/MainWindow.ui" line="3980"/>
         <source> Encode Now!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4016"/>
-        <location filename="../../gui/MainWindow.ui" line="4184"/>
+        <location filename="../../gui/MainWindow.ui" line="4022"/>
+        <location filename="../../gui/MainWindow.ui" line="4190"/>
         <source>About...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4052"/>
+        <location filename="../../gui/MainWindow.ui" line="4058"/>
         <source> Exit Program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4084"/>
+        <location filename="../../gui/MainWindow.ui" line="4090"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4098"/>
+        <location filename="../../gui/MainWindow.ui" line="4104"/>
         <source>?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4112"/>
+        <location filename="../../gui/MainWindow.ui" line="4118"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4116"/>
+        <location filename="../../gui/MainWindow.ui" line="4122"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4130"/>
+        <location filename="../../gui/MainWindow.ui" line="4136"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4149"/>
+        <location filename="../../gui/MainWindow.ui" line="4155"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4153"/>
+        <location filename="../../gui/MainWindow.ui" line="4159"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4193"/>
+        <location filename="../../gui/MainWindow.ui" line="4199"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4242"/>
+        <location filename="../../gui/MainWindow.ui" line="4248"/>
         <source>Open File(s)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4251"/>
-        <location filename="../../gui/MainWindow.ui" line="4254"/>
+        <location filename="../../gui/MainWindow.ui" line="4257"/>
+        <location filename="../../gui/MainWindow.ui" line="4260"/>
         <source>Visit Official Web-Site</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4263"/>
+        <location filename="../../gui/MainWindow.ui" line="4269"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1192"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1218"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1243"/>
@@ -1587,124 +1587,124 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4272"/>
+        <location filename="../../gui/MainWindow.ui" line="4278"/>
         <source>Open Folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4281"/>
+        <location filename="../../gui/MainWindow.ui" line="4287"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4292"/>
+        <location filename="../../gui/MainWindow.ui" line="4298"/>
         <source>Plastique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4300"/>
+        <location filename="../../gui/MainWindow.ui" line="4306"/>
         <source>Cleanlooks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4308"/>
+        <location filename="../../gui/MainWindow.ui" line="4314"/>
         <source>Windows Vista (&quot;Aero&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4316"/>
+        <location filename="../../gui/MainWindow.ui" line="4322"/>
         <source>Windows Classic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4324"/>
+        <location filename="../../gui/MainWindow.ui" line="4330"/>
         <source>Windows XP (&quot;Luna&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4332"/>
+        <location filename="../../gui/MainWindow.ui" line="4338"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1725"/>
         <source>Disable Update Reminder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4340"/>
+        <location filename="../../gui/MainWindow.ui" line="4346"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1751"/>
         <source>Disable Sound Effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4349"/>
+        <location filename="../../gui/MainWindow.ui" line="4355"/>
         <source>Install WMA Decoder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4357"/>
+        <location filename="../../gui/MainWindow.ui" line="4363"/>
         <source>Disable Nero AAC Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4366"/>
+        <location filename="../../gui/MainWindow.ui" line="4372"/>
         <source>Show DropBox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4387"/>
+        <location filename="../../gui/MainWindow.ui" line="4393"/>
         <source>From File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4396"/>
+        <location filename="../../gui/MainWindow.ui" line="4402"/>
         <source>Encode!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4404"/>
+        <location filename="../../gui/MainWindow.ui" line="4410"/>
         <source>Disable Shell Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4413"/>
+        <location filename="../../gui/MainWindow.ui" line="4419"/>
         <source>Frequently Asked Questions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4422"/>
+        <location filename="../../gui/MainWindow.ui" line="4428"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4431"/>
+        <location filename="../../gui/MainWindow.ui" line="4437"/>
         <source>Translator&apos;s Guide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4440"/>
+        <location filename="../../gui/MainWindow.ui" line="4446"/>
         <source>Help &amp;&amp; Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4449"/>
+        <location filename="../../gui/MainWindow.ui" line="4455"/>
         <source>Open Folder Recursively...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4457"/>
+        <location filename="../../gui/MainWindow.ui" line="4463"/>
         <source>Check for Beta Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4466"/>
+        <location filename="../../gui/MainWindow.ui" line="4472"/>
         <source>Import Cue Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4474"/>
+        <location filename="../../gui/MainWindow.ui" line="4480"/>
         <source>Disable Slow Startup Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4482"/>
+        <location filename="../../gui/MainWindow.ui" line="4488"/>
         <source>Hibernate Computer On Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index d03072c3..7ad315c8 100644
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -835,7 +835,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="50"/>
-        <location filename="../../gui/MainWindow.ui" line="4201"/>
+        <location filename="../../gui/MainWindow.ui" line="4207"/>
         <source>Source Files</source>
         <translation type="unfinished">Pliki źródłowe</translation>
     </message>
@@ -862,7 +862,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="274"/>
-        <location filename="../../gui/MainWindow.ui" line="4209"/>
+        <location filename="../../gui/MainWindow.ui" line="4215"/>
         <source>Output Directory</source>
         <translation type="unfinished">Folder docelowy</translation>
     </message>
@@ -898,7 +898,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="584"/>
-        <location filename="../../gui/MainWindow.ui" line="4225"/>
+        <location filename="../../gui/MainWindow.ui" line="4231"/>
         <source>Meta Data</source>
         <translation type="unfinished">Tagi</translation>
     </message>
@@ -939,7 +939,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="762"/>
-        <location filename="../../gui/MainWindow.ui" line="4217"/>
+        <location filename="../../gui/MainWindow.ui" line="4223"/>
         <source>Compression</source>
         <translation type="unfinished">Kompresja</translation>
     </message>
@@ -990,7 +990,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="1381"/>
-        <location filename="../../gui/MainWindow.ui" line="4233"/>
+        <location filename="../../gui/MainWindow.ui" line="4239"/>
         <source>Advanced Options</source>
         <translation type="unfinished">Opcje zaawansowane</translation>
     </message>
@@ -1367,7 +1367,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="3188"/>
-        <location filename="../../gui/MainWindow.ui" line="3725"/>
+        <location filename="../../gui/MainWindow.ui" line="3825"/>
         <source>Speech</source>
         <translation type="unfinished">Speech</translation>
     </message>
@@ -1478,109 +1478,109 @@
         <translation type="unfinished">Opcje kodera Opus</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3655"/>
+        <location filename="../../gui/MainWindow.ui" line="3742"/>
         <source>Optimize for Signal Type:</source>
         <translation type="unfinished">Optymalizuj dla rodzaju sygnału:</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3697"/>
+        <location filename="../../gui/MainWindow.ui" line="3870"/>
         <source>Encoding Complexity:</source>
         <translation type="unfinished">Złożoność kompresji:</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3720"/>
+        <location filename="../../gui/MainWindow.ui" line="3820"/>
         <source>Music</source>
         <translation type="unfinished">Music</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3730"/>
+        <location filename="../../gui/MainWindow.ui" line="3830"/>
         <source>(Undefined)</source>
         <translation type="unfinished">(Niezdefiniowany)</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3738"/>
+        <location filename="../../gui/MainWindow.ui" line="3729"/>
         <source>Frame Size:</source>
         <translation type="unfinished">Rozmiar ramki:</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3819"/>
+        <location filename="../../gui/MainWindow.ui" line="3860"/>
         <source>Use Experimental Encoder Perceptual Tuning</source>
         <translation type="unfinished">Użyj eksperymentalnej optymalizacji percepcji</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3908"/>
+        <location filename="../../gui/MainWindow.ui" line="3914"/>
         <source>Reset Advanced Options </source>
         <translation type="unfinished">Resetuj opcje zaawansowane </translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3974"/>
+        <location filename="../../gui/MainWindow.ui" line="3980"/>
         <source> Encode Now!</source>
         <translation type="unfinished">Kompresuj!</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4016"/>
-        <location filename="../../gui/MainWindow.ui" line="4184"/>
+        <location filename="../../gui/MainWindow.ui" line="4022"/>
+        <location filename="../../gui/MainWindow.ui" line="4190"/>
         <source>About...</source>
         <translation type="unfinished">Info...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4052"/>
+        <location filename="../../gui/MainWindow.ui" line="4058"/>
         <source> Exit Program</source>
         <translation type="unfinished">Wyjdź z programu</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4084"/>
+        <location filename="../../gui/MainWindow.ui" line="4090"/>
         <source>File</source>
         <translation type="unfinished">Plik</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4098"/>
+        <location filename="../../gui/MainWindow.ui" line="4104"/>
         <source>?</source>
         <translation type="unfinished">?</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4112"/>
+        <location filename="../../gui/MainWindow.ui" line="4118"/>
         <source>View</source>
         <translation type="unfinished">Widok</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4116"/>
+        <location filename="../../gui/MainWindow.ui" line="4122"/>
         <source>Style</source>
         <translation type="unfinished">Styl</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4130"/>
+        <location filename="../../gui/MainWindow.ui" line="4136"/>
         <source>Language</source>
         <translation type="unfinished">Język</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4149"/>
+        <location filename="../../gui/MainWindow.ui" line="4155"/>
         <source>Tools</source>
         <translation type="unfinished">Narzędzia</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4153"/>
+        <location filename="../../gui/MainWindow.ui" line="4159"/>
         <source>Configuration</source>
         <translation type="unfinished">Konfiguracja</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4193"/>
+        <location filename="../../gui/MainWindow.ui" line="4199"/>
         <source>Quit</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4242"/>
+        <location filename="../../gui/MainWindow.ui" line="4248"/>
         <source>Open File(s)...</source>
         <translation type="unfinished">Otwórz plik(i)...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4251"/>
-        <location filename="../../gui/MainWindow.ui" line="4254"/>
+        <location filename="../../gui/MainWindow.ui" line="4257"/>
+        <location filename="../../gui/MainWindow.ui" line="4260"/>
         <source>Visit Official Web-Site</source>
         <translation type="unfinished">Odwiedź oficjalną stronę</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4263"/>
+        <location filename="../../gui/MainWindow.ui" line="4269"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1192"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1218"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1243"/>
@@ -1588,124 +1588,124 @@
         <translation type="unfinished">Sprawdź aktualizacje</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4272"/>
+        <location filename="../../gui/MainWindow.ui" line="4278"/>
         <source>Open Folder...</source>
         <translation type="unfinished">Otwórz folder...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4281"/>
+        <location filename="../../gui/MainWindow.ui" line="4287"/>
         <source>Clear All</source>
         <translation type="unfinished">Wyczyść wszystko</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4292"/>
+        <location filename="../../gui/MainWindow.ui" line="4298"/>
         <source>Plastique</source>
         <translation type="unfinished">Plastique</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4300"/>
+        <location filename="../../gui/MainWindow.ui" line="4306"/>
         <source>Cleanlooks</source>
         <translation type="unfinished">Cleanlooks</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4308"/>
+        <location filename="../../gui/MainWindow.ui" line="4314"/>
         <source>Windows Vista (&quot;Aero&quot;)</source>
         <translation type="unfinished">Windows Vista (&quot;Aero&quot;)</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4316"/>
+        <location filename="../../gui/MainWindow.ui" line="4322"/>
         <source>Windows Classic</source>
         <translation type="unfinished">Windows Classic</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4324"/>
+        <location filename="../../gui/MainWindow.ui" line="4330"/>
         <source>Windows XP (&quot;Luna&quot;)</source>
         <translation type="unfinished">Windows XP (&quot;Luna&quot;)</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4332"/>
+        <location filename="../../gui/MainWindow.ui" line="4338"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1725"/>
         <source>Disable Update Reminder</source>
         <translation type="unfinished">Wyłącz przypominanie o aktualizacji</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4340"/>
+        <location filename="../../gui/MainWindow.ui" line="4346"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1751"/>
         <source>Disable Sound Effects</source>
         <translation type="unfinished">Wyłącz efekty dźwiękowe</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4349"/>
+        <location filename="../../gui/MainWindow.ui" line="4355"/>
         <source>Install WMA Decoder</source>
         <translation type="unfinished">Zainstaluj Dekoder WMA</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4357"/>
+        <location filename="../../gui/MainWindow.ui" line="4363"/>
         <source>Disable Nero AAC Notifications</source>
         <translation type="unfinished">Wyłącz powiadomienia Nero AAC</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4366"/>
+        <location filename="../../gui/MainWindow.ui" line="4372"/>
         <source>Show DropBox</source>
         <translation type="unfinished">Pokaż DropBoxa</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4387"/>
+        <location filename="../../gui/MainWindow.ui" line="4393"/>
         <source>From File...</source>
         <translation type="unfinished">Z pliku...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4396"/>
+        <location filename="../../gui/MainWindow.ui" line="4402"/>
         <source>Encode!</source>
         <translation type="unfinished">Kompresuj!</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4404"/>
+        <location filename="../../gui/MainWindow.ui" line="4410"/>
         <source>Disable Shell Integration</source>
         <translation type="unfinished">Wyłącz integrację z systemem</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4413"/>
+        <location filename="../../gui/MainWindow.ui" line="4419"/>
         <source>Frequently Asked Questions</source>
         <translation type="unfinished">Pytania i Odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4422"/>
+        <location filename="../../gui/MainWindow.ui" line="4428"/>
         <source>Changelog</source>
         <translation type="unfinished">Lista zmian</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4431"/>
+        <location filename="../../gui/MainWindow.ui" line="4437"/>
         <source>Translator&apos;s Guide</source>
         <translation type="unfinished">Przewodnik tłumacza</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4440"/>
+        <location filename="../../gui/MainWindow.ui" line="4446"/>
         <source>Help &amp;&amp; Support</source>
         <translation type="unfinished">Pomoc i Wsparcie</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4449"/>
+        <location filename="../../gui/MainWindow.ui" line="4455"/>
         <source>Open Folder Recursively...</source>
         <translation type="unfinished">Otwórz folder rekurencyjnie...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4457"/>
+        <location filename="../../gui/MainWindow.ui" line="4463"/>
         <source>Check for Beta Updates</source>
         <translation type="unfinished">Sprawdzaj czy jest Beta</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4466"/>
+        <location filename="../../gui/MainWindow.ui" line="4472"/>
         <source>Import Cue Sheet</source>
         <translation type="unfinished">Importuj plik Cue</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4474"/>
+        <location filename="../../gui/MainWindow.ui" line="4480"/>
         <source>Disable Slow Startup Notifications</source>
         <translation type="unfinished">Wyłącz powiadomienia o powolnym starcie</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4482"/>
+        <location filename="../../gui/MainWindow.ui" line="4488"/>
         <source>Hibernate Computer On Shutdown</source>
         <translation type="unfinished">Hibernuj zamiast zamykać</translation>
     </message>
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index fb2fa670..808efaa5 100644
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -836,7 +836,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="50"/>
-        <location filename="../../gui/MainWindow.ui" line="4201"/>
+        <location filename="../../gui/MainWindow.ui" line="4207"/>
         <source>Source Files</source>
         <translation>Källfiler</translation>
     </message>
@@ -863,7 +863,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="274"/>
-        <location filename="../../gui/MainWindow.ui" line="4209"/>
+        <location filename="../../gui/MainWindow.ui" line="4215"/>
         <source>Output Directory</source>
         <translation>Målmapp</translation>
     </message>
@@ -909,7 +909,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="584"/>
-        <location filename="../../gui/MainWindow.ui" line="4225"/>
+        <location filename="../../gui/MainWindow.ui" line="4231"/>
         <source>Meta Data</source>
         <translation>Metadata</translation>
     </message>
@@ -950,7 +950,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="762"/>
-        <location filename="../../gui/MainWindow.ui" line="4217"/>
+        <location filename="../../gui/MainWindow.ui" line="4223"/>
         <source>Compression</source>
         <translation>Komprimering</translation>
     </message>
@@ -1041,7 +1041,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="1381"/>
-        <location filename="../../gui/MainWindow.ui" line="4233"/>
+        <location filename="../../gui/MainWindow.ui" line="4239"/>
         <source>Advanced Options</source>
         <translation>Avancerat</translation>
     </message>
@@ -1368,7 +1368,7 @@
     </message>
     <message>
         <location filename="../../gui/MainWindow.ui" line="3188"/>
-        <location filename="../../gui/MainWindow.ui" line="3725"/>
+        <location filename="../../gui/MainWindow.ui" line="3825"/>
         <source>Speech</source>
         <translation>Tal</translation>
     </message>
@@ -1478,109 +1478,109 @@
         <translation>Opus-alternativ</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3655"/>
+        <location filename="../../gui/MainWindow.ui" line="3742"/>
         <source>Optimize for Signal Type:</source>
         <translation>Optimera för signaltyp:</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3697"/>
+        <location filename="../../gui/MainWindow.ui" line="3870"/>
         <source>Encoding Complexity:</source>
         <translation>Kodningskomplexitet:</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3720"/>
+        <location filename="../../gui/MainWindow.ui" line="3820"/>
         <source>Music</source>
         <translation>Musik</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3730"/>
+        <location filename="../../gui/MainWindow.ui" line="3830"/>
         <source>(Undefined)</source>
         <translation>(Odefinierad)</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3738"/>
+        <location filename="../../gui/MainWindow.ui" line="3729"/>
         <source>Frame Size:</source>
         <translation>Ramstorlek:</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3819"/>
+        <location filename="../../gui/MainWindow.ui" line="3860"/>
         <source>Use Experimental Encoder Perceptual Tuning</source>
         <translation>Använd experimentell perceptuell optimering i kodaren</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3908"/>
+        <location filename="../../gui/MainWindow.ui" line="3914"/>
         <source>Reset Advanced Options </source>
         <translation>Återställ avancerade inställningar </translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="3974"/>
+        <location filename="../../gui/MainWindow.ui" line="3980"/>
         <source> Encode Now!</source>
         <translation>Koda om nu!</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4016"/>
-        <location filename="../../gui/MainWindow.ui" line="4184"/>
+        <location filename="../../gui/MainWindow.ui" line="4022"/>
+        <location filename="../../gui/MainWindow.ui" line="4190"/>
         <source>About...</source>
         <translation>Om...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4052"/>
+        <location filename="../../gui/MainWindow.ui" line="4058"/>
         <source> Exit Program</source>
         <translation>Avsluta LameXP</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4084"/>
+        <location filename="../../gui/MainWindow.ui" line="4090"/>
         <source>File</source>
         <translation>Arkiv</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4098"/>
+        <location filename="../../gui/MainWindow.ui" line="4104"/>
         <source>?</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4112"/>
+        <location filename="../../gui/MainWindow.ui" line="4118"/>
         <source>View</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4116"/>
+        <location filename="../../gui/MainWindow.ui" line="4122"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4130"/>
+        <location filename="../../gui/MainWindow.ui" line="4136"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4149"/>
+        <location filename="../../gui/MainWindow.ui" line="4155"/>
         <source>Tools</source>
         <translation>Verktyg</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4153"/>
+        <location filename="../../gui/MainWindow.ui" line="4159"/>
         <source>Configuration</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4193"/>
+        <location filename="../../gui/MainWindow.ui" line="4199"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4242"/>
+        <location filename="../../gui/MainWindow.ui" line="4248"/>
         <source>Open File(s)...</source>
         <translation>Öppna fil(er)...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4251"/>
-        <location filename="../../gui/MainWindow.ui" line="4254"/>
+        <location filename="../../gui/MainWindow.ui" line="4257"/>
+        <location filename="../../gui/MainWindow.ui" line="4260"/>
         <source>Visit Official Web-Site</source>
         <translation>Besök hemsidan</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4263"/>
+        <location filename="../../gui/MainWindow.ui" line="4269"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1192"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1218"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1243"/>
@@ -1588,124 +1588,124 @@
         <translation>Sök efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4272"/>
+        <location filename="../../gui/MainWindow.ui" line="4278"/>
         <source>Open Folder...</source>
         <translation>Öppna mapp...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4281"/>
+        <location filename="../../gui/MainWindow.ui" line="4287"/>
         <source>Clear All</source>
         <translation>Rensa alla</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4292"/>
+        <location filename="../../gui/MainWindow.ui" line="4298"/>
         <source>Plastique</source>
         <translation>Plastique</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4300"/>
+        <location filename="../../gui/MainWindow.ui" line="4306"/>
         <source>Cleanlooks</source>
         <translation>Cleanlooks</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4308"/>
+        <location filename="../../gui/MainWindow.ui" line="4314"/>
         <source>Windows Vista (&quot;Aero&quot;)</source>
         <translation>Windows Vista (&quot;Aero&quot;)</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4316"/>
+        <location filename="../../gui/MainWindow.ui" line="4322"/>
         <source>Windows Classic</source>
         <translation>Windows Classic</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4324"/>
+        <location filename="../../gui/MainWindow.ui" line="4330"/>
         <source>Windows XP (&quot;Luna&quot;)</source>
         <translation>Windows XP (&quot;Luna&quot;)</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4332"/>
+        <location filename="../../gui/MainWindow.ui" line="4338"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1725"/>
         <source>Disable Update Reminder</source>
         <translation>Inaktivera uppdateringsmeddelande</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4340"/>
+        <location filename="../../gui/MainWindow.ui" line="4346"/>
         <location filename="../../src/Dialog_MainWindow.cpp" line="1751"/>
         <source>Disable Sound Effects</source>
         <translation>Inaktivera ljudeffekter</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4349"/>
+        <location filename="../../gui/MainWindow.ui" line="4355"/>
         <source>Install WMA Decoder</source>
         <translation>Installera WMA-avkodare</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4357"/>
+        <location filename="../../gui/MainWindow.ui" line="4363"/>
         <source>Disable Nero AAC Notifications</source>
         <translation>Inaktivera Nero AAC-meddelanden</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4366"/>
+        <location filename="../../gui/MainWindow.ui" line="4372"/>
         <source>Show DropBox</source>
         <translation>Visa DropBox</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4387"/>
+        <location filename="../../gui/MainWindow.ui" line="4393"/>
         <source>From File...</source>
         <translation>Från fil...</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4396"/>
+        <location filename="../../gui/MainWindow.ui" line="4402"/>
         <source>Encode!</source>
         <translation>Koda om!</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4404"/>
+        <location filename="../../gui/MainWindow.ui" line="4410"/>
         <source>Disable Shell Integration</source>
         <translation>Inaktivera utforskarintegration</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4413"/>
+        <location filename="../../gui/MainWindow.ui" line="4419"/>
         <source>Frequently Asked Questions</source>
         <translation>Vanliga frågor</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4422"/>
+        <location filename="../../gui/MainWindow.ui" line="4428"/>
         <source>Changelog</source>
         <translation>Ändringslogg</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4431"/>
+        <location filename="../../gui/MainWindow.ui" line="4437"/>
         <source>Translator&apos;s Guide</source>
         <translation>Översättningsguide</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4440"/>
+        <location filename="../../gui/MainWindow.ui" line="4446"/>
         <source>Help &amp;&amp; Support</source>
         <translation>Hjälp &amp;&amp; support</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4449"/>
+        <location filename="../../gui/MainWindow.ui" line="4455"/>
         <source>Open Folder Recursively...</source>
         <translation>Öppna mapp rekursivt</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4457"/>
+        <location filename="../../gui/MainWindow.ui" line="4463"/>
         <source>Check for Beta Updates</source>
         <translation>Sök efter beta-uppdateringar</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4466"/>
+        <location filename="../../gui/MainWindow.ui" line="4472"/>
         <source>Import Cue Sheet</source>
         <translation>Importera cue-fil</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4474"/>
+        <location filename="../../gui/MainWindow.ui" line="4480"/>
         <source>Disable Slow Startup Notifications</source>
         <translation>Inaktivera meddelanden om långsam uppstart</translation>
     </message>
     <message>
-        <location filename="../../gui/MainWindow.ui" line="4482"/>
+        <location filename="../../gui/MainWindow.ui" line="4488"/>
         <source>Hibernate Computer On Shutdown</source>
         <translation>Försätt datorn i viloläge vid avslut</translation>
     </message>
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index bc4775e0..13596dca 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>667</width>
-    <height>449</height>
+    <height>443</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1397,8 +1397,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>602</width>
-               <height>1668</height>
+               <width>607</width>
+               <height>1677</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_22">
@@ -3633,7 +3633,7 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="1" column="8" rowspan="3">
+                     <item row="1" column="14" rowspan="3">
                       <spacer name="horizontalSpacer_57">
                        <property name="orientation">
                         <enum>Qt::Horizontal</enum>
@@ -3649,17 +3649,7 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="1" column="1">
-                      <widget class="QLabel" name="label_20">
-                       <property name="text">
-                        <string>Optimize for Signal Type:</string>
-                       </property>
-                       <property name="alignment">
-                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                       </property>
-                      </widget>
-                     </item>
-                     <item row="0" column="1" colspan="6">
+                     <item row="0" column="1" colspan="13">
                       <spacer name="verticalSpacer_33">
                        <property name="orientation">
                         <enum>Qt::Vertical</enum>
@@ -3675,7 +3665,7 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="4" column="1" colspan="7">
+                     <item row="4" column="1" colspan="13">
                       <spacer name="verticalSpacer_34">
                        <property name="orientation">
                         <enum>Qt::Vertical</enum>
@@ -3691,48 +3681,49 @@
                        </property>
                       </spacer>
                      </item>
-                     <item row="1" column="4">
-                      <widget class="QLabel" name="label_21">
-                       <property name="text">
-                        <string>Encoding Complexity:</string>
+                     <item row="2" column="1" colspan="13">
+                      <spacer name="verticalSpacer_35">
+                       <property name="orientation">
+                        <enum>Qt::Vertical</enum>
                        </property>
-                      </widget>
-                     </item>
-                     <item row="1" column="2">
-                      <widget class="QComboBox" name="comboBoxOpusOptimize">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
+                       <property name="sizeType">
+                        <enum>QSizePolicy::Fixed</enum>
                        </property>
-                       <property name="minimumSize">
+                       <property name="sizeHint" stdset="0">
                         <size>
-                         <width>128</width>
-                         <height>0</height>
+                         <width>20</width>
+                         <height>6</height>
                         </size>
                        </property>
-                       <property name="currentIndex">
-                        <number>0</number>
-                       </property>
-                       <item>
-                        <property name="text">
-                         <string>Music</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>Speech</string>
-                        </property>
-                       </item>
-                       <item>
-                        <property name="text">
-                         <string>(Undefined)</string>
-                        </property>
-                       </item>
-                      </widget>
+                      </spacer>
                      </item>
-                     <item row="3" column="1">
+                     <item row="1" column="7">
+                      <spacer name="horizontalSpacer_58">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>1</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="1" column="13">
+                      <spacer name="horizontalSpacer_59">
+                       <property name="orientation">
+                        <enum>Qt::Horizontal</enum>
+                       </property>
+                       <property name="sizeHint" stdset="0">
+                        <size>
+                         <width>1</width>
+                         <height>20</height>
+                        </size>
+                       </property>
+                      </spacer>
+                     </item>
+                     <item row="1" column="8" colspan="2">
                       <widget class="QLabel" name="label_22">
                        <property name="text">
                         <string>Frame Size:</string>
@@ -3742,7 +3733,20 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="3" column="2">
+                     <item row="3" column="8" colspan="2">
+                      <widget class="QLabel" name="label_20">
+                       <property name="enabled">
+                        <bool>false</bool>
+                       </property>
+                       <property name="text">
+                        <string>Optimize for Signal Type:</string>
+                       </property>
+                       <property name="alignment">
+                        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="10" colspan="3">
                       <widget class="QComboBox" name="comboBoxOpusFramesize">
                        <property name="sizePolicy">
                         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -3791,7 +3795,44 @@
                        </item>
                       </widget>
                      </item>
-                     <item row="1" column="5" colspan="2">
+                     <item row="3" column="10" colspan="3">
+                      <widget class="QComboBox" name="comboBoxOpusOptimize">
+                       <property name="enabled">
+                        <bool>false</bool>
+                       </property>
+                       <property name="sizePolicy">
+                        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                         <horstretch>0</horstretch>
+                         <verstretch>0</verstretch>
+                        </sizepolicy>
+                       </property>
+                       <property name="minimumSize">
+                        <size>
+                         <width>128</width>
+                         <height>0</height>
+                        </size>
+                       </property>
+                       <property name="currentIndex">
+                        <number>0</number>
+                       </property>
+                       <item>
+                        <property name="text">
+                         <string>Music</string>
+                        </property>
+                       </item>
+                       <item>
+                        <property name="text">
+                         <string>Speech</string>
+                        </property>
+                       </item>
+                       <item>
+                        <property name="text">
+                         <string>(Undefined)</string>
+                        </property>
+                       </item>
+                      </widget>
+                     </item>
+                     <item row="3" column="3" colspan="4">
                       <widget class="QSpinBox" name="spinBoxOpusComplexity">
                        <property name="sizePolicy">
                         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -3813,7 +3854,7 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="3" column="4" colspan="3">
+                     <item row="1" column="1" colspan="6">
                       <widget class="QCheckBox" name="checkBoxOpusExpAnalysis">
                        <property name="text">
                         <string>Use Experimental Encoder Perceptual Tuning</string>
@@ -3823,47 +3864,12 @@
                        </property>
                       </widget>
                      </item>
-                     <item row="2" column="1" colspan="7">
-                      <spacer name="verticalSpacer_35">
-                       <property name="orientation">
-                        <enum>Qt::Vertical</enum>
+                     <item row="3" column="1" colspan="2">
+                      <widget class="QLabel" name="label_21">
+                       <property name="text">
+                        <string>Encoding Complexity:</string>
                        </property>
-                       <property name="sizeType">
-                        <enum>QSizePolicy::Fixed</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>20</width>
-                         <height>6</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
-                     <item row="1" column="3">
-                      <spacer name="horizontalSpacer_58">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>1</width>
-                         <height>20</height>
-                        </size>
-                       </property>
-                      </spacer>
-                     </item>
-                     <item row="1" column="7">
-                      <spacer name="horizontalSpacer_59">
-                       <property name="orientation">
-                        <enum>Qt::Horizontal</enum>
-                       </property>
-                       <property name="sizeHint" stdset="0">
-                        <size>
-                         <width>1</width>
-                         <height>20</height>
-                        </size>
-                       </property>
-                      </spacer>
+                      </widget>
                      </item>
                     </layout>
                    </item>
diff --git a/res/tools/opusdec.exe b/res/tools/opusdec.exe
index cfce5d6c..eb2d5fbc 100644
Binary files a/res/tools/opusdec.exe and b/res/tools/opusdec.exe differ
diff --git a/res/tools/opusenc_ea7.exe b/res/tools/opusenc_ea7.exe
index 78688045..8c8c2668 100644
Binary files a/res/tools/opusenc_ea7.exe and b/res/tools/opusenc_ea7.exe differ
diff --git a/res/tools/opusenc_std.exe b/res/tools/opusenc_std.exe
index d5fada77..520f29aa 100644
Binary files a/res/tools/opusenc_std.exe and b/res/tools/opusenc_std.exe differ
diff --git a/src/Config.h b/src/Config.h
index a1d31598..b86a9bd5 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI					0
 #define VER_LAMEXP_MINOR_LO					6
 #define VER_LAMEXP_TYPE						Alpha
-#define VER_LAMEXP_PATCH					1
-#define VER_LAMEXP_BUILD					1122
+#define VER_LAMEXP_PATCH					2
+#define VER_LAMEXP_BUILD					1124
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Encoder_Opus.cpp b/src/Encoder_Opus.cpp
index ef9ab38c..d684c66e 100644
--- a/src/Encoder_Opus.cpp
+++ b/src/Encoder_Opus.cpp
@@ -71,15 +71,15 @@ bool OpusEncoder::encode(const QString &sourceFile, const AudioFileModel &metaIn
 		break;
 	}
 
-	switch(m_configOptimizeFor)
-	{
-	case 0:
-		args << "--music";
-		break;
-	case 1:
-		args << "--speech";
-		break;
-	}
+	//switch(m_configOptimizeFor)
+	//{
+	//case 0:
+	//	args << "--music";
+	//	break;
+	//case 1:
+	//	args << "--speech";
+	//	break;
+	//}
 
 	args << "--comp" << QString::number(m_configEncodeComplexity);
 
diff --git a/src/Tools.h b/src/Tools.h
index c778b6da..ab8f701e 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -73,9 +73,9 @@ g_lamexp_tools[] =
 	{"0c019e13450dc664987e21f4e5489d182be7d6d0d81efbbaaf1c78693dfe3e38e0355b93", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287603},
 	{"693dd6f779df70a047c15c2c79350855db38d5b0cd7e529b6877b7c821cfe6addfdd50a4", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603},
 	{"291cedb6a1b213330a9cb508f975ee7132a25aa26770ab91cade50109b4ffb81c9bdd09a", CPU_TYPE_X64_ALL, "oggenc2.x64.exe",  287603},
-	{"34e598fb8fd22275c763a733f8c6e60ac9b8879afcddaa9c3bb6fccc76c06f2109151ef1", CPU_TYPE_ALL_ALL, "opusdec.exe",     20120816},
-	{"8598fdfa74bf265bfea7573aebf383a84d6a3e65f25c86895b022522f1cb1003c904bb8e", CPU_TYPE_ALL_ALL, "opusenc_ea7.exe", 20120816},
-	{"ecee8d291ce0a980ccc588f1778f0c251e47bb247886047d574bc342cca82f4dbdcd81ab", CPU_TYPE_ALL_ALL, "opusenc_std.exe", 20120816},
+	{"0c77eb6dee3193b20b42550e893939439cf1b183390842e754771a96857eac4f4725c3f8", CPU_TYPE_ALL_ALL, "opusdec.exe",     20120922},
+	{"d474d922737eb3b11f1b820591ca0ecba47f9eceb8f244952479ef041d8777fe8eae2ae7", CPU_TYPE_ALL_ALL, "opusenc_ea7.exe", 20120922},
+	{"922ca02eb9fc8cc12f596291ad267a579a58c9baaee0560ff8903a071f9aee78b20c74c9", CPU_TYPE_ALL_ALL, "opusenc_std.exe", 20120922},
 	{"58c2b8bcff8f27bfa8fab8172b80f5da731221d072c7dba4dd3a3d7d6423490a25dc6760", CPU_TYPE_ALL_ALL, "shorten.exe", 361},
 	{"017a0f613a962af0620618019b015d5c54bb3c07cf1023e5fdb9502b652367ebbfaaebbc", CPU_TYPE_ALL_ALL, "sox.exe", 1440},
 	{"48e7f81c024cd17dac0eaeab253aad6b223e72dc80688f7576276b0563209514ff0bb9c8", CPU_TYPE_ALL_ALL, "speexdec.exe", 12},