diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi
index 3ca73433..82d6eb49 100644
--- a/mk/windoze/Installer/MegaGlestInstaller.nsi
+++ b/mk/windoze/Installer/MegaGlestInstaller.nsi
@@ -13,7 +13,7 @@
 Name "${APNAME} ${APVER}"
 SetCompressor /FINAL /SOLID lzma
 SetCompressorDictSize 64
-OutFile "${APNAME}-Installer-${APVER}_i386_win32.exe"
+OutFile "${APNAME}-Installer-${APVER}_windows_XXbit.exe"
 Icon "..\..\shared\megaglest.ico"
 UninstallIcon "..\..\shared\megaglest.ico"
 !define MUI_ICON "..\..\shared\megaglest.ico"
@@ -226,9 +226,9 @@ Section "${APNAME} (required)"
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   ; Put file there
-  File /NONFATAL "..\megaglest.exe"
-  File /NONFATAL "..\megaglest_editor.exe"
-  File /NONFATAL "..\megaglest_g3dviewer.exe"
+  File /NONFATAL "..\..\..\data\glest_game\megaglest.exe"
+  File /NONFATAL "..\..\..\data\glest_game\megaglest_editor.exe"
+  File /NONFATAL "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
 
   File /NONFATAL "..\megaglestx64.exe"
   File /NONFATAL "..\megaglest_editorx64.exe"
@@ -240,39 +240,37 @@ Section "${APNAME} (required)"
   File "..\glest.ini"
   File "..\..\shared\glestkeys.ini"
   File "..\..\shared\servers.ini"
-  File /NONFATAL "..\openal32.dll"
+  File /NONFATAL "..\..\..\data\glest_game\openal32.dll"
   File /NONFATAL "..\openal64.dll"
   
   File "..\NetworkThrottleFix.reg"
   
-  File /NONFATAL "..\libvlccore.dll"
-  File /NONFATAL "..\libvlc.dll"
-  File /NONFATAL /r /x .git /x .svn /x mydata "..\plugins"
-  File /NONFATAL /r /x .git /x .svn /x mydata "..\lua"
+  #File /NONFATAL "..\libvlccore.dll"
+  #File /NONFATAL "..\libvlc.dll"
+  #File /NONFATAL /r /x .gitignore /x .svn /x mydata "..\plugins"
+  #File /NONFATAL /r /x .gitignore /x .svn /x mydata "..\lua"
   
   SetOutPath "$INSTDIR\blender\"
-  File /NONFATAL "..\xml2g.exe"
-  File /NONFATAL "..\g2xml.exe"
+  #File /NONFATAL "..\..\..\data\glest_game\xml2g.exe"
+  #File /NONFATAL "..\..\..\data\glest_game\g2xml.exe"
 
-  File /NONFATAL "..\xml2gx64.exe"
-  File /NONFATAL "..\g2xmlx64.exe"
+  #File /NONFATAL "..\xml2gx64.exe"
+  #File /NONFATAL "..\g2xmlx64.exe"
 
-  File /r /x .git /x .svn /x mydata /x g2xml /x xml2g "..\..\..\source\tools\glexemel\*.*"
+  File /r /x .gitignore /x .svn /x mydata /x g2xml /x xml2g "..\..\..\source\tools\glexemel\*.py"
   SetOutPath $INSTDIR
 
-  File /r /x .git /x .svn /x mydata /x cegui "..\..\..\data\glest_game\data"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\docs"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\maps"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\scenarios"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\techs"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\tilesets"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\tutorials"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\data"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\docs"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\maps"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\scenarios"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\techs"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\tilesets"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\tutorials"
 
   SetOutPath "$INSTDIR\docs\"
-  File /r /x .git /x .svn /x mydata "..\..\..\docs\*.*"
-  
-  SetOutPath "$INSTDIR\data\core\misc_textures\flags"
-  File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\data\core\misc_textures\flags\*.*"
+  File /r /x .gitignore /x .svn /x mydata "..\..\..\docs\*.*"
+
   SetOutPath $INSTDIR
 
   ; Write the installation path into the registry