diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss
index 48fb78358..b212f81fa 100644
--- a/Source/Installer/Installer.iss
+++ b/Source/Installer/Installer.iss
@@ -29,34 +29,7 @@ Source: "{#BaseDir}\Config\Glide64.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.cht"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.rdx"; DestDir: "{app}\Config"
-Source: "{#BaseDir}\Lang\Brazilian Portuguese.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Bulgarian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Chinese (Simplified).pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Chinese (Taiwan).pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Chinese (Traditional).pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Czech.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Danish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Dutch.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\English.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\English_alternative.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Finnish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\French.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\German.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\German_int.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\German_localised.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Greek.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Hungarian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Italian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Italian_alternative.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Japanese.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Lithuanian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Norwegian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Polish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Russian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Spanish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Swedish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\T-Chinese.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Ukrainian.pj.Lang"; DestDir: "{app}\Lang"
+Source: "{#BaseDir}\Lang\*.pj.Lang"; DestDir: "{app}\Lang"
 Source: "{#BaseDir}\Plugin\Audio\Jabo_Dsound.dll"; DestDir: "{app}\Plugin\Audio"
 Source: "{#BaseDir}\Plugin\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX"
 Source: "{#BaseDir}\Plugin\GFX\PJ64Glide64.dll"; DestDir: "{app}\Plugin\GFX"
diff --git a/Source/Installer/package_zip.bat b/Source/Installer/package_zip.bat
index 023088110..c1a2e3dd6 100644
--- a/Source/Installer/package_zip.bat
+++ b/Source/Installer/package_zip.bat
@@ -5,7 +5,7 @@ cd /d %~dp0..\..\
 SET base_dir=%cd%
 cd /d %current_dir%
 
-rd "%base_dir%\Bin\Package" /Q /S
+rd "%base_dir%\Bin\Package" /Q /S > NUL 2>&1
 md "%base_dir%\Bin\Package"
 md "%base_dir%\Bin\Package\Config"
 md "%base_dir%\Bin\Package\Lang"
@@ -20,34 +20,7 @@ copy "%base_dir%\Config\Glide64.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.cht" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Bin\Package\Config"
-copy "%base_dir%\Lang\Brazilian Portuguese.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Bulgarian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Chinese (Simplified).pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Chinese (Taiwan).pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Chinese (Traditional).pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Czech.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Danish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Dutch.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\English.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\English_alternative.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Finnish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\French.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\German.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\German_int.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\German_localised.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Greek.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Hungarian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Italian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Italian_alternative.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Japanese.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Lithuanian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Norwegian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Polish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Russian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Spanish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Swedish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\T-Chinese.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Ukrainian.pj.Lang" "%base_dir%\Bin\Package\Lang"
+copy "%base_dir%\Lang\*.pj.Lang" "%base_dir%\Bin\Package\Lang"
 copy "%base_dir%\Plugin\Audio\Jabo_Dsound.dll" "%base_dir%\Bin\Package\Plugin\Audio"
 copy "%base_dir%\Plugin\GFX\Jabo_Direct3D8.dll" "%base_dir%\Bin\Package\Plugin\GFX"
 copy "%base_dir%\Plugin\GFX\PJ64Glide64.dll" "%base_dir%\Bin\Package\Plugin\GFX"