diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini b/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini
index dc1453568..cd847263b 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/Launcher/Notepad3Portable.ini
@@ -1,6 +1,6 @@
 ;Full details: http://portableapps.com/manuals/PortableApps.comLauncher/
 [Launch]
-ProgramExecutable=Notepad3\Notepad3.exe
+ProgramExecutable=Notepad3\x86\Notepad3.exe
 ProgramExecutable64=Notepad3\x64\Notepad3.exe
 DirectoryMoveOK=yes
 SupportsUNC=yes
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
index 755f1625c..5597416b5 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer.ini
@@ -5,6 +5,11 @@
 [CopyLocalFiles]
 [DownloadFiles]
 [Languages]
+ENGLISH=true
+ENGLISHGB=true
+AFRIKAANS=true
+FRENCH=true
+GERMAN=true
 [DirectoriesToPreserve]
 [DirectoriesToRemove]
 [FilesToPreserve]
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
index a522fc622..fda147e31 100644
--- a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
@@ -66,9 +66,9 @@
 ;CustomCodeUses7zip=
 
 [Languages]
-;ENGLISH=true
-;ENGLISHGB=true
-;AFRIKAANS=true
+ENGLISH=true
+ENGLISHGB=true
+AFRIKAANS=true
 ;ALBANIAN=true
 ;ARABIC=true
 ;ARMENIAN=true
@@ -88,10 +88,10 @@
 ;ESTONIAN=true
 ;FARSI=true
 ;FINNISH=true
-;FRENCH=true
+FRENCH=true
 ;GALICIAN=true
 ;GEORGIAN=true
-;GERMAN=true
+GERMAN=true
 ;GREEK=true
 ;HEBREW=true
 ;HUNGARIAN=true
diff --git a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini
index 5ab183cb9..5b9767a40 100644
Binary files a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini and b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/minipath.ini b/np3portableapp/Notepad3Portable/App/Notepad3/minipath.ini
deleted file mode 100644
index 279b4089e..000000000
Binary files a/np3portableapp/Notepad3Portable/App/Notepad3/minipath.ini and /dev/null differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/x64/minipath.ini b/np3portableapp/Notepad3Portable/App/Notepad3/x64/minipath.ini
deleted file mode 100644
index 279b4089e..000000000
Binary files a/np3portableapp/Notepad3Portable/App/Notepad3/x64/minipath.ini and /dev/null differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/np3/Notepad3.ini b/np3portableapp/Notepad3Portable/App/Notepad3/x86/np3/Notepad3.ini
similarity index 100%
rename from np3portableapp/Notepad3Portable/App/Notepad3/np3/Notepad3.ini
rename to np3portableapp/Notepad3Portable/App/Notepad3/x86/np3/Notepad3.ini
diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi
index a39cf3387..ec9929919 100644
--- a/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi
+++ b/np3portableapp/Notepad3Portable/Other/Source/Notepad3.nsi
@@ -23,16 +23,16 @@
 Name "Notepad3"
 OutFile "Notepad3.exe"
 Caption "Notepad3 | PortableApps.com"
-VIProductVersion "2.0.2.436"
+VIProductVersion "4.18.516.992"
 VIAddVersionKey ProductName "Notepad3"
 VIAddVersionKey Comments "A notepad replacement"
 VIAddVersionKey CompanyName "Rizonesoft"
 VIAddVersionKey LegalCopyright "Derick Payne"
 VIAddVersionKey FileDescription "Based on code from Notepad2, ® Florian Balmer 1996-2011"
-VIAddVersionKey FileVersion "2.0.2.436"
-VIAddVersionKey ProductVersion "2.0.2.436"
+VIAddVersionKey FileVersion "4.18.516.992"
+VIAddVersionKey ProductVersion "4.18.516.992"
 VIAddVersionKey InternalName "Notepad3"
-VIAddVersionKey LegalTrademarks "Rizonesoft® 2008-2016"
+VIAddVersionKey LegalTrademarks "Rizonesoft® 2008-2018"
 VIAddVersionKey OriginalFilename "Notepad3.exe"
 ;VIAddVersionKey PrivateBuild ""
 ;VIAddVersionKey SpecialBuild ""
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
index 7a91a22ac..6f8679aa5 100644
--- a/np3portableapp/build_np3portableapp.cmd
+++ b/np3portableapp/build_np3portableapp.cmd
@@ -35,6 +35,8 @@ set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\Portab
 set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
 set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
 
+set NP3_LANGUAGE_SET=af-AF de-DE en-UK es-ES fr-FR
+
 set NP3_DISTRIB_DIR=%SCRIPT_DIR%..\Build
 set NP3_WIN32_DIR=%SCRIPT_DIR%..\Bin\Release_x86_v141
 set NP3_X64_DIR=%SCRIPT_DIR%..\Bin\Release_x64_v141
@@ -75,20 +77,36 @@ if defined FILEVER set VERSION=%FILEVER%
 copy "%NP3_DISTRIB_DIR%\Notepad3.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\Notepad3.ini" /Y /V
 copy "%NP3_DISTRIB_DIR%\minipath.ini" "%NP3_PORTAPP_DIR%\App\DefaultData\settings\minipath.ini" /Y /V
 
-copy /B "%NP3_WIN32_DIR%\Notepad3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V
-copy /B "%NP3_WIN32_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V
-copy /B "%NP3_WIN32_DIR%\np3encrypt.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V
-copy /B "%NP3_WIN32_DIR%\ced.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V
+for /d %%d in (%NP3_LANGUAGE_SET%) do (
+  mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\%%d"
+  copy /B "%NP3_WIN32_DIR%\%%d\*" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\%%d\" /Y /V
+)
+copy /B "%NP3_WIN32_DIR%\np3lng.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+
+copy /B "%NP3_WIN32_DIR%\Notepad3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+copy /B "%NP3_WIN32_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+copy /B "%NP3_WIN32_DIR%\np3encrypt.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+copy /B "%NP3_WIN32_DIR%\ced.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /Y /V
+
 ::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\86\client.wyc" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V
 ::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\86\wyUpdate.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\" /Y /V
 
+
+for /d %%d in (%NP3_LANGUAGE_SET%) do (
+  mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\x64\%%d"
+  copy /B "%NP3_X64_DIR%\%%d\*" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\%%d\" /Y /V
+)
+copy /B "%NP3_X64_DIR%\np3lng.dll" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
+
 copy /B "%NP3_X64_DIR%\Notepad3.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 copy /B "%NP3_X64_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 copy /B "%NP3_X64_DIR%\np3encrypt.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 copy /B "%NP3_X64_DIR%\ced.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
+
 ::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\client.wyc" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 ::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\wyUpdate.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
 
+
 call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP3_PORTAPP_INFO%_tmp.ini"
 
 :: DEVNAME need some mor PortableApps preparation, so set empty for now