diff --git a/RosBE-Windows/RosBE64.nsi b/RosBE-Windows/RosBE64.nsi
index 8697d92..b1ceb14 100644
--- a/RosBE-Windows/RosBE64.nsi
+++ b/RosBE-Windows/RosBE64.nsi
@@ -136,14 +136,14 @@ Section /o "Config Tool" SEC03
     SetOverwrite try
     File /r Root\options.cmd
     IfFileExists "$INSTDIR\RosBE.ps1" 0 +3
-        File /r Root\options.ps1
+        File /r Components\Powershell\options.ps1
     SetOutPath "$INSTDIR\Tools"
     SetOverwrite try
     File /r Components\Tools\options64.exe
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
         CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
         SetOutPath $INSTDIR
-        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options x86-64.lnk" \
+        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options 64-bit.lnk" \
                        "$INSTDIR\Tools\options64.exe"
     !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
@@ -202,9 +202,9 @@ Section Uninstall
     ;;
     ;; Clean up installed files.
     ;;
-    RMDir /r /REBOOTOK "$INSTDIR\x86_64"
-    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe
-    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe
+    RMDir /r /REBOOTOK "$INSTDIR\amd64"
+    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe"
+    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe"
     Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
     ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!!
     RMDir /REBOOTOK "$INSTDIR"