Index: shortcuts.nsh
===================================================================
--- shortcuts.nsh	(revision 4608)
+++ shortcuts.nsh	(working copy)
@@ -3,23 +3,36 @@
   SetOutPath "$INSTDIR"
   ; Main shortcuts
   CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Spring multiplayer battleroom.lnk" "$INSTDIR\TASClient.exe"
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}\Multiplayer"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Multiplayer\TASClient.lnk" "$INSTDIR\TASClient.exe"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Selectionkeys editor.lnk" "$INSTDIR\SelectionEditor.exe"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Settings.lnk" "$INSTDIR\Settings.exe"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Spring test.lnk" "$INSTDIR\spring.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring.lnk" "$INSTDIR\spring.exe"
 
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  WriteIniStr "$INSTDIR\unknown-files.url" "InternetShortcut" "URL" "http://spring.unknown-files.net"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Spring Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Download Content.lnk" "$INSTDIR\$$INSTDIR\unknown-files.url"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall Spring.lnk" "$INSTDIR\uninst.exe"
 !else
   ; Shortcuts
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall Spring.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Spring Website.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Test Spring.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Multiplayer\TASClient.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Selectionkeys editor.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Settings.lnk"
+  
+  ; delete the old shortcuts if they're present from a prior installation
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Spring test.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Spring multiplayer battleroom.lnk"
   Delete "$SMPROGRAMS\${PRODUCT_NAME}\Selectionkeys editor.lnk"
-  Delete "$SMPROGRAMS\${PRODUCT_NAME}\Settings.lnk"
+
+  ; delete the folders
   RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
+  RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
 
 
 !endif