diff --git a/README.md b/README.md
index 7752dca5..979ad84e 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ For Win32:
 * path
 	- apped path to git.exe
 	- apped path to jdk/bin
+	- append path to VisualStudio/Common7/Tools
+	- append path to VisualStudio/Common7/IDE
 
 ##### Botan setup
 
diff --git a/bin/app/data/install/uninstall_wix.bat b/bin/app/data/install/uninstall_wix.bat
index a5fd9c11..b1264152 100644
--- a/bin/app/data/install/uninstall_wix.bat
+++ b/bin/app/data/install/uninstall_wix.bat
@@ -1 +1 @@
-%windir%\system32\msiexec.exe /x {F8BA9656-DE2E-4925-9CF4-C43285A2CA6E}
\ No newline at end of file
+%windir%\system32\msiexec.exe /x {92dd6ab1-78b3-49a7-aa33-338964c20969}
diff --git a/deployment/windows/wixSetup/build.bat b/deployment/windows/wixSetup/build.bat
index b7d33d3b..d75bbfe1 100644
--- a/deployment/windows/wixSetup/build.bat
+++ b/deployment/windows/wixSetup/build.bat
@@ -3,19 +3,27 @@ VERSION_STRING="${VERSION_STRING//-/_}"
 VERSION_STRING="${VERSION_STRING//./_}"
 VERSION_STRING="${VERSION_STRING%_*}"
 VERSION_STRING="${VERSION_STRING//_/.}"
-
 echo "installer version is $VERSION_STRING"
 
+PRODUCT_GUID=$(cmd.exe /c "VsDevCmd.bat & uuidgen")
+echo "product guid is $PRODUCT_GUID"
+
 rm -rf build
 mkdir build
 
+
+
+rm -rf ../../../bin/app/data/install/uninstall_wix.bat
+echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/install/uninstall_wix.bat
+
+
 "devenv.com" Setup/build/Setup.sln //build "Release|x86"
 "devenv.com" CustomActions/CustomActions.sln //build "Release|x86"
 
 rm -rf bin
 mkdir bin
 
-candle.exe -dprojectVersion="$VERSION_STRING" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
+candle.exe -dprojectVersion="$VERSION_STRING" -dprojectGuid="$PRODUCT_GUID" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
 light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
 
 cp -u -r build/coati.msi bin
diff --git a/deployment/windows/wixSetup/coati.wxs b/deployment/windows/wixSetup/coati.wxs
index 4f12d8c4..a13dfff0 100644
--- a/deployment/windows/wixSetup/coati.wxs
+++ b/deployment/windows/wixSetup/coati.wxs
@@ -3,10 +3,10 @@
 
     <Product Name='Coati' 
 			Manufacturer='Coati Software OG'
-			Id='F8BA9656-DE2E-4925-9CF4-C43285A2CA6E'
+			Id='$(var.projectGuid)'
 			UpgradeCode='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'
 			Language='1033' 
-			Codepage='1252' 
+			Codepage='1252'
 			Version='$(var.projectVersion)'>
 
 		<Package Id='*' Keywords='Installer' Description="Coati Installer"
diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh
index 490eb7ae..a69b1db8 100644
--- a/script/deploy_windows.sh
+++ b/script/deploy_windows.sh
@@ -1,7 +1,7 @@
 # FLAGS
-REBUILD=false
-OBFUSCATE=false
-UPDATE_DATABASES=false
+REBUILD=true
+OBFUSCATE=true
+UPDATE_DATABASES=true
 
 
 # USEFUL VARIABLES
@@ -65,9 +65,9 @@ echo -e "$INFO building the executable (app)"
 if [ $UPDATE_DATABASES = true ]; then
 	echo -e "$INFO creating databases"
 
-	rm bin/app/data/projects/tictactoe/tictactoe.coatidb
-	rm bin/app/data/projects/tutorial/tutorial.coatidb
-	rm bin/app/data/projects/javaparser/javaparser.coatidb
+	rm bin/app/user/projects/tictactoe/tictactoe.coatidb
+	rm bin/app/user/projects/tutorial/tutorial.coatidb
+	rm bin/app/user/projects/javaparser/javaparser.coatidb
 	rm -rf temp
 
 	mkdir -p temp
@@ -77,13 +77,13 @@ if [ $UPDATE_DATABASES = true ]; then
 	../bin/app/Release/Coati.exe -z ../script/license.txt
 
 	echo -e "$INFO creating database for tictactie"
-	../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tictactoe/tictactoe.coatiproject -d
+	../bin/app/Release/Coati.exe -p ../bin/app/user/projects/tictactoe/tictactoe.coatiproject -d
 
 	echo -e "$INFO creating database for tutorial"
-	../bin/app/Release/Coati.exe -p ../bin/app/data/projects/tutorial/tutorial.coatiproject -d
+	../bin/app/Release/Coati.exe -p ../bin/app/user/projects/tutorial/tutorial.coatiproject -d
 
 	echo -e "$INFO creating database for javaparser"
-	../bin/app/Release/Coati.exe -p ../bin/app/data/projects/javaparser/javaparser.coatiproject -d
+	../bin/app/Release/Coati.exe -p ../bin/app/user/projects/javaparser/javaparser.coatiproject -d
 
 	cd ..
 	rm -rf temp