diff --git a/make.bat b/make.bat
index e068b12..f400371 100644
--- a/make.bat
+++ b/make.bat
@@ -83,12 +83,27 @@ cd %~dp0
 
 set "IS_NEED_64=0"
 set "IS_NEED_32=0"
+set "IS_NEED_XP_64=0"
+set "IS_NEED_XP_32=0"
+
+if not "%OO_PLATFORM%"=="%OO_PLATFORM:win_64_xp=%" (
+	set "IS_NEED_XP_64=1"
+	set "OO_PLATFORM=%OO_PLATFORM:win_64_xp=%"
+)
+if not "%OO_PLATFORM%"=="%OO_PLATFORM:win_32_xp=%" (
+	set "IS_NEED_XP_32=1"
+	set "OO_PLATFORM=%OO_PLATFORM:win_32_xp=%"
+)
+if not "%OO_PLATFORM%"=="%OO_PLATFORM:xp=%" (
+	set "IS_NEED_XP_64=1"
+	set "IS_NEED_XP_32=1"
+	set "OO_PLATFORM=%OO_PLATFORM:xp=%"
+)
 
 if not "%OO_PLATFORM%"=="%OO_PLATFORM:all=%" (
 	set "IS_NEED_64=1"
 	set "IS_NEED_32=1"
 )
-
 if not "%OO_PLATFORM%"=="%OO_PLATFORM:x64=%" (
 	set "IS_NEED_64=1"
 )
@@ -110,101 +125,106 @@ if not "%OO_PLATFORM%"=="%OO_PLATFORM:native=%" (
 	)
 )
 
+set "QMAKE_FOR_SCRIPTS=%OO_QT_DIR%\msvc2015_64\bin\qmake.exe"
+if not exist "%OO_QT_DIR%\msvc2015_64\bin\qmake.exe" (
+	set "IS_NEED_64=0"
+	set "QMAKE_FOR_SCRIPTS=%OO_QT_DIR%\msvc2015\bin\qmake.exe"
+)
+if not exist "%OO_QT_DIR%\msvc2015\bin\qmake.exe" (
+	set "IS_NEED_32=0"
+	set "QMAKE_FOR_SCRIPTS=%OO_QT_XP_DIR%\msvc2015_64\bin\qmake.exe"
+)
+if not exist "%OO_QT_XP_DIR%\msvc2015_64\bin\qmake.exe" (
+	set "IS_NEED_XP_64=0"
+	set "QMAKE_FOR_SCRIPTS=%OO_QT_XP_DIR%\msvc2015\bin\qmake.exe"
+)
+if not exist "%OO_QT_XP_DIR%\msvc2015\bin\qmake.exe" (
+	set "IS_NEED_XP_32=0"
+)
+
+cd %~dp0
 if "%IS_NEED_64%"=="1" (
-	cd %~dp0
 	call "%OO_VS_DIR%\vcvarsall.bat" x64
 	set "QT_DEPLOY=%OO_QT_DIR%\msvc2015_64\bin"
 	set "OS_DEPLOY=win_64"
+
 	if "%OO_CLEAN%"=="1" (
 		call nmake clean -f "makefiles\build.makefile_win_64"
 		call nmake distclean -f "makefiles\build.makefile_win_64"
 	)
 
-	if exist "!QT_DEPLOY!\qmake.exe" (
-		call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
-		call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
-		call nmake -f "makefiles\build.makefile_win_64" || goto :error
-	) else (
-		echo "ERROR: not found qt: !QT_DEPLOY!"
-	)
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
+	call nmake -f "makefiles\build.makefile_win_64" || goto :error
 
 	del ".qmake.stash"
 )
 
+cd %~dp0
 if "%IS_NEED_32%"=="1" (
-	cd %~dp0
 	call "%OO_VS_DIR%\vcvarsall.bat" x86
 	set "QT_DEPLOY=%OO_QT_DIR%\msvc2015\bin"
 	set "OS_DEPLOY=win_32"
+
 	if "%OO_CLEAN%"=="1" (
 		call nmake clean -f "makefiles\build.makefile_win_32"
 		call nmake distclean -f "makefiles\build.makefile_win_32"
 	)
 
-	if exist "!QT_DEPLOY!\qmake.exe" (
-		call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
-		call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
-		call nmake -f "makefiles\build.makefile_win_32" || goto :error
-	) else (
-		echo "ERROR: not found qt: !QT_DEPLOY!"
-	)
-
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
+	call nmake -f "makefiles\build.makefile_win_32" || goto :error
+	
 	del ".qmake.stash"
 )
 
-if not "%OO_PLATFORM%"=="%OO_PLATFORM:xp=%" (
-
-	cd %~dp0
+cd %~dp0
+if "%IS_NEED_XP_64%"=="1" (
 	del "..\desktop-apps\win-linux\qrc_resources.cpp"
-	
-	if "%IS_NEED_64%"=="1" (
-		call "%OO_VS_DIR%\vcvarsall.bat" x64
-		set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015_64\bin"
-		set "OS_DEPLOY=win_64"
-		if "%OO_CLEAN%"=="1" (
-			call nmake clean -f "makefiles\build.makefile_win_64_xp"
-			call nmake distclean -f "makefiles\build.makefile_win_64_xp"
-		)
 
-		if exist "!QT_DEPLOY!\qmake.exe" (
-			call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
-			call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
-			call nmake -f "makefiles\build.makefile_win_64_xp" || goto :error
-		) else (
-			echo "ERROR: not found qt: !QT_DEPLOY!"
-		)
+	call "%OO_VS_DIR%\vcvarsall.bat" x64
+	set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015_64\bin"
+	set "OS_DEPLOY=win_64"
 
-		del ".qmake.stash"
+	if "%OO_CLEAN%"=="1" (
+		call nmake clean -f "makefiles\build.makefile_win_64_xp"
+		call nmake distclean -f "makefiles\build.makefile_win_64_xp"
 	)
 
-	if "%IS_NEED_32%"=="1" (
-		cd %~dp0
-		call "%OO_VS_DIR%\vcvarsall.bat" x86
-		set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015\bin"
-		set "OS_DEPLOY=win_32"	
-		if "%OO_CLEAN%"=="1" (
-			call nmake clean -f "makefiles\build.makefile_win_32_xp"
-			call nmake distclean -f "makefiles\build.makefile_win_32_xp"
-		)
-
-		if exist "!QT_DEPLOY!\qmake.exe" (
-			call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
-			call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
-			call nmake -f "makefiles\build.makefile_win_32_xp" || goto :error
-		) else (
-			echo "ERROR: not found qt: !QT_DEPLOY!"
-		)
-
-		del ".qmake.stash"
-	)
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
+	call nmake -f "makefiles\build.makefile_win_64_xp" || goto :error
 	
-	cd %~dp0
+	del ".qmake.stash"
+
+	del "..\desktop-apps\win-linux\qrc_resources.cpp"
+)
+
+cd %~dp0
+if "%IS_NEED_XP_32%"=="1" (
+	del "..\desktop-apps\win-linux\qrc_resources.cpp"
+
+	call "%OO_VS_DIR%\vcvarsall.bat" x86
+	set "QT_DEPLOY=%OO_QT_XP_DIR%\msvc2015\bin"
+	set "OS_DEPLOY=win_32"
+
+	if "%OO_CLEAN%"=="1" (
+		call nmake clean -f "makefiles\build.makefile_win_32_xp"
+		call nmake distclean -f "makefiles\build.makefile_win_32_xp"
+	)
+
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build_clean.pro
+	call "!QT_DEPLOY!\qmake" -nocache %~dp0build.pro "CONFIG+=%OO_CONFIG% %OO_MODULE% build_xp %CONFIG_ADDON%" "%QMAKE_ADDON%" || goto :error
+	call nmake -f "makefiles\build.makefile_win_32_xp" || goto :error
+	
+	del ".qmake.stash"
+
 	del "..\desktop-apps\win-linux\qrc_resources.cpp"
 )
 
 if "%OO_NO_BUILD_JS%"=="" (
 	call "%OO_VS_DIR%\vcvarsall.bat" x64
-	call "%OO_QT_DIR%\msvc2015_64\bin\qmake" -nocache %~dp0scripts\build_js.pro "CONFIG+=%OO_MODULE%"
+	call "%QMAKE_FOR_SCRIPTS%" -nocache %~dp0scripts\build_js.pro "CONFIG+=%OO_MODULE%"
 )
 
 if "%OO_DEPLOY%"=="1" (
diff --git a/scripts/deploy.pro b/scripts/deploy.pro
index 5370479..cab3a84 100644
--- a/scripts/deploy.pro
+++ b/scripts/deploy.pro
@@ -12,8 +12,10 @@ OS_CURRENT=$$(OS_DEPLOY)
 QT_CURRENT=$$(QT_DEPLOY)
 
 APPS_POSTFIX=$$OS_CURRENT
+OS_CURRENT_DEPLOY=$$OS_CURRENT
 build_xp {
 	APPS_POSTFIX=$$join(APPS_POSTFIX, APPS_POSTFIX, "", "_xp")
+	OS_CURRENT_DEPLOY=$$join(OS_CURRENT_DEPLOY, OS_CURRENT_DEPLOY, "", "_xp")
 }
 core_windows {
 	APPS_POSTFIX=$$join(APPS_POSTFIX, APPS_POSTFIX, "", ".exe")
@@ -32,16 +34,11 @@ isEmpty(PUBLISHER_NAME) {
 }
 
 createDirectory($$DEPLOY_DIR)
-createDirectory($$DEPLOY_DIR/$$OS_CURRENT)
-createDirectory($$DEPLOY_DIR/$$OS_CURRENT/$$PUBLISHER_NAME)
+createDirectory($$DEPLOY_DIR/$$OS_CURRENT_DEPLOY)
+createDirectory($$DEPLOY_DIR/$$OS_CURRENT_DEPLOY/$$PUBLISHER_NAME)
 
 JS_ROOT=$$DEPLOY_DIR/js/$$PUBLISHER_NAME
-DEPLOY_DIR=$$DEPLOY_DIR/$$OS_CURRENT/$$PUBLISHER_NAME
-
-build_xp {
-	DEPLOY_DIR=$$DEPLOY_DIR/xp
-	createDirectory($$DEPLOY_DIR)
-}
+DEPLOY_DIR=$$DEPLOY_DIR/$$OS_CURRENT_DEPLOY/$$PUBLISHER_NAME
 
 desktop {