diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index e3f55303d4..bc7754fc8d 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -14,8 +14,8 @@
 
 #include "arch/arch.h"
 
-Preference<float>	g_fLightsFalloffSeconds( Options, "LightsFalloffSeconds", 0.1f );
-Preference<float>	g_fLightsAheadSeconds( Options, "LightsAheadSeconds", 0.05f );
+Preference<float>	g_fLightsFalloffSeconds( "LightsFalloffSeconds", 0.1f );
+Preference<float>	g_fLightsAheadSeconds( "LightsAheadSeconds", 0.05f );
 
 
 static const CString CabinetLightNames[] = {
diff --git a/stepmania/src/NetworkSyncServer.cpp b/stepmania/src/NetworkSyncServer.cpp
index d1fdd2b797..66b80c8d91 100644
--- a/stepmania/src/NetworkSyncServer.cpp
+++ b/stepmania/src/NetworkSyncServer.cpp
@@ -12,7 +12,7 @@ StepManiaLanServer::StepManiaLanServer() { }
 StepManiaLanServer::~StepManiaLanServer() { }
 #else
 
-static Preference<float> g_fStartWait( Options, "ServerWaitSeconds",	2 );
+static Preference<float> g_fStartWait( "ServerWaitSeconds",	2 );
 
 LanPlayer::LanPlayer()
 {
diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp
index 5b231090dd..46d94b7eb3 100644
--- a/stepmania/src/Preference.cpp
+++ b/stepmania/src/Preference.cpp
@@ -7,15 +7,7 @@
 #include "LuaManager.h"
 #include "MessageManager.h"
 
-static const CString PrefsGroupNames[] = {
-	"Debug",
-	"Editor",
-	"Options",
-};
-XToString( PrefsGroup, NUM_PREFS_GROUPS );
-
-IPreference::IPreference( PrefsGroup PrefsGroup, const CString& sName ):
-	m_PrefsGroup( PrefsGroup ),
+IPreference::IPreference( const CString& sName ):
 	m_sName( sName )
 {
 	PrefsManager::Subscribe( this );
@@ -82,13 +74,13 @@ READFROM_AND_WRITETO( RageSoundReader_Resample::ResampleQuality, int& )
 void IPreference::ReadFrom( const IniFile &ini )
 {
 	CString sVal;
-	if( ini.GetValue( PrefsGroupToString(m_PrefsGroup), m_sName, sVal ) )
+	if( ini.GetValue( "Options", m_sName, sVal ) )
 		FromString( sVal );
 }
 
 void IPreference::WriteTo( IniFile &ini ) const
 {
-	ini.SetValue( PrefsGroupToString(m_PrefsGroup), m_sName, ToString() );
+	ini.SetValue( "Options", m_sName, ToString() );
 }
 
 void BroadcastPreferenceChanged( const CString& sPreferenceName )
diff --git a/stepmania/src/Preference.h b/stepmania/src/Preference.h
index 0a533415ca..926c4794f6 100644
--- a/stepmania/src/Preference.h
+++ b/stepmania/src/Preference.h
@@ -6,20 +6,11 @@
 #include "EnumHelper.h"
 class IniFile;
 
-enum PrefsGroup
-{
-	Debug,
-	Editor,
-	Options,
-	NUM_PREFS_GROUPS
-};
-const CString& PrefsGroupToString( PrefsGroup pg );
-
 struct lua_State;
 class IPreference
 {
 public:
-	IPreference( PrefsGroup PrefsGroup, const CString& sName );
+	IPreference( const CString& sName );
 	virtual ~IPreference();
 
 	virtual void LoadDefault() = 0;
@@ -32,11 +23,9 @@ public:
 	virtual void SetFromStack( lua_State *L );
 	virtual void PushValue( lua_State *L ) const;
 
-	PrefsGroup GetPrefsGroup() const { return m_PrefsGroup; }
 	const CString &GetName() const { return m_sName; }
 
 protected:
-	PrefsGroup	m_PrefsGroup;
 	CString		m_sName;
 };
 
@@ -52,8 +41,8 @@ private:
 	T			m_defaultValue;
 	
 public:
-	Preference( PrefsGroup PrefsGroup, const CString& sName, const T& defaultValue ):
-		IPreference( PrefsGroup, sName ),
+	Preference( const CString& sName, const T& defaultValue ):
+		IPreference( sName ),
 		m_currentValue( defaultValue ),
 		m_defaultValue( defaultValue )
 	{
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 9065e32d16..910555ab2e 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -52,268 +52,274 @@ IPreference *PrefsManager::GetPreferenceByName( const CString &sName )
 bool g_bAutoRestart = false;
 
 PrefsManager::PrefsManager() :
-	m_bWindowed				( Options, "Windowed",				
+	m_bWindowed				( "Windowed",				
 #ifdef DEBUG
 	true
 #else
 	false
 #endif
 		),
-	m_iDisplayWidth			( Options, "DisplayWidth",			640 ),
-	m_iDisplayHeight		( Options, "DisplayHeight",			480 ),
-	m_iDisplayColorDepth	( Options, "DisplayColorDepth",		16 ),
-	m_iTextureColorDepth	( Options, "TextureColorDepth",		16 ),
-	m_iMovieColorDepth		( Options, "MovieColorDepth",		16 ),
-	m_iMaxTextureResolution	( Options, "MaxTextureResolution",	2048 ),
-	m_iRefreshRate			( Options, "RefreshRate",			REFRESH_DEFAULT ),
-	m_fDisplayAspectRatio	( Options, "DisplayAspectRatio",	4/3.0f ),
-	m_bShowStats			( Options, "ShowStats",				false ),
-	m_bShowBanners			( Options, "ShowBanners",			true ),
-
-	m_BackgroundMode		( Options, "BackgroundMode",		BGMODE_ANIMATIONS ),
-	m_iNumBackgrounds		( Options, "NumBackgrounds",		8 ),
-	m_fBGBrightness			( Options, "BGBrightness",			0.8f ),
-	m_bHiddenSongs			( Options, "HiddenSongs",			false ),	/* I'd rather get occasional people asking for support for this even though it's already here than lots of people asking why songs aren't being displayed. */
-	m_bVsync				( Options, "Vsync",					true ),
-	m_bInterlaced			( Options, "Interlaced",			false ),
-	/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
-	m_bPAL					( Options, "PAL",					false ),
-	m_bDelayedTextureDelete	( Options, "DelayedTextureDelete",	true ),
-	m_bTexturePreload		( Options, "TexturePreload",		false ),
-	m_bDelayedScreenLoad	( Options, "DelayedScreenLoad",		false ),
-	m_bDelayedModelDelete	( Options, "DelayedModelDelete",	false ),
-	m_BannerCache			( Options, "BannerCache",			BNCACHE_LOW_RES_PRELOAD ),
-	m_bPalettedBannerCache	( Options, "PalettedBannerCache",	false ),
-	m_bFastLoad				( Options, "FastLoad",				true ),
-
-	m_bOnlyDedicatedMenuButtons	( Options, "OnlyDedicatedMenuButtons",	false ),
-	m_bMenuTimer				( Options, "MenuTimer",					true ),
-	m_bShowDanger				( Options, "ShowDanger",					true ),
-
-	m_fJudgeWindowScale				( Options, "JudgeWindowScale",				1.0f ),
-	m_fJudgeWindowAdd				( Options, "JudgeWindowAdd",				0 ),
-	m_fJudgeWindowSecondsMarvelous	( Options, "JudgeWindowSecondsMarvelous",	0.0225f ),
-	m_fJudgeWindowSecondsPerfect	( Options, "JudgeWindowSecondsPerfect",		0.045f ),
-	m_fJudgeWindowSecondsGreat		( Options, "JudgeWindowSecondsGreat",		0.090f ),
-	m_fJudgeWindowSecondsGood		( Options, "JudgeWindowSecondsGood",		0.135f ),
-	m_fJudgeWindowSecondsBoo		( Options, "JudgeWindowSecondsBoo",			0.180f ),
-	m_fJudgeWindowSecondsOK			( Options, "JudgeWindowSecondsOK",			0.250f ),	// allow enough time to take foot off and put back on
-	m_fJudgeWindowSecondsRoll		( Options, "JudgeWindowSecondsRoll",		0.350f ),
-	m_fJudgeWindowSecondsMine		( Options, "JudgeWindowSecondsMine",		0.090f ),	// same as great
-	m_fJudgeWindowSecondsAttack		( Options, "JudgeWindowSecondsAttack",		0.135f ),
-
-	m_fLifeDifficultyScale				( Options, "LifeDifficultyScale",				1.0f ),
-	m_fLifeDeltaPercentChangeMarvelous	( Options, "LifeDeltaPercentChangeMarvelous",	+0.008f ),
-	m_fLifeDeltaPercentChangePerfect	( Options, "LifeDeltaPercentChangePerfect",		+0.008f ),
-	m_fLifeDeltaPercentChangeGreat		( Options, "LifeDeltaPercentChangeGreat",		+0.004f ),
-	m_fLifeDeltaPercentChangeGood		( Options, "LifeDeltaPercentChangeGood",		+0.000f ),
-	m_fLifeDeltaPercentChangeBoo		( Options, "LifeDeltaPercentChangeBoo",			-0.040f ),
-	m_fLifeDeltaPercentChangeMiss		( Options, "LifeDeltaPercentChangeMiss",		-0.080f ),
-	m_fLifeDeltaPercentChangeHitMine	( Options, "LifeDeltaPercentChangeHitMine",		-0.160f ),
-	m_fLifeDeltaPercentChangeOK			( Options, "LifeDeltaPercentChangeOK",			+0.008f ),
-	m_fLifeDeltaPercentChangeNG			( Options, "LifeDeltaPercentChangeNG",			-0.080f ),
-
-	m_fTugMeterPercentChangeMarvelous	( Options, "TugMeterPercentChangeMarvelous",	+0.010f ),
-	m_fTugMeterPercentChangePerfect		( Options, "TugMeterPercentChangePerfect",		+0.008f ),
-	m_fTugMeterPercentChangeGreat		( Options, "TugMeterPercentChangeGreat",		+0.004f ),
-	m_fTugMeterPercentChangeGood		( Options, "TugMeterPercentChangeGood",			+0.000f ),
-	m_fTugMeterPercentChangeBoo			( Options, "TugMeterPercentChangeBoo",			-0.010f ),
-	m_fTugMeterPercentChangeMiss		( Options, "TugMeterPercentChangeMiss",			-0.020f ),
-	m_fTugMeterPercentChangeHitMine		( Options, "TugMeterPercentChangeHitMine",		-0.040f ),
-	m_fTugMeterPercentChangeOK			( Options, "TugMeterPercentChangeOK",			+0.008f ),
-	m_fTugMeterPercentChangeNG			( Options, "TugMeterPercentChangeNG",			-0.020f ),
-
-	m_iRegenComboAfterFail			( Options, "RegenComboAfterFail",			10 ),
-	m_iRegenComboAfterMiss			( Options, "RegenComboAfterMiss",			5 ),
-	m_iMaxRegenComboAfterFail		( Options, "MaxRegenComboAfterFail",		10 ),
-	m_iMaxRegenComboAfterMiss		( Options, "MaxRegenComboAfterMiss",		10 ),
-	m_bTwoPlayerRecovery			( Options, "TwoPlayerRecovery",				true ),
-	m_bMercifulDrain				( Options, "MercifulDrain",					true ),	// negative life deltas are scaled by the players life percentage
-	m_bMinimum1FullSongInNonstop	( Options, "Minimum1FullSongInNonstop",		false ),	// FEoS for 1st song, FailImmediate thereafter
-	m_bFailOffInBeginner			( Options, "FailOffInBeginner",				false ),
-	m_bFailOffForFirstStageEasy		( Options, "FailOffForFirstStageEasy",		false ),
-	m_bMercifulBeginner				( Options, "MercifulBeginner",				false ),
-
-	m_iPercentScoreWeightMarvelous	( Options, "PercentScoreWeightMarvelous",	3 ),
-	m_iPercentScoreWeightPerfect	( Options, "PercentScoreWeightPerfect",		2 ),
-	m_iPercentScoreWeightGreat		( Options, "PercentScoreWeightGreat",		1 ),
-	m_iPercentScoreWeightGood		( Options, "PercentScoreWeightGood",		0 ),
-	m_iPercentScoreWeightBoo		( Options, "PercentScoreWeightBoo",			0 ),
-	m_iPercentScoreWeightMiss		( Options, "PercentScoreWeightMiss",		0 ),
-	m_iPercentScoreWeightHitMine	( Options, "PercentScoreWeightHitMine",		-2 ),
-	m_iPercentScoreWeightOK			( Options, "PercentScoreWeightOK",			3 ),
-	m_iPercentScoreWeightNG			( Options, "PercentScoreWeightNG",			0 ),
-	
-	m_iGradeWeightMarvelous		( Options, "GradeWeightMarvelous",	2 ),
-	m_iGradeWeightPerfect		( Options, "GradeWeightPerfect",	2 ),
-	m_iGradeWeightGreat			( Options, "GradeWeightGreat",		1 ),
-	m_iGradeWeightGood			( Options, "GradeWeightGood",		0 ),
-	m_iGradeWeightBoo			( Options, "GradeWeightBoo",		-4 ),
-	m_iGradeWeightMiss			( Options, "GradeWeightMiss",		-8 ),
-	m_iGradeWeightHitMine		( Options, "GradeWeightHitMine",	-8 ),
-	m_iGradeWeightOK			( Options, "GradeWeightOK",			6 ),
-	m_iGradeWeightNG			( Options, "GradeWeightNG",			0 ),
-
-	m_fSuperMeterPercentChangeMarvelous	( Options, "SuperMeterPercentChangeMarvelous",	+0.05f ),
-	m_fSuperMeterPercentChangePerfect	( Options, "SuperMeterPercentChangePerfect",	+0.04f ),
-	m_fSuperMeterPercentChangeGreat		( Options, "SuperMeterPercentChangeGreat",		+0.02f ),
-	m_fSuperMeterPercentChangeGood		( Options, "SuperMeterPercentChangeGood",		+0.00f ),
-	m_fSuperMeterPercentChangeBoo		( Options, "SuperMeterPercentChangeBoo",		-0.00f ),
-	m_fSuperMeterPercentChangeMiss		( Options, "SuperMeterPercentChangeMiss",		-0.20f ),
-	m_fSuperMeterPercentChangeHitMine	( Options, "SuperMeterPercentChangeHitMine",	-0.40f ),
-	m_fSuperMeterPercentChangeOK		( Options, "SuperMeterPercentChangeOK",			+0.04f ),
-	m_fSuperMeterPercentChangeNG		( Options, "SuperMeterPercentChangeNG",			-0.20f ),
-	m_bMercifulSuperMeter				( Options, "MercifulSuperMeter",				true ),
-	
-	m_fTimeMeterSecondsChangeMarvelous	( Options, "TimeMeterSecondsChangeMarvelous",	+0.1f ),
-	m_fTimeMeterSecondsChangePerfect	( Options, "TimeMeterSecondsChangePerfect",		 0.0f ),
-	m_fTimeMeterSecondsChangeGreat		( Options, "TimeMeterSecondsChangeGreat",		-0.5f ),
-	m_fTimeMeterSecondsChangeGood		( Options, "TimeMeterSecondsChangeGood",		-1.0f ),
-	m_fTimeMeterSecondsChangeBoo		( Options, "TimeMeterSecondsChangeBoo",			-2.0f ),
-	m_fTimeMeterSecondsChangeMiss		( Options, "TimeMeterSecondsChangeMiss",		-4.0f ),
-	m_fTimeMeterSecondsChangeHitMine	( Options, "TimeMeterSecondsChangeHitMine",		-2.0f ),
-	m_fTimeMeterSecondsChangeOK			( Options, "TimeMeterSecondsChangeOK",			-0.0f ),
-	m_fTimeMeterSecondsChangeNG			( Options, "TimeMeterSecondsChangeNG",			-4.0f ),
-
-	m_AutoPlay					( Options, "AutoPlay",					PC_HUMAN ),
-	m_bDelayedBack				( Options, "DelayedBack",				true ),
-	m_bShowInstructions			( Options, "ShowInstructions",			true ),
-	m_bShowSelectGroup			( Options, "ShowSelectGroup",			true ),
-	m_bShowCaution				( Options, "ShowCaution",				true ),
-	m_bShowNativeLanguage		( Options, "ShowNativeLanguage",		true ),
-	m_bArcadeOptionsNavigation	( Options, "ArcadeOptionsNavigation",	false ),
-	m_MusicWheelUsesSections	( Options, "MusicWheelUsesSections",	ALWAYS ),
-	m_iMusicWheelSwitchSpeed	( Options, "MusicWheelSwitchSpeed",		10 ),
-	m_bEasterEggs				( Options, "EasterEggs",				true ),
-	m_MarvelousTiming			( Options, "MarvelousTiming",			MARVELOUS_EVERYWHERE ),
-	m_bEventMode				( Options, "EventMode",					false ),
-	m_iCoinsPerCredit			( Options, "CoinsPerCredit",			1 ),
-	m_iSongsPerPlay				( Options, "SongsPerPlay",				3 ),
-
-	m_CoinMode						( Options, "CoinMode",					COIN_HOME ),
-	m_Premium						( Options, "Premium",					PREMIUM_NONE ),
-	m_bDelayedCreditsReconcile		( Options, "DelayedCreditsReconcile",	false ),
-	m_bPickExtraStage				( Options, "PickExtraStage",			false ),
-
-	m_bComboContinuesBetweenSongs	( Options, "ComboContinuesBetweenSongs",false ),
-	m_fLongVerSongSeconds			( Options, "LongVerSongSeconds",		60*2.5f ),	// Dynamite Rave is 2:55
-	m_fMarathonVerSongSeconds		( Options, "MarathonVerSongSeconds",	60*5.f ),
-	m_ShowSongOptions				( Options, "ShowSongOptions",			YES ),
-	m_bSoloSingle					( Options, "SoloSingle",				false ),
-	m_bDancePointsForOni			( Options, "DancePointsForOni",			false ),
-	m_bPercentageScoring			( Options, "PercentageScoring",		false ),
-	m_fMinPercentageForMachineSongHighScore		( Options, "MinPercentageForMachineSongHighScore",		0.5f ),
-	m_fMinPercentageForMachineCourseHighScore	( Options, "MinPercentageForMachineCourseHighScore",	0.0001f ),	// don't save course scores with 0 percentage
-	m_bDisqualification				( Options, "Disqualification",			false ),
-	m_bShowLyrics					( Options, "ShowLyrics",				true ),
-	m_bAutogenSteps					( Options, "AutogenSteps",				true ),
-	m_bAutogenGroupCourses			( Options, "AutogenGroupCourses",		true ),
-	m_bBreakComboToGetItem			( Options, "BreakComboToGetItem",		false ),
-	m_bLockCourseDifficulties		( Options, "LockCourseDifficulties",	true ),
-	m_ShowDancingCharacters			( Options, "ShowDancingCharacters",		CO_OFF ),
-	m_bUseUnlockSystem				( Options, "UseUnlockSystem",			false ),
-	m_bFirstRun						( Options, "FirstRun",					true ),
-	m_bAutoMapOnJoyChange			( Options, "AutoMapOnJoyChange",		true ),
-	m_fGlobalOffsetSeconds			( Options, "GlobalOffsetSeconds",		0 ),
-	m_iProgressiveLifebar			( Options, "ProgressiveLifebar",		0 ),
-	m_iProgressiveStageLifebar		( Options, "ProgressiveStageLifebar",	0 ),
-	m_iProgressiveNonstopLifebar	( Options, "ProgressiveNonstopLifebar",	0 ),
-	m_bShowBeginnerHelper			( Options, "ShowBeginnerHelper",		false ),
-	m_bEndlessBreakEnabled			( Options, "EndlessBreakEnabled",		true ),
-	m_iEndlessNumStagesUntilBreak	( Options, "EndlessNumStagesUntilBreak",5 ),
-	m_iEndlessBreakLength			( Options, "EndlessBreakLength",		5 ),
-	m_bDisableScreenSaver			( Options, "DisableScreenSaver",		true ),
-	m_sLanguage						( Options, "Language",					"" ),	// ThemeManager will deal with this invalid language
-	m_sMemoryCardProfileSubdir		( Options, "MemoryCardProfileSubdir",	PRODUCT_NAME ),
-	m_iProductID					( Options, "ProductID",					1 ),	
-	m_sDefaultLocalProfileIDP1		( Options, "DefaultLocalProfileIDP1",	"" ),
-	m_sDefaultLocalProfileIDP2		( Options, "DefaultLocalProfileIDP2",	"" ),
-	m_bMemoryCards					( Options, "MemoryCards",				false ),
-	m_sMemoryCardOsMountPointP1		( Options, "MemoryCardOsMountPointP1",	"" ),
-	m_sMemoryCardOsMountPointP2		( Options, "MemoryCardOsMountPointP2",	"" ),
-	m_iMemoryCardUsbBusP1			( Options, "MemoryCardUsbBusP1",	-1 ),
-	m_iMemoryCardUsbBusP2			( Options, "MemoryCardUsbBusP2",	-1 ),
-	m_iMemoryCardUsbPortP1			( Options, "MemoryCardUsbPortP1",	-1 ),
-	m_iMemoryCardUsbPortP2			( Options, "MemoryCardUsbPortP2",	-1 ),
-	m_iMemoryCardUsbLevelP1			( Options, "MemoryCardUsbLevelP1",	-1 ),
-	m_iMemoryCardUsbLevelP2			( Options, "MemoryCardUsbLevelP2",	-1 ),
-	m_iCenterImageTranslateX		( Options, "CenterImageTranslateX",	0 ),
-	m_iCenterImageTranslateY		( Options, "CenterImageTranslateY",	0 ),
-	m_fCenterImageAddWidth			( Options, "CenterImageAddWidth",	0 ),
-	m_fCenterImageAddHeight			( Options, "CenterImageAddHeight",	0 ),
-	m_iAttractSoundFrequency		( Options, "AttractSoundFrequency",	1 ),
-	m_bAllowExtraStage				( Options, "AllowExtraStage",		true ),
-	m_bHideDefaultNoteSkin			( Options, "HideDefaultNoteSkin",	false ),
-	m_iMaxHighScoresPerListForMachine		( Options, "MaxHighScoresPerListForMachine",		10 ),
-	m_iMaxHighScoresPerListForPlayer		( Options, "MaxHighScoresPerListForPlayer",			3 ),
-	m_iMaxRecentScoresForMachine			( Options, "MaxRecentScoresForMachine",				100 ),
-	m_iMaxRecentScoresForPlayer				( Options, "MaxRecentScoresForPlayer",				20 ),
-	m_bAllowMultipleHighScoreWithSameName	( Options, "AllowMultipleHighScoreWithSameName",	true ),
-	m_bCelShadeModels						( Options, "CelShadeModels",						false ),	// Work-In-Progress.. disable by default.
-	m_bPreferredSortUsesGroups				( Options, "PreferredSortUsesGroups",				true ),
-
-	m_fConstantUpdateDeltaSeconds	( Options, "ConstantUpdateDeltaSeconds",0 ),
-	m_fPadStickSeconds				( Options, "PadStickSeconds",			0 ),
-	m_bForceMipMaps					( Options, "ForceMipMaps",				0 ),
-	m_bTrilinearFiltering			( Options, "TrilinearFiltering",		0 ),
-	m_bAnisotropicFiltering			( Options, "AnisotropicFiltering",		0 ),
-
-	m_bSignProfileData				( Options, "SignProfileData",			false ),
-	m_bEditorShowBGChangesPlay		( Options, "EditorShowBGChangesPlay",	false ),
-	m_CourseSortOrder				( Options, "CourseSortOrder",			COURSE_SORT_SONGS ),
-	m_bMoveRandomToEnd				( Options, "MoveRandomToEnd",			false ),
-	m_bSubSortByNumSteps			( Options, "SubSortByNumSteps",			false ),
-	m_GetRankingName				( Options, "GetRankingName",			RANKING_ON ),
-	m_ScoringType					( Options, "ScoringType",				SCORING_MAX2 ),
-	m_BoostAppPriority				( Options, "BoostAppPriority",			BOOST_AUTO ),
-	m_sAdditionalSongFolders		( Options, "AdditionalSongFolders",		"" ),
-	m_sAdditionalFolders			( Options, "AdditionalFolders",			"" ),
-	m_sLastSeenVideoDriver			( Options, "LastSeenVideoDriver",		"" ),
-	m_sLastSeenInputDevices			( Options, "LastSeenInputDevices",		"" ),
-#if defined(WIN32)
-	m_iLastSeenMemory				( Options, "LastSeenMemory",			0 ),
+	m_iDisplayWidth			( "DisplayWidth",			640 ),
+	m_iDisplayHeight		( "DisplayHeight",			480 ),
+	m_iDisplayColorDepth	( "DisplayColorDepth",		16 ),
+	m_iTextureColorDepth	( "TextureColorDepth",		16 ),
+	m_iMovieColorDepth		( "MovieColorDepth",		16 ),
+	m_iMaxTextureResolution	( "MaxTextureResolution",	2048 ),
+	m_iRefreshRate			( "RefreshRate",			REFRESH_DEFAULT ),
+	m_fDisplayAspectRatio	( "DisplayAspectRatio",	4/3.0f ),
+	m_bShowStats			( "ShowStats",				
+#ifdef DEBUG
+	true
+#else
+	false
 #endif
-	m_sVideoRenderers				( Options, "VideoRenderers",			"" ),	// StepMania.cpp sets these on first run:
-	m_bSmoothLines					( Options, "SmoothLines",				false ),
-	m_sSoundDrivers					( Options, "SoundDrivers",				"" ),
-	m_iSoundWriteAhead				( Options, "SoundWriteAhead",			0 ),
-	m_iSoundDevice					( Options, "SoundDevice",				"" ),
-	m_fSoundVolume					( Options, "SoundVolume",				-1 ),	// default
-	m_SoundResampleQuality			( Options, "SoundResampleQuality",		RageSoundReader_Resample::RESAMP_NORMAL ),
-	m_sInputDrivers					( Options, "InputDrivers",				"" ),
-	m_sMovieDrivers					( Options, "MovieDrivers",				"" ),
-	m_sLightsDriver					( Options, "LightsDriver",				"" ),
-	m_sLightsStepsDifficulty		( Options, "LightsStepsDifficulty",		"medium" ),
-	m_bBlinkGameplayButtonLightsOnNote	( Options, "BlinkGameplayButtonLightsOnNote",false ),
-	m_bAllowUnacceleratedRenderer	( Options, "AllowUnacceleratedRenderer",false ),
-	m_bThreadedInput				( Options, "ThreadedInput",				true ),
-	m_bThreadedMovieDecode			( Options, "ThreadedMovieDecode",		true ),
-	m_bScreenTestMode				( Options, "ScreenTestMode",			false ),
-	m_bDebugLights					( Options, "DebugLights",				false ),
-	m_bMonkeyInput					( Options, "MonkeyInput",				false ),
-	m_sMachineName					( Options, "MachineName",				"" ),
-	m_sIgnoredMessageWindows		( Options, "IgnoredMessageWindows",		"" ),
-	m_sCoursesToShowRanking			( Options, "CoursesToShowRanking",		"" ),
+	),
+	m_bShowBanners			( "ShowBanners",			true ),
+
+	m_BackgroundMode		( "BackgroundMode",		BGMODE_ANIMATIONS ),
+	m_iNumBackgrounds		( "NumBackgrounds",		8 ),
+	m_fBGBrightness			( "BGBrightness",			0.8f ),
+	m_bHiddenSongs			( "HiddenSongs",			false ),	/* I'd rather get occasional people asking for support for this even though it's already here than lots of people asking why songs aren't being displayed. */
+	m_bVsync				( "Vsync",					true ),
+	m_bInterlaced			( "Interlaced",			false ),
+	/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
+	m_bPAL					( "PAL",					false ),
+	m_bDelayedTextureDelete	( "DelayedTextureDelete",	true ),
+	m_bTexturePreload		( "TexturePreload",		false ),
+	m_bDelayedScreenLoad	( "DelayedScreenLoad",		false ),
+	m_bDelayedModelDelete	( "DelayedModelDelete",	false ),
+	m_BannerCache			( "BannerCache",			BNCACHE_LOW_RES_PRELOAD ),
+	m_bPalettedBannerCache	( "PalettedBannerCache",	false ),
+	m_bFastLoad				( "FastLoad",				true ),
+
+	m_bOnlyDedicatedMenuButtons	( "OnlyDedicatedMenuButtons",	false ),
+	m_bMenuTimer				( "MenuTimer",					true ),
+	m_bShowDanger				( "ShowDanger",					true ),
+
+	m_fJudgeWindowScale				( "JudgeWindowScale",				1.0f ),
+	m_fJudgeWindowAdd				( "JudgeWindowAdd",				0 ),
+	m_fJudgeWindowSecondsMarvelous	( "JudgeWindowSecondsMarvelous",	0.0225f ),
+	m_fJudgeWindowSecondsPerfect	( "JudgeWindowSecondsPerfect",		0.045f ),
+	m_fJudgeWindowSecondsGreat		( "JudgeWindowSecondsGreat",		0.090f ),
+	m_fJudgeWindowSecondsGood		( "JudgeWindowSecondsGood",		0.135f ),
+	m_fJudgeWindowSecondsBoo		( "JudgeWindowSecondsBoo",			0.180f ),
+	m_fJudgeWindowSecondsOK			( "JudgeWindowSecondsOK",			0.250f ),	// allow enough time to take foot off and put back on
+	m_fJudgeWindowSecondsRoll		( "JudgeWindowSecondsRoll",		0.350f ),
+	m_fJudgeWindowSecondsMine		( "JudgeWindowSecondsMine",		0.090f ),	// same as great
+	m_fJudgeWindowSecondsAttack		( "JudgeWindowSecondsAttack",		0.135f ),
+
+	m_fLifeDifficultyScale				( "LifeDifficultyScale",				1.0f ),
+	m_fLifeDeltaPercentChangeMarvelous	( "LifeDeltaPercentChangeMarvelous",	+0.008f ),
+	m_fLifeDeltaPercentChangePerfect	( "LifeDeltaPercentChangePerfect",		+0.008f ),
+	m_fLifeDeltaPercentChangeGreat		( "LifeDeltaPercentChangeGreat",		+0.004f ),
+	m_fLifeDeltaPercentChangeGood		( "LifeDeltaPercentChangeGood",		+0.000f ),
+	m_fLifeDeltaPercentChangeBoo		( "LifeDeltaPercentChangeBoo",			-0.040f ),
+	m_fLifeDeltaPercentChangeMiss		( "LifeDeltaPercentChangeMiss",		-0.080f ),
+	m_fLifeDeltaPercentChangeHitMine	( "LifeDeltaPercentChangeHitMine",		-0.160f ),
+	m_fLifeDeltaPercentChangeOK			( "LifeDeltaPercentChangeOK",			+0.008f ),
+	m_fLifeDeltaPercentChangeNG			( "LifeDeltaPercentChangeNG",			-0.080f ),
+
+	m_fTugMeterPercentChangeMarvelous	( "TugMeterPercentChangeMarvelous",	+0.010f ),
+	m_fTugMeterPercentChangePerfect		( "TugMeterPercentChangePerfect",		+0.008f ),
+	m_fTugMeterPercentChangeGreat		( "TugMeterPercentChangeGreat",		+0.004f ),
+	m_fTugMeterPercentChangeGood		( "TugMeterPercentChangeGood",			+0.000f ),
+	m_fTugMeterPercentChangeBoo			( "TugMeterPercentChangeBoo",			-0.010f ),
+	m_fTugMeterPercentChangeMiss		( "TugMeterPercentChangeMiss",			-0.020f ),
+	m_fTugMeterPercentChangeHitMine		( "TugMeterPercentChangeHitMine",		-0.040f ),
+	m_fTugMeterPercentChangeOK			( "TugMeterPercentChangeOK",			+0.008f ),
+	m_fTugMeterPercentChangeNG			( "TugMeterPercentChangeNG",			-0.020f ),
+
+	m_iRegenComboAfterFail			( "RegenComboAfterFail",			10 ),
+	m_iRegenComboAfterMiss			( "RegenComboAfterMiss",			5 ),
+	m_iMaxRegenComboAfterFail		( "MaxRegenComboAfterFail",		10 ),
+	m_iMaxRegenComboAfterMiss		( "MaxRegenComboAfterMiss",		10 ),
+	m_bTwoPlayerRecovery			( "TwoPlayerRecovery",				true ),
+	m_bMercifulDrain				( "MercifulDrain",					true ),	// negative life deltas are scaled by the players life percentage
+	m_bMinimum1FullSongInNonstop	( "Minimum1FullSongInNonstop",		false ),	// FEoS for 1st song, FailImmediate thereafter
+	m_bFailOffInBeginner			( "FailOffInBeginner",				false ),
+	m_bFailOffForFirstStageEasy		( "FailOffForFirstStageEasy",		false ),
+	m_bMercifulBeginner				( "MercifulBeginner",				false ),
+
+	m_iPercentScoreWeightMarvelous	( "PercentScoreWeightMarvelous",	3 ),
+	m_iPercentScoreWeightPerfect	( "PercentScoreWeightPerfect",		2 ),
+	m_iPercentScoreWeightGreat		( "PercentScoreWeightGreat",		1 ),
+	m_iPercentScoreWeightGood		( "PercentScoreWeightGood",		0 ),
+	m_iPercentScoreWeightBoo		( "PercentScoreWeightBoo",			0 ),
+	m_iPercentScoreWeightMiss		( "PercentScoreWeightMiss",		0 ),
+	m_iPercentScoreWeightHitMine	( "PercentScoreWeightHitMine",		-2 ),
+	m_iPercentScoreWeightOK			( "PercentScoreWeightOK",			3 ),
+	m_iPercentScoreWeightNG			( "PercentScoreWeightNG",			0 ),
+	
+	m_iGradeWeightMarvelous		( "GradeWeightMarvelous",	2 ),
+	m_iGradeWeightPerfect		( "GradeWeightPerfect",	2 ),
+	m_iGradeWeightGreat			( "GradeWeightGreat",		1 ),
+	m_iGradeWeightGood			( "GradeWeightGood",		0 ),
+	m_iGradeWeightBoo			( "GradeWeightBoo",		-4 ),
+	m_iGradeWeightMiss			( "GradeWeightMiss",		-8 ),
+	m_iGradeWeightHitMine		( "GradeWeightHitMine",	-8 ),
+	m_iGradeWeightOK			( "GradeWeightOK",			6 ),
+	m_iGradeWeightNG			( "GradeWeightNG",			0 ),
+
+	m_fSuperMeterPercentChangeMarvelous	( "SuperMeterPercentChangeMarvelous",	+0.05f ),
+	m_fSuperMeterPercentChangePerfect	( "SuperMeterPercentChangePerfect",	+0.04f ),
+	m_fSuperMeterPercentChangeGreat		( "SuperMeterPercentChangeGreat",		+0.02f ),
+	m_fSuperMeterPercentChangeGood		( "SuperMeterPercentChangeGood",		+0.00f ),
+	m_fSuperMeterPercentChangeBoo		( "SuperMeterPercentChangeBoo",		-0.00f ),
+	m_fSuperMeterPercentChangeMiss		( "SuperMeterPercentChangeMiss",		-0.20f ),
+	m_fSuperMeterPercentChangeHitMine	( "SuperMeterPercentChangeHitMine",	-0.40f ),
+	m_fSuperMeterPercentChangeOK		( "SuperMeterPercentChangeOK",			+0.04f ),
+	m_fSuperMeterPercentChangeNG		( "SuperMeterPercentChangeNG",			-0.20f ),
+	m_bMercifulSuperMeter				( "MercifulSuperMeter",				true ),
+	
+	m_fTimeMeterSecondsChangeMarvelous	( "TimeMeterSecondsChangeMarvelous",	+0.1f ),
+	m_fTimeMeterSecondsChangePerfect	( "TimeMeterSecondsChangePerfect",		 0.0f ),
+	m_fTimeMeterSecondsChangeGreat		( "TimeMeterSecondsChangeGreat",		-0.5f ),
+	m_fTimeMeterSecondsChangeGood		( "TimeMeterSecondsChangeGood",		-1.0f ),
+	m_fTimeMeterSecondsChangeBoo		( "TimeMeterSecondsChangeBoo",			-2.0f ),
+	m_fTimeMeterSecondsChangeMiss		( "TimeMeterSecondsChangeMiss",		-4.0f ),
+	m_fTimeMeterSecondsChangeHitMine	( "TimeMeterSecondsChangeHitMine",		-2.0f ),
+	m_fTimeMeterSecondsChangeOK			( "TimeMeterSecondsChangeOK",			-0.0f ),
+	m_fTimeMeterSecondsChangeNG			( "TimeMeterSecondsChangeNG",			-4.0f ),
+
+	m_AutoPlay					( "AutoPlay",					PC_HUMAN ),
+	m_bDelayedBack				( "DelayedBack",				true ),
+	m_bShowInstructions			( "ShowInstructions",			true ),
+	m_bShowSelectGroup			( "ShowSelectGroup",			true ),
+	m_bShowCaution				( "ShowCaution",				true ),
+	m_bShowNativeLanguage		( "ShowNativeLanguage",		true ),
+	m_bArcadeOptionsNavigation	( "ArcadeOptionsNavigation",	false ),
+	m_MusicWheelUsesSections	( "MusicWheelUsesSections",	ALWAYS ),
+	m_iMusicWheelSwitchSpeed	( "MusicWheelSwitchSpeed",		10 ),
+	m_bEasterEggs				( "EasterEggs",				true ),
+	m_MarvelousTiming			( "MarvelousTiming",			MARVELOUS_EVERYWHERE ),
+	m_bEventMode				( "EventMode",					false ),
+	m_iCoinsPerCredit			( "CoinsPerCredit",			1 ),
+	m_iSongsPerPlay				( "SongsPerPlay",				3 ),
+
+	m_CoinMode						( "CoinMode",					COIN_HOME ),
+	m_Premium						( "Premium",					PREMIUM_NONE ),
+	m_bDelayedCreditsReconcile		( "DelayedCreditsReconcile",	false ),
+	m_bPickExtraStage				( "PickExtraStage",			false ),
+
+	m_bComboContinuesBetweenSongs	( "ComboContinuesBetweenSongs",false ),
+	m_fLongVerSongSeconds			( "LongVerSongSeconds",		60*2.5f ),	// Dynamite Rave is 2:55
+	m_fMarathonVerSongSeconds		( "MarathonVerSongSeconds",	60*5.f ),
+	m_ShowSongOptions				( "ShowSongOptions",			YES ),
+	m_bSoloSingle					( "SoloSingle",				false ),
+	m_bDancePointsForOni			( "DancePointsForOni",			false ),
+	m_bPercentageScoring			( "PercentageScoring",		false ),
+	m_fMinPercentageForMachineSongHighScore		( "MinPercentageForMachineSongHighScore",		0.5f ),
+	m_fMinPercentageForMachineCourseHighScore	( "MinPercentageForMachineCourseHighScore",	0.0001f ),	// don't save course scores with 0 percentage
+	m_bDisqualification				( "Disqualification",			false ),
+	m_bShowLyrics					( "ShowLyrics",				true ),
+	m_bAutogenSteps					( "AutogenSteps",				true ),
+	m_bAutogenGroupCourses			( "AutogenGroupCourses",		true ),
+	m_bBreakComboToGetItem			( "BreakComboToGetItem",		false ),
+	m_bLockCourseDifficulties		( "LockCourseDifficulties",	true ),
+	m_ShowDancingCharacters			( "ShowDancingCharacters",		CO_OFF ),
+	m_bUseUnlockSystem				( "UseUnlockSystem",			false ),
+	m_bFirstRun						( "FirstRun",					true ),
+	m_bAutoMapOnJoyChange			( "AutoMapOnJoyChange",		true ),
+	m_fGlobalOffsetSeconds			( "GlobalOffsetSeconds",		0 ),
+	m_iProgressiveLifebar			( "ProgressiveLifebar",		0 ),
+	m_iProgressiveStageLifebar		( "ProgressiveStageLifebar",	0 ),
+	m_iProgressiveNonstopLifebar	( "ProgressiveNonstopLifebar",	0 ),
+	m_bShowBeginnerHelper			( "ShowBeginnerHelper",		false ),
+	m_bEndlessBreakEnabled			( "EndlessBreakEnabled",		true ),
+	m_iEndlessNumStagesUntilBreak	( "EndlessNumStagesUntilBreak",5 ),
+	m_iEndlessBreakLength			( "EndlessBreakLength",		5 ),
+	m_bDisableScreenSaver			( "DisableScreenSaver",		true ),
+	m_sLanguage						( "Language",					"" ),	// ThemeManager will deal with this invalid language
+	m_sMemoryCardProfileSubdir		( "MemoryCardProfileSubdir",	PRODUCT_NAME ),
+	m_iProductID					( "ProductID",					1 ),	
+	m_sDefaultLocalProfileIDP1		( "DefaultLocalProfileIDP1",	"" ),
+	m_sDefaultLocalProfileIDP2		( "DefaultLocalProfileIDP2",	"" ),
+	m_bMemoryCards					( "MemoryCards",				false ),
+	m_sMemoryCardOsMountPointP1		( "MemoryCardOsMountPointP1",	"" ),
+	m_sMemoryCardOsMountPointP2		( "MemoryCardOsMountPointP2",	"" ),
+	m_iMemoryCardUsbBusP1			( "MemoryCardUsbBusP1",	-1 ),
+	m_iMemoryCardUsbBusP2			( "MemoryCardUsbBusP2",	-1 ),
+	m_iMemoryCardUsbPortP1			( "MemoryCardUsbPortP1",	-1 ),
+	m_iMemoryCardUsbPortP2			( "MemoryCardUsbPortP2",	-1 ),
+	m_iMemoryCardUsbLevelP1			( "MemoryCardUsbLevelP1",	-1 ),
+	m_iMemoryCardUsbLevelP2			( "MemoryCardUsbLevelP2",	-1 ),
+	m_iCenterImageTranslateX		( "CenterImageTranslateX",	0 ),
+	m_iCenterImageTranslateY		( "CenterImageTranslateY",	0 ),
+	m_fCenterImageAddWidth			( "CenterImageAddWidth",	0 ),
+	m_fCenterImageAddHeight			( "CenterImageAddHeight",	0 ),
+	m_iAttractSoundFrequency		( "AttractSoundFrequency",	1 ),
+	m_bAllowExtraStage				( "AllowExtraStage",		true ),
+	m_bHideDefaultNoteSkin			( "HideDefaultNoteSkin",	false ),
+	m_iMaxHighScoresPerListForMachine		( "MaxHighScoresPerListForMachine",		10 ),
+	m_iMaxHighScoresPerListForPlayer		( "MaxHighScoresPerListForPlayer",			3 ),
+	m_iMaxRecentScoresForMachine			( "MaxRecentScoresForMachine",				100 ),
+	m_iMaxRecentScoresForPlayer				( "MaxRecentScoresForPlayer",				20 ),
+	m_bAllowMultipleHighScoreWithSameName	( "AllowMultipleHighScoreWithSameName",	true ),
+	m_bCelShadeModels						( "CelShadeModels",						false ),	// Work-In-Progress.. disable by default.
+	m_bPreferredSortUsesGroups				( "PreferredSortUsesGroups",				true ),
+
+	m_fConstantUpdateDeltaSeconds	( "ConstantUpdateDeltaSeconds",0 ),
+	m_fPadStickSeconds				( "PadStickSeconds",			0 ),
+	m_bForceMipMaps					( "ForceMipMaps",				0 ),
+	m_bTrilinearFiltering			( "TrilinearFiltering",		0 ),
+	m_bAnisotropicFiltering			( "AnisotropicFiltering",		0 ),
+
+	m_bSignProfileData				( "SignProfileData",			false ),
+	m_bEditorShowBGChangesPlay		( "EditorShowBGChangesPlay",	false ),
+	m_CourseSortOrder				( "CourseSortOrder",			COURSE_SORT_SONGS ),
+	m_bMoveRandomToEnd				( "MoveRandomToEnd",			false ),
+	m_bSubSortByNumSteps			( "SubSortByNumSteps",			false ),
+	m_GetRankingName				( "GetRankingName",			RANKING_ON ),
+	m_ScoringType					( "ScoringType",				SCORING_MAX2 ),
+	m_BoostAppPriority				( "BoostAppPriority",			BOOST_AUTO ),
+	m_sAdditionalSongFolders		( "AdditionalSongFolders",		"" ),
+	m_sAdditionalFolders			( "AdditionalFolders",			"" ),
+	m_sLastSeenVideoDriver			( "LastSeenVideoDriver",		"" ),
+	m_sLastSeenInputDevices			( "LastSeenInputDevices",		"" ),
+#if defined(WIN32)
+	m_iLastSeenMemory				( "LastSeenMemory",			0 ),
+#endif
+	m_sVideoRenderers				( "VideoRenderers",			"" ),	// StepMania.cpp sets these on first run:
+	m_bSmoothLines					( "SmoothLines",				false ),
+	m_sSoundDrivers					( "SoundDrivers",				"" ),
+	m_iSoundWriteAhead				( "SoundWriteAhead",			0 ),
+	m_iSoundDevice					( "SoundDevice",				"" ),
+	m_fSoundVolume					( "SoundVolume",				-1 ),	// default
+	m_SoundResampleQuality			( "SoundResampleQuality",		RageSoundReader_Resample::RESAMP_NORMAL ),
+	m_sInputDrivers					( "InputDrivers",				"" ),
+	m_sMovieDrivers					( "MovieDrivers",				"" ),
+	m_sLightsDriver					( "LightsDriver",				"" ),
+	m_sLightsStepsDifficulty		( "LightsStepsDifficulty",		"medium" ),
+	m_bBlinkGameplayButtonLightsOnNote	( "BlinkGameplayButtonLightsOnNote",false ),
+	m_bAllowUnacceleratedRenderer	( "AllowUnacceleratedRenderer",false ),
+	m_bThreadedInput				( "ThreadedInput",				true ),
+	m_bThreadedMovieDecode			( "ThreadedMovieDecode",		true ),
+	m_bScreenTestMode				( "ScreenTestMode",			false ),
+	m_bDebugLights					( "DebugLights",				false ),
+	m_bMonkeyInput					( "MonkeyInput",				false ),
+	m_sMachineName					( "MachineName",				"" ),
+	m_sIgnoredMessageWindows		( "IgnoredMessageWindows",		"" ),
+	m_sCoursesToShowRanking			( "CoursesToShowRanking",		"" ),
 
 	/* Debug: */
-	m_bLogToDisk					( Options, "LogToDisk",					true ),
-	m_bForceLogFlush				( Options, "ForceLogFlush",				false ),
-	m_bShowLogOutput				( Options, "ShowLogOutput",				false ),
-	m_bTimestamping					( Options, "Timestamping",				false ),
-	m_bLogSkips						( Options, "LogSkips",					false ),
-	m_bLogCheckpoints				( Options, "LogCheckpoints",			false ),
-	m_bShowLoadingWindow			( Options, "ShowLoadingWindow",			true ),
+	m_bLogToDisk					( "LogToDisk",					true ),
+	m_bForceLogFlush				( "ForceLogFlush",				false ),
+	m_bShowLogOutput				( "ShowLogOutput",				false ),
+	m_bTimestamping					( "Timestamping",				false ),
+	m_bLogSkips						( "LogSkips",					false ),
+	m_bLogCheckpoints				( "LogCheckpoints",			false ),
+	m_bShowLoadingWindow			( "ShowLoadingWindow",			true ),
 
 	/* Game-specific prefs: */
-	m_sDefaultModifiers				( Options, "DefaultModifiers",			"" )
+	m_sDefaultModifiers				( "DefaultModifiers",			"" )
 
 #if defined(XBOX)
 	,
-	m_bEnableVirtualMemory		( Options, "EnableVirtualMemory",			true ),
-	m_iPageFileSize				( Options, "PageFileSize",					384 ),
-	m_iPageSize					( Options, "PageSize",						16 ),
-	m_iPageThreshold			( Options, "PageThreshold",					8 ),
-	m_bLogVirtualMemory 		( Options, "LogVirtualMemory",				false )
+	m_bEnableVirtualMemory		( "EnableVirtualMemory",			true ),
+	m_iPageFileSize				( "PageFileSize",					384 ),
+	m_iPageSize					( "PageSize",						16 ),
+	m_iPageThreshold			( "PageThreshold",					8 ),
+	m_bLogVirtualMemory 		( "LogVirtualMemory",				false )
 #endif
 {
 	Init();
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index c81efca077..184f3fd741 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -31,8 +31,7 @@ const CString LAST_GOOD_DIR	=	"LastGood/";
 
 // Directories to search for a profile if m_sMemoryCardProfileSubdir doesn't
 // exist, separated by ";":
-static Preference<CString> g_sMemoryCardProfileImportSubdirs(
-	Options, "MemoryCardProfileImportSubdirs", "" );
+static Preference<CString> g_sMemoryCardProfileImportSubdirs( "MemoryCardProfileImportSubdirs", "" );
 
 
 ProfileManager::ProfileManager()
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index baa29527f2..04e0e9cc4e 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -23,7 +23,7 @@ static const char* g_szKeys[NUM_KEYBOARD_ROWS][KEYS_PER_ROW] =
 	{"","","Space","","","Backsp","","","Cancel","","","Done",""},
 };
 
-static Preference<bool> g_bAllowOldKeyboardInput( Options, "AllowOldKeyboardInput",	true );
+static Preference<bool> g_bAllowOldKeyboardInput( "AllowOldKeyboardInput",	true );
 
 float GetButtonX( int x )
 {