diff --git a/sm-ssc.nsi b/sm-ssc.nsi
index b5f435412b..69ed0d3e7a 100644
--- a/sm-ssc.nsi
+++ b/sm-ssc.nsi
@@ -295,6 +295,7 @@ Section "Main Section" SecMain
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi"
 	; we may also want to remove the new ones.
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-note"
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-note-3d"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-solo"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-vivid"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-rhythm-p1"
@@ -456,6 +457,7 @@ Section "Main Section" SecMain
 	File "Docs\Changelog_sm5.txt"
 	File "Docs\Changelog_SSCformat.txt"
 	File "Docs\CommandLineArgs.txt"
+	File "Docs\CourseFormat.txt"
 	File /r /x CVS /x .svn "Docs\license-ext"
 	File /r /x CVS /x .svn "Docs\Luadoc"
 	File /r /x CVS /x .svn "Docs\Themerdocs"
@@ -532,21 +534,21 @@ Function ShowAutorun
 	IfFileExists "$R1" show_play_and_reinstall
 
 	show_only_install:
-	GetDlgItem $1 $hwnd 1201 ; Second cutom control
+	GetDlgItem $1 $hwnd 1201 ; Second custom control
 	ShowWindow $1 0
-	GetDlgItem $1 $hwnd 1202 ; Third cutom control
+	GetDlgItem $1 $hwnd 1202 ; Third custom control
 	ShowWindow $1 0
 	Goto done
 
 	show_play_and_reinstall:
-	GetDlgItem $1 $hwnd 1200 ; First cutom control
+	GetDlgItem $1 $hwnd 1200 ; First custom control
 	ShowWindow $1 0
 
 	done:
 
 	; Now show the dialog and wait for it to finish
 	InstallOptions::show
-	
+
 	; Finally fetch the InstallOptions status value (we don't care what it is though)
 	Pop $0
 
@@ -574,7 +576,7 @@ Function LeaveAutorun
 	play_error:
 	MessageBox MB_ICONEXCLAMATION "$(TEXT_IO_COULD_NOT_EXECUTE)"
 	abort
-	
+
 	proceed:
 	GetDlgItem $1 $HWNDPARENT 1 ; Next button
 	ShowWindow $1 1
@@ -741,6 +743,7 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\NoteSkins\dance\default"
 	RMDir /r "$INSTDIR\NoteSkins\dance\Delta"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-note"
+	RMDir /r "$INSTDIR\NoteSkins\dance\midi-note-3d"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-routine-p1"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-routine-p2"
 	RMDir /r "$INSTDIR\NoteSkins\dance\midi-solo"
@@ -751,8 +754,13 @@ Section "Uninstall"
 	RMDir "$INSTDIR\NoteSkins\dance"
 
 	RMDir /r "$INSTDIR\NoteSkins\pump\cmd"
+	RMDir /r "$INSTDIR\NoteSkins\pump\cmd-routine-p1"
+	RMDir /r "$INSTDIR\NoteSkins\pump\cmd-routine-p2"
 	RMDir /r "$INSTDIR\NoteSkins\pump\complex"
 	RMDir /r "$INSTDIR\NoteSkins\pump\default"
+	RMDir /r "$INSTDIR\NoteSkins\pump\frame5p"
+	RMDir /r "$INSTDIR\NoteSkins\pump\newextra"
+	RMDir /r "$INSTDIR\NoteSkins\pump\rhythm"
 	RMDir /r "$INSTDIR\NoteSkins\pump\simple"
 	RMDir "$INSTDIR\NoteSkins\pump"
 
@@ -824,7 +832,7 @@ Section "Uninstall"
 	Delete "$INSTDIR\Program\zlib1.dll"
 	RMDir "$INSTDIR\Program"
 
-	Delete "$INSTDIR\Licenses.txt"
+	Delete "$INSTDIR\Docs\Licenses.txt"
 	RMDir /r "$INSTDIR\Manual"
 !endif
 
diff --git a/src/ProductInfo.h b/src/ProductInfo.h
index e6cd9db7a8..26abef4c1f 100644
--- a/src/ProductInfo.h
+++ b/src/ProductInfo.h
@@ -35,7 +35,7 @@
  * </li></ul>
  */
 #ifndef PRODUCT_VER_BARE
-#define PRODUCT_VER_BARE v5.0 Preview 1a
+#define PRODUCT_VER_BARE v5.0 Preview 2
 #endif
 
 /**
@@ -54,7 +54,7 @@
 #define PRODUCT_VER		PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE)
 #define PRODUCT_ID_VER		PRODUCT_XSTRINGIFY(PRODUCT_ID_VER_BARE)
 
-#define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting"
+#define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmaniawiki.php?title=Video_Driver_Troubleshooting"
 /** @brief The URL to report bugs on the program. */
 #define REPORT_BUG_URL "http://ssc.ajworld.net/sm-ssc/bugtracker/"
 
diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc
index 56c9ce457d..3d2899459d 100644
--- a/src/ProductInfo.inc
+++ b/src/ProductInfo.inc
@@ -5,7 +5,7 @@
 
 ; see ProductInfo.h for use descriptions
 !define PRODUCT_ID "StepMania"
-!define PRODUCT_VER "v5.0 Preview 1a"
+!define PRODUCT_VER "v5.0 Preview 2"
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "ssc"
 
diff --git a/src/archutils/Win32/WindowsResources.rc b/src/archutils/Win32/WindowsResources.rc
index 94d881bd34..91007fdd3a 100644
--- a/src/archutils/Win32/WindowsResources.rc
+++ b/src/archutils/Win32/WindowsResources.rc
@@ -181,8 +181,8 @@ IDI_ICON1               ICON                    "smzip.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,0,0,2
- PRODUCTVERSION 5,0,0,2
+ FILEVERSION 5,0,0,3
+ PRODUCTVERSION 5,0,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -199,12 +199,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "StepMania Team\nhttp://www.stepmania.com/"
             VALUE "FileDescription", "StepMania"
-            VALUE "FileVersion", "5, 0, 0, 2"
-            VALUE "InternalName", "sm-ssc"
+            VALUE "FileVersion", "5, 0, 0, 3"
+            VALUE "InternalName", "sm-ssc v1.3.1"
             VALUE "LegalCopyright", "Copyright © 2001-2011"
             VALUE "OriginalFilename", "StepMania.exe"
             VALUE "ProductName", "StepMania"
-            VALUE "ProductVersion", "5, 0, 0, 2"
+            VALUE "ProductVersion", "5, 0, 0, 3"
         END
     END
     BLOCK "VarFileInfo"