diff --git a/stepmania/src/smpackage/onvertThemeDlg.cpp b/stepmania/src/smpackage/onvertThemeDlg.cpp
index 57b7acfd8c..849ca9f9a7 100644
--- a/stepmania/src/smpackage/onvertThemeDlg.cpp
+++ b/stepmania/src/smpackage/onvertThemeDlg.cpp
@@ -143,7 +143,6 @@ void ConvertThemeDlg::OnButtonConvert()
 	RecursiveRename( sThemeDir, "player options", "ScreenPlayerOptions" );
 	RecursiveRename( sThemeDir, "select course content bar", "CourseEntryDisplay bar" );
 	RecursiveRename( sThemeDir, "select course", "ScreenSelectCourse" );
-	RecursiveRename( sThemeDir, "select difficulty", "ScreenSelectDifficulty" );
 	RecursiveRename( sThemeDir, "select difficulty easy header", "ScreenSelectDifficulty info arcade-easy" );
 	RecursiveRename( sThemeDir, "select difficulty easy picture", "ScreenSelectDifficulty picture arcade-easy" );
 	RecursiveRename( sThemeDir, "select difficulty medium header", "ScreenSelectDifficulty info arcade-medium" );
@@ -174,7 +173,7 @@ void ConvertThemeDlg::OnButtonConvert()
 	RecursiveRename( sThemeDir, "select music", "ScreenSelectMusic" );
 	RecursiveRename( sThemeDir, "select player", "ScreenSelectPlayer" );
 	RecursiveRename( sThemeDir, "info dance", "info" );
-	RecursiveRename( sThemeDir, "preview dance", "preview" );
+	RecursiveRename( sThemeDir, "preview dance", "picture" );
 	RecursiveRename( sThemeDir, "select style", "ScreenSelectStyle" );
 	RecursiveRename( sThemeDir, "song options", "ScreenSongOptions" );
 	RecursiveRename( sThemeDir, "menu timer", "MenuTimer" );
diff --git a/stepmania/src/smpackage/smpackage.clw b/stepmania/src/smpackage/smpackage.clw
index 6b312b633e..a5fc351853 100644
--- a/stepmania/src/smpackage/smpackage.clw
+++ b/stepmania/src/smpackage/smpackage.clw
@@ -13,16 +13,16 @@ Class2=CSmpackageDlg
 
 ResourceCount=7
 Resource1=IDR_MAINFRAME
-Resource2=IDD_EXPORTER
+Resource2=IDD_EDIT_INSTALLATIONS
 Class3=CSMPackageInstallDlg
 Class4=CSmpackageExportDlg
-Resource3=IDD_MENU
+Resource3=IDD_EXPORTER
 Class5=EnterName
-Resource4=IDD_INSTALL
+Resource4=IDD_DIALOG_NAME
 Class6=EditInsallations
-Resource5=IDD_EDIT_INSTALLATIONS
+Resource5=IDD_INSTALL
 Class7=MainMenuDlg
-Resource6=IDD_DIALOG_NAME
+Resource6=IDD_MENU
 Class8=ConvertThemeDlg
 Resource7=IDD_CONVERT_THEME