diff --git a/installer/config/config.xml b/installer/config/config_mac.xml
similarity index 71%
rename from installer/config/config.xml
rename to installer/config/config_mac.xml
index 5ba02ca..8cef738 100644
--- a/installer/config/config.xml
+++ b/installer/config/config_mac.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>PA Calculator</Name>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <Title>PA Calculator Installer</Title>
     <Publisher>DKM-Tech</Publisher>
     <StartMenuDir>DKM-Tech</StartMenuDir>
-    <TargetDir>/Applications/PA Calculator</TargetDir>
+    <TargetDir>@ApplicationsDir@/PA Calculator</TargetDir>
 </Installer>
diff --git a/installer/config/config_win.xml b/installer/config/config_win.xml
new file mode 100644
index 0000000..02f276f
--- /dev/null
+++ b/installer/config/config_win.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Installer>
+    <Name>PA Calculator</Name>
+    <Version>1.2.0</Version>
+    <Title>PA Calculator Installer</Title>
+    <Publisher>DKM-Tech</Publisher>
+    <StartMenuDir>DKM-Tech</StartMenuDir>
+    <TargetDir>@ApplicationsDirX64@/PA Calculator</TargetDir>
+</Installer>
diff --git a/installer/createInstaller_mac.sh b/installer/createInstaller_mac.sh
index 5750539..8a3a2b1 100755
--- a/installer/createInstaller_mac.sh
+++ b/installer/createInstaller_mac.sh
@@ -15,7 +15,7 @@ if [[ -e $fileName ]]; then
 	rm -rf packages/com.dkmtech.pacalculator/data
 	mkdir packages/com.dkmtech.pacalculator/data
 	cp -R 'PA Calculator.app' 'packages/com.dkmtech.pacalculator/data/PA Calculator.app'
-	binarycreator -c config/config.xml -p packages 'Install PA Calculator'
+	binarycreator -c config/config_mac.xml -p packages 'Install PA Calculator'
 	rm -rf 'PA Calculator.app'
 	hdiutil create -srcfolder "Install PA Calculator.app" setup64bit.dmg
 	rm -rf "Install PA Calculator.app"
diff --git a/installer/createInstaller_win.bat b/installer/createInstaller_win.bat
new file mode 100644
index 0000000..556568d
--- /dev/null
+++ b/installer/createInstaller_win.bat
@@ -0,0 +1,20 @@
+@echo off
+del /s /q setup64bit.exe
+echo "Ändern Sie alle notwendigen Einstellungen!"
+packages\com.dkmtech.pacalculator\meta\package.xml
+cd ..
+FOR /F "tokens=* USEBACKQ" %%F IN (`dir /b *-Release`) DO (
+set releaseFolder=%%F
+)
+cd %releaseFolder%\Release
+del /s /q  ..\..\installer\packages\com.dkmtech.pacalculator\data\*
+mkdir ..\..\installer\packages\com.dkmtech.pacalculator\data\setup
+copy "PA Calculator.exe" "..\..\installer\packages\com.dkmtech.pacalculator\data\setup\PA Calculator.exe"
+cd ..\..\installer\packages\com.dkmtech.pacalculator\data\setup
+windeployqt --translations de,en "PA Calculator.exe"
+7z a -r ../setup *
+cd ..
+rmdir /s /q setup
+cd ..\..\..\
+binarycreator -c config\config_win.xml -p packages setup64bit.exe
+del /s packages\com.dkmtech.pacalculator\data\setup.7z
\ No newline at end of file
diff --git a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs
index 9ad78af..11cdf9c 100644
--- a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs
+++ b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs
@@ -11,8 +11,8 @@ Component.prototype.createOperations = function()
             try {
                 var userProfile = installer.environmentVariable("USERPROFILE");
                 installer.setValue("UserProfile", userProfile);
-                component.addOperation("CreateShortcut", "@TargetDir@\\PA_Calculator.exe", "@UserProfile@\\Desktop\\PA Calculator.lnk");
-                component.addOperation("CreateShortcut", "@TargetDir@\\PA_Calculator.exe", "@StartMenuDir@/PA Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator");
+                component.addOperation("CreateShortcut", "@TargetDir@\\PA Calculator.exe", "@UserProfile@\\Desktop\\PA Calculator.lnk");
+                component.addOperation("CreateShortcut", "@TargetDir@\\PA Calculator.exe", "@StartMenuDir@/PA Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator");
             } catch (e) {
                 // Do nothing if key doesn't exist
             }