From bbbc4cdb2785eb5d17f045e42ec5198a0eb1fd26 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Sun, 23 Apr 2017 19:25:28 +0200
Subject: [PATCH] Renamed all "i386" binaries to "i686", which better matches
 the actual supported CPUs.

---
 LameXP_VS2013.vcxproj                         |  52 +++++++++---------
 LameXP_VS2013.vcxproj.filters                 |  52 +++++++++---------
 LameXP_VS2015.vcxproj                         |  52 +++++++++---------
 LameXP_VS2015.vcxproj.filters                 |  52 +++++++++---------
 res/Tools.aften-i386.qrc                      |   2 -
 res/Tools.aften-i686.qrc                      |   2 +
 res/Tools.faad-i386.qrc                       |   2 -
 res/Tools.faad-i686.qrc                       |   2 +
 res/Tools.flac-x86-i386.qrc                   |   2 -
 res/Tools.flac-x86-i686.qrc                   |   2 +
 res/Tools.lame-x86-i386.qrc                   |   2 -
 res/Tools.lame-x86-i686.qrc                   |   2 +
 res/Tools.mac-i386.qrc                        |   2 -
 res/Tools.mac-i686.qrc                        |   2 +
 res/Tools.mediainfo-i386.qrc                  |   2 -
 res/Tools.mediainfo-i686.qrc                  |   2 +
 res/Tools.mpg123-i386.qrc                     |   2 -
 res/Tools.mpg123-i686.qrc                     |   2 +
 res/Tools.oggenc2-i386.qrc                    |   2 -
 res/Tools.oggenc2-i686.qrc                    |   2 +
 res/Tools.opusdec-i386.qrc                    |   2 -
 res/Tools.opusdec-i686.qrc                    |   2 +
 res/Tools.opusenc-i386.qrc                    |   2 -
 res/Tools.opusenc-i686.qrc                    |   2 +
 res/Tools.refalac-i386.qrc                    |   2 -
 res/Tools.refalac-i686.qrc                    |   2 +
 res/Tools.sox-i386.qrc                        |   2 -
 res/Tools.sox-i686.qrc                        |   2 +
 res/Tools.wvunpack-i386.qrc                   |   2 -
 res/Tools.wvunpack-i686.qrc                   |   2 +
 res/tools/{aften.i386.exe => aften.i686.exe}  | Bin
 res/tools/{faad.i386.exe => faad.i686.exe}    | Bin
 .../{flac.x86-i386.exe => flac.x86-i686.exe}  | Bin
 .../{lame.x86-i386.exe => lame.x86-i686.exe}  | Bin
 res/tools/{mac.i386.exe => mac.i686.exe}      | Bin
 ...{mediainfo.i386.exe => mediainfo.i686.exe} | Bin
 .../{mpg123.i386.exe => mpg123.i686.exe}      | Bin
 .../{oggenc2.i386.exe => oggenc2.i686.exe}    | Bin
 .../{opusdec.i386.exe => opusdec.i686.exe}    | Bin
 .../{opusenc.i386.exe => opusenc.i686.exe}    | Bin
 .../{refalac.i386.exe => refalac.i686.exe}    | Bin
 res/tools/{sox.i386.exe => sox.i686.exe}      | Bin
 .../{wvunpack.i386.exe => wvunpack.i686.exe}  | Bin
 src/Config.h                                  |   2 +-
 src/Tools.h                                   |  26 ++++-----
 45 files changed, 144 insertions(+), 144 deletions(-)
 delete mode 100644 res/Tools.aften-i386.qrc
 create mode 100644 res/Tools.aften-i686.qrc
 delete mode 100644 res/Tools.faad-i386.qrc
 create mode 100644 res/Tools.faad-i686.qrc
 delete mode 100644 res/Tools.flac-x86-i386.qrc
 create mode 100644 res/Tools.flac-x86-i686.qrc
 delete mode 100644 res/Tools.lame-x86-i386.qrc
 create mode 100644 res/Tools.lame-x86-i686.qrc
 delete mode 100644 res/Tools.mac-i386.qrc
 create mode 100644 res/Tools.mac-i686.qrc
 delete mode 100644 res/Tools.mediainfo-i386.qrc
 create mode 100644 res/Tools.mediainfo-i686.qrc
 delete mode 100644 res/Tools.mpg123-i386.qrc
 create mode 100644 res/Tools.mpg123-i686.qrc
 delete mode 100644 res/Tools.oggenc2-i386.qrc
 create mode 100644 res/Tools.oggenc2-i686.qrc
 delete mode 100644 res/Tools.opusdec-i386.qrc
 create mode 100644 res/Tools.opusdec-i686.qrc
 delete mode 100644 res/Tools.opusenc-i386.qrc
 create mode 100644 res/Tools.opusenc-i686.qrc
 delete mode 100644 res/Tools.refalac-i386.qrc
 create mode 100644 res/Tools.refalac-i686.qrc
 delete mode 100644 res/Tools.sox-i386.qrc
 create mode 100644 res/Tools.sox-i686.qrc
 delete mode 100644 res/Tools.wvunpack-i386.qrc
 create mode 100644 res/Tools.wvunpack-i686.qrc
 rename res/tools/{aften.i386.exe => aften.i686.exe} (100%)
 rename res/tools/{faad.i386.exe => faad.i686.exe} (100%)
 rename res/tools/{flac.x86-i386.exe => flac.x86-i686.exe} (100%)
 rename res/tools/{lame.x86-i386.exe => lame.x86-i686.exe} (100%)
 rename res/tools/{mac.i386.exe => mac.i686.exe} (100%)
 rename res/tools/{mediainfo.i386.exe => mediainfo.i686.exe} (100%)
 rename res/tools/{mpg123.i386.exe => mpg123.i686.exe} (100%)
 rename res/tools/{oggenc2.i386.exe => oggenc2.i686.exe} (100%)
 rename res/tools/{opusdec.i386.exe => opusdec.i686.exe} (100%)
 rename res/tools/{opusenc.i386.exe => opusenc.i686.exe} (100%)
 rename res/tools/{refalac.i386.exe => refalac.i686.exe} (100%)
 rename res/tools/{sox.i386.exe => sox.i686.exe} (100%)
 rename res/tools/{wvunpack.i386.exe => wvunpack.i686.exe} (100%)

diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj
index b59a2679..a872473e 100644
--- a/LameXP_VS2013.vcxproj
+++ b/LameXP_VS2013.vcxproj
@@ -405,49 +405,49 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Images.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Localization.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.aften-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.aften-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.avs2wav.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.dcaenc.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.elevator.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.gpgv.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.keyring.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mediainfo-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mediainfo-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpcdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mcat.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.shorten.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.speexdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.tag.cpp" />
@@ -457,7 +457,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Tools.wget.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.wma2wav.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.wupdate.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x64.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -1211,7 +1211,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.aften-i386.qrc">
+    <CustomBuild Include="res\Tools.aften-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1307,7 +1307,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.flac-x86-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1367,7 +1367,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.lame-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.lame-x86-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1391,7 +1391,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mac-i386.qrc">
+    <CustomBuild Include="res\Tools.mac-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1415,7 +1415,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mediaInfo-i386.qrc">
+    <CustomBuild Include="res\Tools.mediaInfo-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1475,7 +1475,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mpg123-i386.qrc">
+    <CustomBuild Include="res\Tools.mpg123-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1511,7 +1511,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.oggenc2-i386.qrc">
+    <CustomBuild Include="res\Tools.oggenc2-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1559,7 +1559,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusdec-i386.qrc">
+    <CustomBuild Include="res\Tools.opusdec-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1595,7 +1595,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusenc-i386.qrc">
+    <CustomBuild Include="res\Tools.opusenc-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1619,7 +1619,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.refalac-i386.qrc">
+    <CustomBuild Include="res\Tools.refalac-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1751,7 +1751,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.wvunpack-i386.qrc">
+    <CustomBuild Include="res\Tools.wvunpack-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1787,7 +1787,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.faad-i386.qrc">
+    <CustomBuild Include="res\Tools.faad-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
@@ -1835,7 +1835,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.sox-i386.qrc">
+    <CustomBuild Include="res\Tools.sox-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters
index 711b88eb..453538e1 100644
--- a/LameXP_VS2013.vcxproj.filters
+++ b/LameXP_VS2013.vcxproj.filters
@@ -397,7 +397,7 @@
     <ClCompile Include="src\FileHash.cpp">
       <Filter>Source Files\Misc</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.aften-sse2.cpp">
@@ -421,7 +421,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-sse2.cpp">
@@ -439,19 +439,19 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.mediainfo-sse2.cpp">
@@ -466,7 +466,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp">
@@ -475,7 +475,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp">
@@ -487,7 +487,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-sse2.cpp">
@@ -496,13 +496,13 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-x64.cpp">
@@ -535,13 +535,13 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.wupdate.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x64.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp">
@@ -553,7 +553,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp">
@@ -890,7 +890,7 @@
     <CustomBuild Include="res\Tools.wvunpack-x64.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.aften-i386.qrc">
+    <CustomBuild Include="res\Tools.aften-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.aften-sse2.qrc">
@@ -914,7 +914,7 @@
     <CustomBuild Include="res\Tools.flac-x64-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.flac-x86-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.flac-x86-sse2.qrc">
@@ -932,19 +932,19 @@
     <CustomBuild Include="res\Tools.lame-x64-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.lame-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.lame-x86-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.lame-x86-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mac-i386.qrc">
+    <CustomBuild Include="res\Tools.mac-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.mac-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mediaInfo-i386.qrc">
+    <CustomBuild Include="res\Tools.mediaInfo-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.mediainfo-sse2.qrc">
@@ -959,7 +959,7 @@
     <CustomBuild Include="res\Tools.mpg123-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mpg123-i386.qrc">
+    <CustomBuild Include="res\Tools.mpg123-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.mpg123-sse2.qrc">
@@ -968,7 +968,7 @@
     <CustomBuild Include="res\Tools.oggdec.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.oggenc2-i386.qrc">
+    <CustomBuild Include="res\Tools.oggenc2-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.oggenc2-sse2.qrc">
@@ -980,7 +980,7 @@
     <CustomBuild Include="res\Tools.opusdec-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusdec-i386.qrc">
+    <CustomBuild Include="res\Tools.opusdec-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.opusdec-sse2.qrc">
@@ -989,13 +989,13 @@
     <CustomBuild Include="res\Tools.opusenc-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusenc-i386.qrc">
+    <CustomBuild Include="res\Tools.opusenc-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.opusenc-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.refalac-i386.qrc">
+    <CustomBuild Include="res\Tools.refalac-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.refalac-x64.qrc">
@@ -1028,10 +1028,10 @@
     <CustomBuild Include="res\Tools.wupdate.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.wvunpack-i386.qrc">
+    <CustomBuild Include="res\Tools.wvunpack-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.faad-i386.qrc">
+    <CustomBuild Include="res\Tools.faad-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.faad-sse2.qrc">
@@ -1046,7 +1046,7 @@
     <CustomBuild Include="res\Tools.sox-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.sox-i386.qrc">
+    <CustomBuild Include="res\Tools.sox-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj
index 7d8eef92..7cde5f81 100644
--- a/LameXP_VS2015.vcxproj
+++ b/LameXP_VS2015.vcxproj
@@ -405,49 +405,49 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Images.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Localization.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Sounds.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.aften-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.aften-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.avs2wav.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.dcaenc.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.elevator.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.gpgv.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.keyring.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mediainfo-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mediainfo-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpcdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mcat.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-x64.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.shorten.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-avx.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.speexdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.tag.cpp" />
@@ -457,7 +457,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Tools.wget.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.wma2wav.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.wupdate.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i386.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i686.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x64.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -1211,7 +1211,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.aften-i386.qrc">
+    <CustomBuild Include="res\Tools.aften-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1307,7 +1307,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.flac-x86-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1367,7 +1367,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.lame-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.lame-x86-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1391,7 +1391,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mac-i386.qrc">
+    <CustomBuild Include="res\Tools.mac-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1415,7 +1415,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mediaInfo-i386.qrc">
+    <CustomBuild Include="res\Tools.mediaInfo-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1475,7 +1475,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mpg123-i386.qrc">
+    <CustomBuild Include="res\Tools.mpg123-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1511,7 +1511,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.oggenc2-i386.qrc">
+    <CustomBuild Include="res\Tools.oggenc2-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1559,7 +1559,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusdec-i386.qrc">
+    <CustomBuild Include="res\Tools.opusdec-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1595,7 +1595,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusenc-i386.qrc">
+    <CustomBuild Include="res\Tools.opusenc-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1619,7 +1619,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.refalac-i386.qrc">
+    <CustomBuild Include="res\Tools.refalac-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1751,7 +1751,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.wvunpack-i386.qrc">
+    <CustomBuild Include="res\Tools.wvunpack-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
@@ -1787,7 +1787,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.faad-i386.qrc">
+    <CustomBuild Include="res\Tools.faad-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
@@ -1835,7 +1835,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.sox-i386.qrc">
+    <CustomBuild Include="res\Tools.sox-i686.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters
index 711b88eb..453538e1 100644
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -397,7 +397,7 @@
     <ClCompile Include="src\FileHash.cpp">
       <Filter>Source Files\Misc</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.aften-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.aften-sse2.cpp">
@@ -421,7 +421,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x64-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.flac-x86-sse2.cpp">
@@ -439,19 +439,19 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x64-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.lame-x86-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mac-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.mac-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mediaInfo-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.mediainfo-sse2.cpp">
@@ -466,7 +466,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp">
@@ -475,7 +475,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp">
@@ -487,7 +487,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusdec-sse2.cpp">
@@ -496,13 +496,13 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.opusenc-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.refalac-x64.cpp">
@@ -535,13 +535,13 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.wupdate.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x64.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.faad-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp">
@@ -553,7 +553,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-avx.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i386.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.sox-i686.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.sox-sse2.cpp">
@@ -890,7 +890,7 @@
     <CustomBuild Include="res\Tools.wvunpack-x64.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.aften-i386.qrc">
+    <CustomBuild Include="res\Tools.aften-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.aften-sse2.qrc">
@@ -914,7 +914,7 @@
     <CustomBuild Include="res\Tools.flac-x64-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.flac-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.flac-x86-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.flac-x86-sse2.qrc">
@@ -932,19 +932,19 @@
     <CustomBuild Include="res\Tools.lame-x64-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.lame-x86-i386.qrc">
+    <CustomBuild Include="res\Tools.lame-x86-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.lame-x86-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mac-i386.qrc">
+    <CustomBuild Include="res\Tools.mac-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.mac-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mediaInfo-i386.qrc">
+    <CustomBuild Include="res\Tools.mediaInfo-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.mediainfo-sse2.qrc">
@@ -959,7 +959,7 @@
     <CustomBuild Include="res\Tools.mpg123-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.mpg123-i386.qrc">
+    <CustomBuild Include="res\Tools.mpg123-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.mpg123-sse2.qrc">
@@ -968,7 +968,7 @@
     <CustomBuild Include="res\Tools.oggdec.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.oggenc2-i386.qrc">
+    <CustomBuild Include="res\Tools.oggenc2-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.oggenc2-sse2.qrc">
@@ -980,7 +980,7 @@
     <CustomBuild Include="res\Tools.opusdec-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusdec-i386.qrc">
+    <CustomBuild Include="res\Tools.opusdec-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.opusdec-sse2.qrc">
@@ -989,13 +989,13 @@
     <CustomBuild Include="res\Tools.opusenc-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.opusenc-i386.qrc">
+    <CustomBuild Include="res\Tools.opusenc-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.opusenc-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.refalac-i386.qrc">
+    <CustomBuild Include="res\Tools.refalac-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.refalac-x64.qrc">
@@ -1028,10 +1028,10 @@
     <CustomBuild Include="res\Tools.wupdate.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.wvunpack-i386.qrc">
+    <CustomBuild Include="res\Tools.wvunpack-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.faad-i386.qrc">
+    <CustomBuild Include="res\Tools.faad-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="res\Tools.faad-sse2.qrc">
@@ -1046,7 +1046,7 @@
     <CustomBuild Include="res\Tools.sox-avx.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.sox-i386.qrc">
+    <CustomBuild Include="res\Tools.sox-i686.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/res/Tools.aften-i386.qrc b/res/Tools.aften-i386.qrc
deleted file mode 100644
index 8d504168..00000000
--- a/res/Tools.aften-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/aften.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.aften-i686.qrc b/res/Tools.aften-i686.qrc
new file mode 100644
index 00000000..025298a5
--- /dev/null
+++ b/res/Tools.aften-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/aften.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.faad-i386.qrc b/res/Tools.faad-i386.qrc
deleted file mode 100644
index d929af70..00000000
--- a/res/Tools.faad-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/faad.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.faad-i686.qrc b/res/Tools.faad-i686.qrc
new file mode 100644
index 00000000..9c36c77d
--- /dev/null
+++ b/res/Tools.faad-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/faad.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.flac-x86-i386.qrc b/res/Tools.flac-x86-i386.qrc
deleted file mode 100644
index 0bc81c40..00000000
--- a/res/Tools.flac-x86-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/flac.x86-i386.exe</file></qresource></RCC>
diff --git a/res/Tools.flac-x86-i686.qrc b/res/Tools.flac-x86-i686.qrc
new file mode 100644
index 00000000..9714ce85
--- /dev/null
+++ b/res/Tools.flac-x86-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/flac.x86-i686.exe</file></qresource></RCC>
diff --git a/res/Tools.lame-x86-i386.qrc b/res/Tools.lame-x86-i386.qrc
deleted file mode 100644
index 2529423a..00000000
--- a/res/Tools.lame-x86-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/lame.x86-i386.exe</file></qresource></RCC>
diff --git a/res/Tools.lame-x86-i686.qrc b/res/Tools.lame-x86-i686.qrc
new file mode 100644
index 00000000..a386513c
--- /dev/null
+++ b/res/Tools.lame-x86-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/lame.x86-i686.exe</file></qresource></RCC>
diff --git a/res/Tools.mac-i386.qrc b/res/Tools.mac-i386.qrc
deleted file mode 100644
index c88f1d48..00000000
--- a/res/Tools.mac-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/mac.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.mac-i686.qrc b/res/Tools.mac-i686.qrc
new file mode 100644
index 00000000..99691852
--- /dev/null
+++ b/res/Tools.mac-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/mac.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.mediainfo-i386.qrc b/res/Tools.mediainfo-i386.qrc
deleted file mode 100644
index ce545d04..00000000
--- a/res/Tools.mediainfo-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/mediainfo.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.mediainfo-i686.qrc b/res/Tools.mediainfo-i686.qrc
new file mode 100644
index 00000000..178954b2
--- /dev/null
+++ b/res/Tools.mediainfo-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/mediainfo.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.mpg123-i386.qrc b/res/Tools.mpg123-i386.qrc
deleted file mode 100644
index 787fc1cd..00000000
--- a/res/Tools.mpg123-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/mpg123.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.mpg123-i686.qrc b/res/Tools.mpg123-i686.qrc
new file mode 100644
index 00000000..922d0553
--- /dev/null
+++ b/res/Tools.mpg123-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/mpg123.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.oggenc2-i386.qrc b/res/Tools.oggenc2-i386.qrc
deleted file mode 100644
index 577c9d73..00000000
--- a/res/Tools.oggenc2-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/oggenc2.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.oggenc2-i686.qrc b/res/Tools.oggenc2-i686.qrc
new file mode 100644
index 00000000..55180016
--- /dev/null
+++ b/res/Tools.oggenc2-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/oggenc2.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.opusdec-i386.qrc b/res/Tools.opusdec-i386.qrc
deleted file mode 100644
index d7867870..00000000
--- a/res/Tools.opusdec-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/opusdec.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.opusdec-i686.qrc b/res/Tools.opusdec-i686.qrc
new file mode 100644
index 00000000..7188cdd8
--- /dev/null
+++ b/res/Tools.opusdec-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/opusdec.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.opusenc-i386.qrc b/res/Tools.opusenc-i386.qrc
deleted file mode 100644
index 27ac7916..00000000
--- a/res/Tools.opusenc-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/opusenc.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.opusenc-i686.qrc b/res/Tools.opusenc-i686.qrc
new file mode 100644
index 00000000..ce9c41ae
--- /dev/null
+++ b/res/Tools.opusenc-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/opusenc.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.refalac-i386.qrc b/res/Tools.refalac-i386.qrc
deleted file mode 100644
index f979f634..00000000
--- a/res/Tools.refalac-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/refalac.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.refalac-i686.qrc b/res/Tools.refalac-i686.qrc
new file mode 100644
index 00000000..e5a1be6a
--- /dev/null
+++ b/res/Tools.refalac-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/refalac.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.sox-i386.qrc b/res/Tools.sox-i386.qrc
deleted file mode 100644
index cbab020c..00000000
--- a/res/Tools.sox-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/sox.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.sox-i686.qrc b/res/Tools.sox-i686.qrc
new file mode 100644
index 00000000..aaff7a43
--- /dev/null
+++ b/res/Tools.sox-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/sox.i686.exe</file></qresource></RCC>
diff --git a/res/Tools.wvunpack-i386.qrc b/res/Tools.wvunpack-i386.qrc
deleted file mode 100644
index 8434d957..00000000
--- a/res/Tools.wvunpack-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/wvunpack.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.wvunpack-i686.qrc b/res/Tools.wvunpack-i686.qrc
new file mode 100644
index 00000000..5af5ef1a
--- /dev/null
+++ b/res/Tools.wvunpack-i686.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/wvunpack.i686.exe</file></qresource></RCC>
diff --git a/res/tools/aften.i386.exe b/res/tools/aften.i686.exe
similarity index 100%
rename from res/tools/aften.i386.exe
rename to res/tools/aften.i686.exe
diff --git a/res/tools/faad.i386.exe b/res/tools/faad.i686.exe
similarity index 100%
rename from res/tools/faad.i386.exe
rename to res/tools/faad.i686.exe
diff --git a/res/tools/flac.x86-i386.exe b/res/tools/flac.x86-i686.exe
similarity index 100%
rename from res/tools/flac.x86-i386.exe
rename to res/tools/flac.x86-i686.exe
diff --git a/res/tools/lame.x86-i386.exe b/res/tools/lame.x86-i686.exe
similarity index 100%
rename from res/tools/lame.x86-i386.exe
rename to res/tools/lame.x86-i686.exe
diff --git a/res/tools/mac.i386.exe b/res/tools/mac.i686.exe
similarity index 100%
rename from res/tools/mac.i386.exe
rename to res/tools/mac.i686.exe
diff --git a/res/tools/mediainfo.i386.exe b/res/tools/mediainfo.i686.exe
similarity index 100%
rename from res/tools/mediainfo.i386.exe
rename to res/tools/mediainfo.i686.exe
diff --git a/res/tools/mpg123.i386.exe b/res/tools/mpg123.i686.exe
similarity index 100%
rename from res/tools/mpg123.i386.exe
rename to res/tools/mpg123.i686.exe
diff --git a/res/tools/oggenc2.i386.exe b/res/tools/oggenc2.i686.exe
similarity index 100%
rename from res/tools/oggenc2.i386.exe
rename to res/tools/oggenc2.i686.exe
diff --git a/res/tools/opusdec.i386.exe b/res/tools/opusdec.i686.exe
similarity index 100%
rename from res/tools/opusdec.i386.exe
rename to res/tools/opusdec.i686.exe
diff --git a/res/tools/opusenc.i386.exe b/res/tools/opusenc.i686.exe
similarity index 100%
rename from res/tools/opusenc.i386.exe
rename to res/tools/opusenc.i686.exe
diff --git a/res/tools/refalac.i386.exe b/res/tools/refalac.i686.exe
similarity index 100%
rename from res/tools/refalac.i386.exe
rename to res/tools/refalac.i686.exe
diff --git a/res/tools/sox.i386.exe b/res/tools/sox.i686.exe
similarity index 100%
rename from res/tools/sox.i386.exe
rename to res/tools/sox.i686.exe
diff --git a/res/tools/wvunpack.i386.exe b/res/tools/wvunpack.i686.exe
similarity index 100%
rename from res/tools/wvunpack.i386.exe
rename to res/tools/wvunpack.i686.exe
diff --git a/src/Config.h b/src/Config.h
index f52dd952..596662b7 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO					5
 #define VER_LAMEXP_TYPE						Beta
 #define VER_LAMEXP_PATCH					5
-#define VER_LAMEXP_BUILD					1986
+#define VER_LAMEXP_BUILD					1987
 #define VER_LAMEXP_CONFG					1934
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Tools.h b/src/Tools.h
index 9f71ef59..0d049d23 100644
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -65,48 +65,48 @@ static const struct
 }
 g_lamexp_tools[] =
 {
-	{"4870d7abbc3995dc5ca82147ee33f28c3ee7dc1986fbb0131912effe10c1a209d3f983c5dffd963c31707a5ce39611b4", CPU_TYPE_X86_GEN, "aften.i386.exe", 8, ""},
+	{"4870d7abbc3995dc5ca82147ee33f28c3ee7dc1986fbb0131912effe10c1a209d3f983c5dffd963c31707a5ce39611b4", CPU_TYPE_X86_GEN, "aften.i686.exe", 8, ""},
 	{"fc4e38b11a0f52b68cca79aa2d71c02180b70eb0e592923dee4f0ccf766f1006642369b2178f6a61d1c2506446cc442d", CPU_TYPE_X86_SSX, "aften.sse2.exe", 8, ""},
 	{"b44b1c0e1a8f4633c9bc2e43d0a83ea5edc890e1cccc0054c812d0e64170e5292dc1dfd7430da61b73150831aa16e9c4", CPU_TYPE_X64_ALL, "aften.x64.exe",  8, ""},
 	{"4558728999a05f12fe88566e8308cba0ada200814c2a1bfe2507f49faf8f3994b0d52a829148f5c6321d24faa2718439", CPU_TYPE_ALL_ALL, "avs2wav.exe", 13, ""},
 	{"07834b1b8ecac2f3db79ad048005eca3a284cb759e15d399eb1a560a403122e20db5f08e60319759b8463aeef2410d02", CPU_TYPE_ALL_ALL, "dcaenc.exe", 20120419, ""},
 	{"7c249f507b96967bedabdd7e631638807a7595ebff58eaaadf63530783d515eda9660bc2b1a0457fddae7e3eaef8a074", CPU_TYPE_ALL_ALL, "elevator.exe", UINT_MAX, ""},
-	{"5c4a5cdd708b5857bcb064558be81a2dfb16401e796b296f6eee7c63042acbeae12e1e2f1f3d0fd096eaf73201b54e10", CPU_TYPE_ALL_GEN, "faad.i386.exe", 27, ""},
+	{"5c4a5cdd708b5857bcb064558be81a2dfb16401e796b296f6eee7c63042acbeae12e1e2f1f3d0fd096eaf73201b54e10", CPU_TYPE_ALL_GEN, "faad.i686.exe", 27, ""},
 	{"72447794cf411e1e4ce71facf5f60023f001d203894cf40185a0ee13e144e93d72ac99f2ed30a9168450ce5bf882f99f", CPU_TYPE_ALL_SSX, "faad.sse2.exe", 27, ""},
-	{"735654150f5d123660aa8493d322a7181cfd6d6c3e584a53c94c27a5163659b6aab3dd84230f684f8cec3cb565223482", CPU_TYPE_X86_GEN, "flac.x86-i386.exe", 132, ""},
+	{"735654150f5d123660aa8493d322a7181cfd6d6c3e584a53c94c27a5163659b6aab3dd84230f684f8cec3cb565223482", CPU_TYPE_X86_GEN, "flac.x86-i686.exe", 132, ""},
 	{"2ee22f174131615cf342cb3031a4c93adfff0997d84eb1b6794c133c8f19d109c43e67a3f60638705c7afb93427a07f8", CPU_TYPE_X86_SSX, "flac.x86-sse2.exe", 132, ""},
 	{"323ba94d1d3a8f82f4e5a6adf859d0f11d7b0c69fa0254e620724f879edd9d7017e3d2fa78ffe0a615539d8798606a46", CPU_TYPE_X64_NVX, "flac.x64-sse2.exe", 132, ""},
 	{"db5c8b27f876f797d8e2c7dd6c585cff065174c2a006a1642be2b8339be7d17e49b806534e3c9f2de84e66e997c49df7", CPU_TYPE_X64_AVX, "flac.x64-avx.exe",  132, ""},
 	{"f63e97413e3b3ab23fd690fcd11d27ae104333d0201f34f2445a410b4a50dcf505a744ee7cabec66d9415c27261f175a", CPU_TYPE_ALL_ALL, "gpgv.exe", 1421, ""},
 	{"c66992384b6388a7b68f2659624c150b33ff1cacb0c28c0ab2a3249eca4c31e204953f325403f78c077d1735b275ac12", CPU_TYPE_ALL_ALL, "keyring.gpg", UINT_MAX, ""},
-	{"1dd342ca0aaaa5f84afbf657991d9829fbb4a2794fee36cd60014e1b9028120a8d3577b8a031482e207c4dd266c6b4c3", CPU_TYPE_X86_GEN, "lame.x86-i386.exe", 31002, "Alpha"},
+	{"1dd342ca0aaaa5f84afbf657991d9829fbb4a2794fee36cd60014e1b9028120a8d3577b8a031482e207c4dd266c6b4c3", CPU_TYPE_X86_GEN, "lame.x86-i686.exe", 31002, "Alpha"},
 	{"afb30a68e12ab2647f9694eb51d3b22d0f3cef95deda811c714556203dcc0adbe4b18c406c6af67b0d4af09f5033c77b", CPU_TYPE_X86_SSX, "lame.x86-sse2.exe", 31002, "Alpha"},
 	{"84b66be0c17ff9b642fdb7f04f26c6621381a02b6297d17b36c9c6afa308b72f1dacb3831b41affe56db6b7fb5dbe9ae", CPU_TYPE_X64_NVX, "lame.x64-sse2.exe", 31002, "Alpha" },
 	{"7c8ff93f3c3d89abd36770066c6f2b44f4aecc672e24406991f4035720a42aee2838b4625f9838e088ba05e3cda42d77", CPU_TYPE_X64_AVX, "lame.x64-avx.exe",  31002, "Alpha" },
-	{"51af33a33bd9bde6ca6e9c612346b9c138584de59a92bc14a680729066fd849fd83fe668f79e2a06ffe117f39993d10a", CPU_TYPE_ALL_GEN, "mac.i386.exe", 416, ""},
+	{"51af33a33bd9bde6ca6e9c612346b9c138584de59a92bc14a680729066fd849fd83fe668f79e2a06ffe117f39993d10a", CPU_TYPE_ALL_GEN, "mac.i686.exe", 416, ""},
 	{"117e60cf4445cec0a777d2636091a13c50be5c6ed28afaa75ab09ab4576942f1a8584b36d3abac9db7595dfb0d90207e", CPU_TYPE_ALL_SSX, "mac.sse2.exe", 416, ""},
-	{"872f9dd60c993f12e69741a1ad2ac2b389f40cdb0be65b21ead42c048eda55fe1bec454336227b7bc1230639b15daa1a", CPU_TYPE_X86_GEN, "mediainfo.i386.exe", 794, ""},
+	{"872f9dd60c993f12e69741a1ad2ac2b389f40cdb0be65b21ead42c048eda55fe1bec454336227b7bc1230639b15daa1a", CPU_TYPE_X86_GEN, "mediainfo.i686.exe", 794, ""},
 	{"ca4942a66ebe0c4aec77cbbb7a4190ecb875a2e5ac66f31581b903d681aaa17eada69aa0dc04ffe2daf5033f6158f350", CPU_TYPE_X86_SSX, "mediainfo.sse2.exe", 794, ""},
 	{"41b2445e7ebd360c8a33cc494946e163ace873f3ba2930fba02f1b3aef66830a85c244f76277ee6d9b45dd81d70aff6f", CPU_TYPE_X64_ALL, "mediainfo.x64.exe",  794, ""},
 	{"7e6346a057634ff07b2e1f427035324f7f02100cc996425990f87f71d767fce4c7b101588c7d944ba49cb2d7e51c9bdb", CPU_TYPE_ALL_ALL, "mpcdec.exe", 475, ""},
-	{"412d88c36515c3bf951e1a030396ece09bba67735523350b4aa09f6de29506cb78468f39490d885fb1a768ccec53973a", CPU_TYPE_ALL_GEN, "mpg123.i386.exe", 1240, ""},
+	{"412d88c36515c3bf951e1a030396ece09bba67735523350b4aa09f6de29506cb78468f39490d885fb1a768ccec53973a", CPU_TYPE_ALL_GEN, "mpg123.i686.exe", 1240, ""},
 	{"f2c32c54b4b3ad915955c256dd479b4b02fa102285c1dc9490bb92b8846b447ef316ae5722dd5689b289ae33a8a4fea9", CPU_TYPE_ALL_SSE, "mpg123.sse2.exe", 1240, "" },
 	{"f871b504e0935fa5c3b4c47bc43172d8789ba73b6f9d2ec12308a7c4ac8bfa323c99a334f560e524a03a49c7e586d52a", CPU_TYPE_ALL_AVX, "mpg123.avx.exe",  1240, "" },
 	{"dda88fb66a80c362dfa367d07265eee3dcf8ee959191fc7685163fdee694ece7d84000065de217942749b6859d33fa84", CPU_TYPE_ALL_ALL, "mcat.exe", 101, "" },
 	{"f1f2ea5c9e5539620b706e7af68e543bf7a731afb06ccce3815ab34dad64d697e4d6ffcd187a396619b8b52efe7edf88", CPU_TYPE_ALL_ALL, "oggdec.exe", 1101, ""},
-	{"245181321625445ac42fce31d64bf03872e77e2d0dd3c19d6c17ca2771354f096a6040827dd6d00ffd7342c7dd26168e", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 288135603, "2015"},
+	{"245181321625445ac42fce31d64bf03872e77e2d0dd3c19d6c17ca2771354f096a6040827dd6d00ffd7342c7dd26168e", CPU_TYPE_X86_GEN, "oggenc2.i686.exe", 288135603, "2015"},
 	{"512b8efcd1003a0f67220a450d6ea4466194e8fd49fc090a69b15a858db11499acbf98f984530cd5d37b4b6abdd1c6d8", CPU_TYPE_X86_SSX, "oggenc2.sse2.exe", 288135603, "2015"},
 	{"a07ef67cba5a00d335d07372baf76d4d0573b425afce71a19c1e04eaabbe3f55e60bdd40af5e428224c91df1823eda08", CPU_TYPE_X64_ALL, "oggenc2.x64.exe",  288135603, "2015"},
-	{"07fd935367f5c2ad1d8a3e1d943a0a9c6dc1f701e952a9e0504f270f3d7d6a0279727734d6b32ed6764f4aeed81588b2", CPU_TYPE_ALL_GEN, "opusdec.i386.exe", 20170303, "v1.2-alpha2"},
+	{"07fd935367f5c2ad1d8a3e1d943a0a9c6dc1f701e952a9e0504f270f3d7d6a0279727734d6b32ed6764f4aeed81588b2", CPU_TYPE_ALL_GEN, "opusdec.i686.exe", 20170303, "v1.2-alpha2"},
 	{"2dbb45e592ea61032164dcec5311dd9b27be758a1c9d45baaeeed4f007fc70ee97e79ae471a94998d8c8c7a27ded167d", CPU_TYPE_ALL_SSE, "opusdec.sse2.exe", 20170303, "v1.2-alpha2"},
 	{"ebb476a84799c801bcd6bb4d739f4a7c60dc410f4218966bd70ca6dcc88f6f751f182169649f39dd0f7b775b082a1ccb", CPU_TYPE_ALL_AVX, "opusdec.avx.exe",  20170303, "v1.2-alpha2"},
-	{"9e67df61f628f571614e9a6124ae8e16f656b581c03ebf8d9ed2040e01842ccfe491fc5854fa30e7b2bae9d749a43028", CPU_TYPE_ALL_GEN, "opusenc.i386.exe", 20170303, "v1.2-alpha2"},
+	{"9e67df61f628f571614e9a6124ae8e16f656b581c03ebf8d9ed2040e01842ccfe491fc5854fa30e7b2bae9d749a43028", CPU_TYPE_ALL_GEN, "opusenc.i686.exe", 20170303, "v1.2-alpha2"},
 	{"eff94b85ba4ed94deeb37bb9e31dc836639cf2b90b342016f2958e2918bca818e7e29e0254a51fe3f504c5d08f59ef35", CPU_TYPE_ALL_SSE, "opusenc.sse2.exe", 20170303, "v1.2-alpha2"},
 	{"ba23be797e293ca23f2e2e4208a93e0069732708042b44ff4dc4692b144d8bc9000e22f3337d23d807c518700a15f4f2", CPU_TYPE_ALL_AVX, "opusenc.avx.exe",  20170303, "v1.2-alpha2"},
-	{"37745174e146fedbc62671ab86ffddd3edfc9aa0ebfcfd4bff3331a95b6dda50621478c63f7a0ddf9a365e916758b6d4", CPU_TYPE_X86_ALL, "refalac.i386.exe", 161, ""},
+	{"37745174e146fedbc62671ab86ffddd3edfc9aa0ebfcfd4bff3331a95b6dda50621478c63f7a0ddf9a365e916758b6d4", CPU_TYPE_X86_ALL, "refalac.i686.exe", 161, ""},
 	{"b368f0490cefb80b6ff7eaaf8d6e29f253442375caf11a9405b5b21580ee3a9739fa3f406f69de5ef344fa038b1cbe72", CPU_TYPE_X64_ALL, "refalac.x64.exe",  161, ""},
 	{"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361, ""},
-	{"3206ebd1b1c6e5db422d7a84117a7ba8256208fc7104a6668d8856c1b6407882f25f1f39e37c8e33affb343300937d2e", CPU_TYPE_ALL_GEN, "sox.i386.exe", 1442, ""},
+	{"3206ebd1b1c6e5db422d7a84117a7ba8256208fc7104a6668d8856c1b6407882f25f1f39e37c8e33affb343300937d2e", CPU_TYPE_ALL_GEN, "sox.i686.exe", 1442, ""},
 	{"16a71940aa5e9b393e83cdfb2a4dda4291ea01858f8ba338510013f25f4d7c53b9b5cffb86404ea49ef28e6795182fd5", CPU_TYPE_ALL_SSE, "sox.sse2.exe", 1442, "" },
 	{"25585ca9e2e025d82d93341a9db8527eb0b4ce451dade607f9784a79ed30e050ced0824835d5467aa0bf0c6b8fe08612", CPU_TYPE_ALL_AVX, "sox.avx.exe",  1442, "" },
 	{"5a4261e1b41a59d1a5bc92e1d2766422a67454d77e06ea29af392811b7b4704e0f3e494ab9cb6375ce9e39257867c5ed", CPU_TYPE_ALL_ALL, "speexdec.exe", 12, ""},
@@ -116,7 +116,7 @@ g_lamexp_tools[] =
 	{"0a2c8afb50aac35b80f34be2e2286bbb4f0876c1ad53fed8dc2f679786671eafdc1a244378abcc2c229fc110bb5cdf79", CPU_TYPE_ALL_ALL, "wget.exe", 1180, ""},
 	{"572b9448bf4a338ecb9727951fdfcc5a219cc69896695cc96b9f6b083690e339910e41558968264a38992e45f2be152c", CPU_TYPE_ALL_ALL, "wma2wav.exe", 20111001, ""},
 	{"3d86b30395fba4aa45b529f46940d1757336a518512e24591bfc044e63feea751b47474966e46ac6302cb1b6f27e3cc5", CPU_TYPE_ALL_ALL, "wupdate.exe", 20161016, ""},
-	{"9c742cff64c726b6d9abafcf222c24a7e41d4fa0e44ea962917a91e09c15e52aebc859c1ea028c1c1806702850460e2c", CPU_TYPE_X86_ALL, "wvunpack.i386.exe", 4800, ""},
+	{"9c742cff64c726b6d9abafcf222c24a7e41d4fa0e44ea962917a91e09c15e52aebc859c1ea028c1c1806702850460e2c", CPU_TYPE_X86_ALL, "wvunpack.i686.exe", 4800, ""},
 	{"70382b0a9431ec35f419126a5561252e7d5bc05a8a7912c49c54382a3642309372374977ef9186ccd9b733c64a3428bd", CPU_TYPE_X64_ALL, "wvunpack.x64.exe",  4800, ""},
 	{NULL, NULL, NULL, NULL, NULL}
 };