diff --git a/Installer/VXMusic.nsi b/Installer/VXMusic.nsi
index c9f3c56..eac38b7 100644
--- a/Installer/VXMusic.nsi
+++ b/Installer/VXMusic.nsi
@@ -40,6 +40,17 @@ Section "MainSection" SEC01
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
    
+   # Create shortcuts
+   # Copy .ico to output folder for shortcuts
+   File "${SOURCE_PATH}\VXMusicDesktop\Images\VXLogoIcon.ico"
+   
+   # Start Menu shortcut
+   CreateDirectory "$SMPROGRAMS\VXMusic"
+   CreateShortcut "$SMPROGRAMS\VXMusic\VXMusic.lnk" "$INSTDIR\VXMusicDesktop.exe" "" "$INSTDIR\VXLogoIcon.ico"
+   
+   # Desktop shortcut
+   CreateShortcut "$DESKTOP\VXMusic.lnk" "$INSTDIR\VXMusicDesktop.exe" "" "$INSTDIR\VXLogoIcon.ico"
+   
    # Create an uninstaller
    WriteUninstaller "$INSTDIR\UninstallVXMusic.exe"
    
@@ -65,6 +76,10 @@ Section "Uninstall"
   
   # Delete AppData
   RMDir /r "${APPDATA_FOLDER}"
+  
+  # Remove shortcuts
+  Delete "$SMPROGRAMS\VXMusic\VXMusic.lnk"
+  Delete "$DESKTOP\VXMusic.lnk"
 SectionEnd
 
 # MUI (Modern User Interface) configuration
diff --git a/VXMusicDesktop/VXMusicDesktop.csproj b/VXMusicDesktop/VXMusicDesktop.csproj
index b56e526..f1cf058 100644
--- a/VXMusicDesktop/VXMusicDesktop.csproj
+++ b/VXMusicDesktop/VXMusicDesktop.csproj
@@ -9,7 +9,7 @@
     <PackageIcon>VXLogo.png</PackageIcon>
     <ApplicationIcon>Images\VXLogoIcon.ico</ApplicationIcon>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <Version>0.6.4.6</Version>
+    <Version>0.6.4.7</Version>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <Title>VXMusicDesktop</Title>
     <Authors>VirtualXtensions</Authors>