diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am
index fbccb1f1f0..7f6bee5a81 100644
--- a/stepmania/src/Makefile.am
+++ b/stepmania/src/Makefile.am
@@ -41,16 +41,22 @@ ScreenJukebox.cpp ScreenJukebox.h \
 ScreenMapControllers.cpp ScreenMapControllers.h \
 ScreenMessage.cpp ScreenMessage.h ScreenMiniMenu.cpp ScreenMiniMenu.h ScreenMusicScroll.cpp ScreenMusicScroll.h \
 ScreenNameEntry.cpp ScreenNameEntry.h ScreenNameEntryTraditional.cpp ScreenNameEntryTraditional.h \
-ScreenOptions.cpp ScreenOptions.h ScreenOptionsMaster.cpp ScreenOptionsMaster.h \
-ScreenOptionsMasterPrefs.cpp ScreenOptionsMasterPrefs.h ScreenPackages.cpp ScreenPackages.h ScreenPlayerOptions.cpp ScreenPlayerOptions.h ScreenNetworkOptions.h \
-ScreenNetworkOptions.cpp ScreenProfileOptions.cpp ScreenProfileOptions.h ScreenPrompt.cpp ScreenPrompt.h ScreenRanking.cpp ScreenRanking.h \
+ScreenOptions.cpp ScreenOptions.h \
+ScreenOptionsEditProfile.cpp ScreenOptionsEditProfile.h \
+ScreenOptionsMaster.cpp ScreenOptionsMaster.h \
+ScreenOptionsMasterPrefs.cpp ScreenOptionsMasterPrefs.h ScreenPackages.cpp ScreenPackages.h \
+ScreenPlayerOptions.cpp ScreenPlayerOptions.h \
+ScreenNetworkOptions.h ScreenNetworkOptions.cpp \
+ScreenPrompt.cpp ScreenPrompt.h ScreenRanking.cpp ScreenRanking.h \
 ScreenReloadSongs.cpp ScreenReloadSongs.h \
 ScreenSandbox.cpp ScreenSandbox.h \
 ScreenSaveSync.cpp ScreenSaveSync.h \
 ScreenSelect.cpp ScreenSelect.h ScreenSelectCharacter.cpp ScreenSelectCharacter.h \
 ScreenSelectDifficulty.cpp ScreenSelectDifficulty.h ScreenSelectGroup.cpp ScreenSelectGroup.h \
 ScreenSelectMaster.cpp ScreenSelectMaster.h ScreenSelectMode.cpp ScreenSelectMode.h \
-ScreenSelectMusic.cpp ScreenSelectMusic.h ScreenSelectStyle.cpp ScreenSelectStyle.h \
+ScreenSelectMusic.cpp ScreenSelectMusic.h \
+ScreenSelectProfile.cpp ScreenSelectProfile.h 
+ScreenSelectStyle.cpp ScreenSelectStyle.h \
 ScreenSyncOverlay.cpp ScreenSyncOverlay.h \
 ScreenSystemLayer.cpp ScreenSystemLayer.h ScreenSetTime.cpp ScreenSetTime.h \
 ScreenSongOptions.cpp ScreenSongOptions.h \
diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj
index 0dbff728d8..6b46b1d62d 100644
--- a/stepmania/src/StepMania-net2003.vcproj
+++ b/stepmania/src/StepMania-net2003.vcproj
@@ -567,6 +567,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="ScreenSelectMusic.h">
 			</File>
+			<File
+				RelativePath=".\ScreenSelectProfile.cpp">
+			</File>
+			<File
+				RelativePath=".\ScreenSelectProfile.h">
+			</File>
 			<File
 				RelativePath="ScreenSelectStyle.cpp">
 			</File>
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 4e2b13f84f..9e0ef6c406 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -62,7 +62,7 @@ IntDir=.\../Debug6
 TargetDir=\cvs\stepmania\Program
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=archutils\Win32\verinc                                                                                                                                                                                               	cl                                                       /Zl                                                       /nologo                                                       /c                                                       verstub.cpp                                                       /Fo$(IntDir)\ 
+PreLink_Cmds=archutils\Win32\verinc                                                                                                                                                                                                 	cl                                                         /Zl                                                         /nologo                                                         /c                                                         verstub.cpp                                                         /Fo$(IntDir)\ 
 PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -99,7 +99,7 @@ IntDir=.\../Release6
 TargetDir=\cvs\stepmania\Program
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=archutils\Win32\verinc         	cl          /Zl          /nologo          /c          verstub.cpp          /Fo$(IntDir)\ 
+PreLink_Cmds=archutils\Win32\verinc           	cl            /Zl            /nologo            /c            verstub.cpp            /Fo$(IntDir)\ 
 PostBuild_Cmds=archutils\Win32\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -592,6 +592,14 @@ SOURCE=.\RageTextureManager.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\RageTexturePreloader.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\RageTexturePreloader.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\RageThreads.cpp
 # End Source File
 # Begin Source File
@@ -1688,6 +1696,14 @@ SOURCE=.\archutils\Win32\WindowsResources.rc
 # End Group
 # Begin Source File
 
+SOURCE=.\GameLoop.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\GameLoop.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\global.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Debug"
@@ -2486,14 +2502,6 @@ SOURCE=.\ScreenBookkeeping.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ScreenBranch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScreenBranch.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\ScreenCenterImage.cpp
 # End Source File
 # Begin Source File
@@ -2760,6 +2768,14 @@ SOURCE=.\ScreenOptions.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ScreenOptionsEditProfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ScreenOptionsEditProfile.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ScreenOptionsMaster.cpp
 # End Source File
 # Begin Source File
@@ -2792,14 +2808,6 @@ SOURCE=.\ScreenPlayerOptions.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\ScreenProfileOptions.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ScreenProfileOptions.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\ScreenPrompt.cpp
 # End Source File
 # Begin Source File
@@ -2896,6 +2904,14 @@ SOURCE=.\ScreenSelectMusic.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ScreenSelectProfile.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ScreenSelectProfile.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\ScreenSelectStyle.cpp
 # End Source File
 # Begin Source File