diff --git a/MSI/MSICA b/MSI/MSICA
index 830befb..45cbc9a 160000
--- a/MSI/MSICA
+++ b/MSI/MSICA
@@ -1 +1 @@
-Subproject commit 830befb8da217efacbb69107e247b9ccb633863c
+Subproject commit 45cbc9ac150c22798e35fc0a066acaf486644079
diff --git a/Updater b/Updater
index 5ae6dd5..62a7d4e 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 5ae6dd56c26ef749e328addd3fdb5e487cea9d43
+Subproject commit 62a7d4e715aad8227c50a783b5eebb7b49dd8001
diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj
index 0a4b730..228e372 100644
--- a/ZRCola/ZRCola.vcxproj
+++ b/ZRCola/ZRCola.vcxproj
@@ -114,7 +114,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -137,7 +137,7 @@
     <ClCompile Include="zrcolaupdater.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.h" />
     <ClInclude Include="zrcolaabout.h" />
     <ClInclude Include="zrcolaapp.h" />
     <ClInclude Include="zrcolachrcatpnl.h" />
diff --git a/ZRCola/ZRCola.vcxproj.filters b/ZRCola/ZRCola.vcxproj.filters
index 66efdc9..b8c155a 100644
--- a/ZRCola/ZRCola.vcxproj.filters
+++ b/ZRCola/ZRCola.vcxproj.filters
@@ -19,7 +19,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="zrcolaapp.cpp">
@@ -63,7 +63,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="zrcolaapp.h">
diff --git a/ZRCola/stdafx.cpp b/ZRCola/pch.cpp
similarity index 94%
rename from ZRCola/stdafx.cpp
rename to ZRCola/pch.cpp
index dedf4f6..941cae8 100644
--- a/ZRCola/stdafx.cpp
+++ b/ZRCola/pch.cpp
@@ -1,20 +1,20 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pch.h"
diff --git a/ZRCola/stdafx.h b/ZRCola/pch.h
similarity index 96%
rename from ZRCola/stdafx.h
rename to ZRCola/pch.h
index 47c4b5b..74ed64f 100644
--- a/ZRCola/stdafx.h
+++ b/ZRCola/pch.h
@@ -1,66 +1,66 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../include/version.h"
-#include "zrcolaabout.h"
-#include "zrcolaapp.h"
-#include "zrcolachrcatpnl.h"
-#include "zrcolachrgrid.h"
-#include "zrcolachrreq.h"
-#include "zrcolacomppnl.h"
-#include "zrcolafrm.h"
-#include "zrcolakeyhndlr.h"
-#include "zrcolasettings.h"
-#include "zrcolatranseq.h"
-#include "zrcolaupdater.h"
-
-#include <Updater/chkthread.h>
-
-#include <wxex/common.h>
-#include <wxex/url.h>
-#include <wxex/persist/auimanager.h>
-#include <wxex/persist/toplevel.h>
-
-#include <wx/clipbrd.h>
-#include <wx/dcclient.h>
-#include <wx/ffile.h>
-#include <wx/msgdlg.h>
-#include <wx/persist.h>
-#include <wx/persist/toplevel.h>
-#include <wx/socket.h>
-#include <wx/tokenzr.h>
-#include <wx/utils.h>
-#include <wx/valtext.h>
-
-#include <WinStd/MSI.h>
-
-#include <fstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <stdex/idrec.h>
-
-#if defined(__WXMSW__)
-#include <Msi.h>
-#include <ShObjIdl.h>
-#include <ShlGuid.h>
-#endif
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "../include/version.h"
+#include "zrcolaabout.h"
+#include "zrcolaapp.h"
+#include "zrcolachrcatpnl.h"
+#include "zrcolachrgrid.h"
+#include "zrcolachrreq.h"
+#include "zrcolacomppnl.h"
+#include "zrcolafrm.h"
+#include "zrcolakeyhndlr.h"
+#include "zrcolasettings.h"
+#include "zrcolatranseq.h"
+#include "zrcolaupdater.h"
+
+#include <Updater/chkthread.h>
+
+#include <wxex/common.h>
+#include <wxex/url.h>
+#include <wxex/persist/auimanager.h>
+#include <wxex/persist/toplevel.h>
+
+#include <wx/clipbrd.h>
+#include <wx/dcclient.h>
+#include <wx/ffile.h>
+#include <wx/msgdlg.h>
+#include <wx/persist.h>
+#include <wx/persist/toplevel.h>
+#include <wx/socket.h>
+#include <wx/tokenzr.h>
+#include <wx/utils.h>
+#include <wx/valtext.h>
+
+#include <WinStd/MSI.h>
+
+#include <fstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <stdex/idrec.h>
+
+#if defined(__WXMSW__)
+#include <Msi.h>
+#include <ShObjIdl.h>
+#include <ShlGuid.h>
+#endif
diff --git a/ZRCola/res/ZRCola.fbp b/ZRCola/res/ZRCola.fbp
index c314e98..874b22a 100644
--- a/ZRCola/res/ZRCola.fbp
+++ b/ZRCola/res/ZRCola.fbp
@@ -19,7 +19,7 @@
         <property name="name">ZRCola</property>
         <property name="namespace"></property>
         <property name="path">.</property>
-        <property name="precompiled_header">#include &quot;stdafx.h&quot;</property>
+        <property name="precompiled_header">#include &quot;pch.h&quot;</property>
         <property name="relative_path">1</property>
         <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
diff --git a/ZRCola/res/zrcolagui.cpp b/ZRCola/res/zrcolagui.cpp
index 4ee1510..7b1290b 100644
--- a/ZRCola/res/zrcolagui.cpp
+++ b/ZRCola/res/zrcolagui.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "stdafx.h"
+#include "pch.h"
 
 #include "zrcolachrgrid.h"
 
diff --git a/ZRCola/zrcolaabout.cpp b/ZRCola/zrcolaabout.cpp
index 1209696..4a4bf21 100644
--- a/ZRCola/zrcolaabout.cpp
+++ b/ZRCola/zrcolaabout.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp
index 7aa9b55..b9798ce 100644
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 #if defined(__WXMSW__)
 #pragma comment(lib, "msi.lib")
 #endif
diff --git a/ZRCola/zrcolachrcatpnl.cpp b/ZRCola/zrcolachrcatpnl.cpp
index 97d8cfa..1b5d4f5 100644
--- a/ZRCola/zrcolachrcatpnl.cpp
+++ b/ZRCola/zrcolachrcatpnl.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolachrgrid.cpp b/ZRCola/zrcolachrgrid.cpp
index 5613637..79f4d93 100644
--- a/ZRCola/zrcolachrgrid.cpp
+++ b/ZRCola/zrcolachrgrid.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolachrreq.cpp b/ZRCola/zrcolachrreq.cpp
index bc72a52..51f8f6e 100644
--- a/ZRCola/zrcolachrreq.cpp
+++ b/ZRCola/zrcolachrreq.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp
index 68d0a35..28e44d2 100644
--- a/ZRCola/zrcolachrslct.cpp
+++ b/ZRCola/zrcolachrslct.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolacomppnl.cpp b/ZRCola/zrcolacomppnl.cpp
index 747e685..4725150 100644
--- a/ZRCola/zrcolacomppnl.cpp
+++ b/ZRCola/zrcolacomppnl.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp
index 18b06d7..335484b 100644
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index c43751d..f02b2d9 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "stdafx.h"
+#include "pch.h"
 
 #include "zrcolachrgrid.h"
 
diff --git a/ZRCola/zrcolakeyhndlr.cpp b/ZRCola/zrcolakeyhndlr.cpp
index 0b14e41..2d04c00 100644
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolasettings.cpp b/ZRCola/zrcolasettings.cpp
index 1785502..f284964 100644
--- a/ZRCola/zrcolasettings.cpp
+++ b/ZRCola/zrcolasettings.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolatranseq.cpp b/ZRCola/zrcolatranseq.cpp
index 84f9855..67eb849 100644
--- a/ZRCola/zrcolatranseq.cpp
+++ b/ZRCola/zrcolatranseq.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRCola/zrcolaupdater.cpp b/ZRCola/zrcolaupdater.cpp
index c49026e..ab34b2b 100644
--- a/ZRCola/zrcolaupdater.cpp
+++ b/ZRCola/zrcolaupdater.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj
index 460bec7..fcabcb0 100644
--- a/ZRColaCompile/ZRColaCompile.vcxproj
+++ b/ZRColaCompile/ZRColaCompile.vcxproj
@@ -49,7 +49,7 @@
     <ClCompile Include="dbsource.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="parse.cpp" />
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
@@ -57,7 +57,7 @@
   <ItemGroup>
     <ClInclude Include="dbsource.h" />
     <ClInclude Include="parse.h" />
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lib\libZRColaUI\build\libZRColaUI.vcxproj">
diff --git a/ZRColaCompile/ZRColaCompile.vcxproj.filters b/ZRColaCompile/ZRColaCompile.vcxproj.filters
index 6ef14e2..e09b487 100644
--- a/ZRColaCompile/ZRColaCompile.vcxproj.filters
+++ b/ZRColaCompile/ZRColaCompile.vcxproj.filters
@@ -19,7 +19,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -33,7 +33,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="dbsource.h">
diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp
index f95339b..6a30e06 100644
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 using namespace std;
 using namespace stdex;
diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index 47a9006..91b861e 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 using namespace std;
 using namespace stdex;
diff --git a/ZRColaCompile/parse.cpp b/ZRColaCompile/parse.cpp
index 85e98df..111602f 100644
--- a/ZRColaCompile/parse.cpp
+++ b/ZRColaCompile/parse.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 using namespace std;
 using namespace stdex;
diff --git a/ZRColaInstall/stdafx.cpp b/ZRColaCompile/pch.cpp
similarity index 94%
rename from ZRColaInstall/stdafx.cpp
rename to ZRColaCompile/pch.cpp
index dedf4f6..941cae8 100644
--- a/ZRColaInstall/stdafx.cpp
+++ b/ZRColaCompile/pch.cpp
@@ -1,20 +1,20 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pch.h"
diff --git a/ZRColaCompile/stdafx.h b/ZRColaCompile/pch.h
similarity index 96%
rename from ZRColaCompile/stdafx.h
rename to ZRColaCompile/pch.h
index 43b313d..81ec980 100644
--- a/ZRColaCompile/stdafx.h
+++ b/ZRColaCompile/pch.h
@@ -1,56 +1,56 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../include/version.h"
-#include "dbsource.h"
-#include "parse.h"
-
-#include <wx/app.h>
-#include <wx/cmdline.h>
-#include <wx/config.h>
-#include <wx/intl.h>
-
-#include <wxex/common.h>
-#include <wxex/comutils.h>
-
-#include <stdex/idrec.h>
-
-#include <WinStd/Common.h>
-
-#include <initguid.h> // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...)
-#pragma warning(push)
-#pragma warning(disable: 4091)
-#include <adoint.h>
-#include <adoid.h>
-#pragma warning(pop)
-
-#include <process.h>
-#include <tchar.h>
-
-#include <stdlib.h>
-
-#include <algorithm>
-#include <codecvt>
-#include <cwctype>
-#include <fstream>
-#include <memory>
-#include <set>
-#include <vector>
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "../include/version.h"
+#include "dbsource.h"
+#include "parse.h"
+
+#include <wx/app.h>
+#include <wx/cmdline.h>
+#include <wx/config.h>
+#include <wx/intl.h>
+
+#include <wxex/common.h>
+#include <wxex/comutils.h>
+
+#include <stdex/idrec.h>
+
+#include <WinStd/Common.h>
+
+#include <initguid.h> // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...)
+#pragma warning(push)
+#pragma warning(disable: 4091)
+#include <adoint.h>
+#include <adoid.h>
+#pragma warning(pop)
+
+#include <process.h>
+#include <tchar.h>
+
+#include <stdlib.h>
+
+#include <algorithm>
+#include <codecvt>
+#include <cwctype>
+#include <fstream>
+#include <memory>
+#include <set>
+#include <vector>
diff --git a/ZRColaInstall/ZRColaInstall.props b/ZRColaInstall/ZRColaInstall.props
index 06ca785..a016a6c 100644
--- a/ZRColaInstall/ZRColaInstall.props
+++ b/ZRColaInstall/ZRColaInstall.props
@@ -32,13 +32,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRColaInstall.rc" />
diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj.filters b/ZRColaInstall/ZRColaInstallDe.vcxproj.filters
index cd37c3b..82069d8 100644
--- a/ZRColaInstall/ZRColaInstallDe.vcxproj.filters
+++ b/ZRColaInstall/ZRColaInstallDe.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -23,7 +23,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj.filters b/ZRColaInstall/ZRColaInstallEn.vcxproj.filters
index cd37c3b..82069d8 100644
--- a/ZRColaInstall/ZRColaInstallEn.vcxproj.filters
+++ b/ZRColaInstall/ZRColaInstallEn.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -23,7 +23,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj.filters b/ZRColaInstall/ZRColaInstallRu.vcxproj.filters
index cd37c3b..82069d8 100644
--- a/ZRColaInstall/ZRColaInstallRu.vcxproj.filters
+++ b/ZRColaInstall/ZRColaInstallRu.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -23,7 +23,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj.filters b/ZRColaInstall/ZRColaInstallSl.vcxproj.filters
index cd37c3b..82069d8 100644
--- a/ZRColaInstall/ZRColaInstallSl.vcxproj.filters
+++ b/ZRColaInstall/ZRColaInstallSl.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -23,7 +23,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/ZRColaInstall/main.cpp b/ZRColaInstall/main.cpp
index 72613b0..bdc3d04 100644
--- a/ZRColaInstall/main.cpp
+++ b/ZRColaInstall/main.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 ///
diff --git a/ZRColaCompile/stdafx.cpp b/ZRColaInstall/pch.cpp
similarity index 94%
rename from ZRColaCompile/stdafx.cpp
rename to ZRColaInstall/pch.cpp
index dedf4f6..941cae8 100644
--- a/ZRColaCompile/stdafx.cpp
+++ b/ZRColaInstall/pch.cpp
@@ -1,20 +1,20 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pch.h"
diff --git a/ZRColaInstall/stdafx.h b/ZRColaInstall/pch.h
similarity index 97%
rename from ZRColaInstall/stdafx.h
rename to ZRColaInstall/pch.h
index 0d2a1b6..0162690 100644
--- a/ZRColaInstall/stdafx.h
+++ b/ZRColaInstall/pch.h
@@ -1,22 +1,22 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <Windows.h>
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <Windows.h>
diff --git a/include/common.props b/include/common.props
index c467f03..30f2b92 100644
--- a/include/common.props
+++ b/include/common.props
@@ -37,7 +37,7 @@
       <WarningLevel>Level4</WarningLevel>
       <PreprocessorDefinitions>NTDDI_VERSION=NTDDI_WINXP;_WIN32_WINNT=_WIN32_WINNT_WINXP;wxMSVC_VERSION=$(PlatformToolsetVersion);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <StringPooling>true</StringPooling>
       <DisableSpecificWarnings>4100;4505</DisableSpecificWarnings>
diff --git a/lib/libZRCola/build/libZRCola.vcxproj b/lib/libZRCola/build/libZRCola.vcxproj
index b1507dc..741351a 100644
--- a/lib/libZRCola/build/libZRCola.vcxproj
+++ b/lib/libZRCola/build/libZRCola.vcxproj
@@ -31,7 +31,7 @@
     <ClCompile Include="..\src\common.cpp" />
     <ClCompile Include="..\src\language.cpp" />
     <ClCompile Include="..\src\mapping.cpp" />
-    <ClCompile Include="..\src\stdafx.cpp">
+    <ClCompile Include="..\src\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -48,7 +48,7 @@
     <ClInclude Include="..\include\zrcola\language.h" />
     <ClInclude Include="..\include\zrcola\tag.h" />
     <ClInclude Include="..\include\zrcola\translate.h" />
-    <ClInclude Include="..\src\stdafx.h" />
+    <ClInclude Include="..\src\pch.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}</ProjectGuid>
diff --git a/lib/libZRCola/build/libZRCola.vcxproj.filters b/lib/libZRCola/build/libZRCola.vcxproj.filters
index dbad8fd..4546b17 100644
--- a/lib/libZRCola/build/libZRCola.vcxproj.filters
+++ b/lib/libZRCola/build/libZRCola.vcxproj.filters
@@ -11,7 +11,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\stdafx.cpp">
+    <ClCompile Include="..\src\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\mapping.cpp">
@@ -34,7 +34,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\stdafx.h">
+    <ClInclude Include="..\src\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\zrcola\common.h">
diff --git a/lib/libZRCola/src/character.cpp b/lib/libZRCola/src/character.cpp
index b5e54d2..f80d47a 100644
--- a/lib/libZRCola/src/character.cpp
+++ b/lib/libZRCola/src/character.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 const ZRCola::chrcatid_t ZRCola::chrcatid_t::blank = {};
diff --git a/lib/libZRCola/src/common.cpp b/lib/libZRCola/src/common.cpp
index 9466bd7..47d6a3c 100644
--- a/lib/libZRCola/src/common.cpp
+++ b/lib/libZRCola/src/common.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 const ZRCola::langid_t ZRCola::langid_t::blank = {};
diff --git a/lib/libZRCola/src/language.cpp b/lib/libZRCola/src/language.cpp
index ece09a5..dacaabf 100644
--- a/lib/libZRCola/src/language.cpp
+++ b/lib/libZRCola/src/language.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 #ifdef _WIN32
diff --git a/lib/libZRCola/src/mapping.cpp b/lib/libZRCola/src/mapping.cpp
index abadcbc..6de3f8f 100644
--- a/lib/libZRCola/src/mapping.cpp
+++ b/lib/libZRCola/src/mapping.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 size_t ZRCola::mapping_vector::to_src(_In_ size_t dst) const
diff --git a/lib/libZRCola/src/stdafx.cpp b/lib/libZRCola/src/pch.cpp
similarity index 94%
rename from lib/libZRCola/src/stdafx.cpp
rename to lib/libZRCola/src/pch.cpp
index dedf4f6..941cae8 100644
--- a/lib/libZRCola/src/stdafx.cpp
+++ b/lib/libZRCola/src/pch.cpp
@@ -1,20 +1,20 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pch.h"
diff --git a/lib/libZRCola/src/stdafx.h b/lib/libZRCola/src/pch.h
similarity index 96%
rename from lib/libZRCola/src/stdafx.h
rename to lib/libZRCola/src/pch.h
index 5579c4b..3487263 100644
--- a/lib/libZRCola/src/stdafx.h
+++ b/lib/libZRCola/src/pch.h
@@ -1,32 +1,32 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../../../include/version.h"
-
-#include "../include/zrcola/character.h"
-#include "../include/zrcola/language.h"
-#include "../include/zrcola/translate.h"
-#include "../include/zrcola/tag.h"
-
-#include <assert.h>
-
-#include <algorithm>
-#include <cwctype>
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "../../../include/version.h"
+
+#include "../include/zrcola/character.h"
+#include "../include/zrcola/language.h"
+#include "../include/zrcola/translate.h"
+#include "../include/zrcola/tag.h"
+
+#include <assert.h>
+
+#include <algorithm>
+#include <cwctype>
diff --git a/lib/libZRCola/src/tag.cpp b/lib/libZRCola/src/tag.cpp
index 691fab1..5446042 100644
--- a/lib/libZRCola/src/tag.cpp
+++ b/lib/libZRCola/src/tag.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 bool ZRCola::chrtag_db::Search(_In_ const std::map<tagid_t, unsigned __int16> &tags, _In_ const character_db &ch_db, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<std::wstring, charrank_t> &hits, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const
diff --git a/lib/libZRCola/src/translate.cpp b/lib/libZRCola/src/translate.cpp
index c41ad59..57cf685 100644
--- a/lib/libZRCola/src/translate.cpp
+++ b/lib/libZRCola/src/translate.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 void ZRCola::translation_db::Translate(_In_ transetid_t set, _In_z_count_(inputMax) const wchar_t* input, _In_ size_t inputMax, _Out_ std::wstring &output, _Out_opt_ std::vector<mapping>* map) const
diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj b/lib/libZRColaUI/build/libZRColaUI.vcxproj
index 3445a5b..9c1b118 100644
--- a/lib/libZRColaUI/build/libZRColaUI.vcxproj
+++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj
@@ -28,7 +28,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\keyboard.cpp" />
-    <ClCompile Include="..\src\stdafx.cpp">
+    <ClCompile Include="..\src\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -41,7 +41,7 @@
     <ClInclude Include="..\include\zrcolaui\chargroup.h" />
     <ClInclude Include="..\include\zrcolaui\common.h" />
     <ClInclude Include="..\include\zrcolaui\keyboard.h" />
-    <ClInclude Include="..\src\stdafx.h" />
+    <ClInclude Include="..\src\pch.h" />
   </ItemGroup>
   <ItemGroup>
     <POCompile Include="..\locale\de_DE.po" />
diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters
index 0b939fc..d4e9cb8 100644
--- a/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters
+++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj.filters
@@ -18,7 +18,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\stdafx.cpp">
+    <ClCompile Include="..\src\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\keyboard.cpp">
@@ -26,7 +26,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\stdafx.h">
+    <ClInclude Include="..\src\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\zrcolaui\common.h">
diff --git a/lib/libZRColaUI/src/keyboard.cpp b/lib/libZRColaUI/src/keyboard.cpp
index 26f1b2b..bfff08e 100644
--- a/lib/libZRColaUI/src/keyboard.cpp
+++ b/lib/libZRColaUI/src/keyboard.cpp
@@ -17,7 +17,7 @@
     along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdafx.h"
+#include "pch.h"
 
 
 bool ZRCola::keyseq_db::GetSequenceAsText(_In_count_(seq_len) const keyseq::key_t *seq, _In_ size_t seq_len, _Out_ wxString& str)
diff --git a/lib/libZRColaUI/src/pch.cpp b/lib/libZRColaUI/src/pch.cpp
new file mode 100644
index 0000000..941cae8
--- /dev/null
+++ b/lib/libZRColaUI/src/pch.cpp
@@ -0,0 +1,20 @@
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pch.h"
diff --git a/lib/libZRColaUI/src/stdafx.h b/lib/libZRColaUI/src/pch.h
similarity index 96%
rename from lib/libZRColaUI/src/stdafx.h
rename to lib/libZRColaUI/src/pch.h
index 3635364..854d4df 100644
--- a/lib/libZRColaUI/src/stdafx.h
+++ b/lib/libZRColaUI/src/pch.h
@@ -1,28 +1,28 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../../../include/version.h"
-#include "../include/zrcolaui/chargroup.h"
-#include "../include/zrcolaui/keyboard.h"
-
-#include <wx/translation.h>
-
-#include <assert.h>
+/*
+    Copyright 2015-2019 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "../../../include/version.h"
+#include "../include/zrcolaui/chargroup.h"
+#include "../include/zrcolaui/keyboard.h"
+
+#include <wx/translation.h>
+
+#include <assert.h>
diff --git a/lib/libZRColaUI/src/stdafx.cpp b/lib/libZRColaUI/src/stdafx.cpp
deleted file mode 100644
index dedf4f6..0000000
--- a/lib/libZRColaUI/src/stdafx.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-    Copyright 2015-2019 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "stdafx.h"
diff --git a/lib/stdex b/lib/stdex
index 50cdbee..42cb00a 160000
--- a/lib/stdex
+++ b/lib/stdex
@@ -1 +1 @@
-Subproject commit 50cdbee3aea9928df1b3afa476f0c20b90aee34c
+Subproject commit 42cb00a22a7e41a67c7aace1b5c208f157a5a1bf