diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 993ec43926..44882f0410 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -322,7 +322,7 @@ bool PlayerOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut
 	else if( sBit == "boomerang" )				SET_FLOAT( fAccels[ACCEL_BOOMERANG] )
 	else if( sBit == "drunk" )				SET_FLOAT( fEffects[EFFECT_DRUNK] )
 	else if( sBit == "dizzy" )				SET_FLOAT( fEffects[EFFECT_DIZZY] )
-	else if( sBit == "confusion" )			SET_FLOAT( fEffects[EFFECT_CONFUSION] )
+	else if( sBit == "confusion" )				SET_FLOAT( fEffects[EFFECT_CONFUSION] )
 	else if( sBit == "mini" )				SET_FLOAT( fEffects[EFFECT_MINI] )
 	else if( sBit == "tiny" )				SET_FLOAT( fEffects[EFFECT_TINY] )
 	else if( sBit == "flip" )				SET_FLOAT( fEffects[EFFECT_FLIP] )
diff --git a/stepmania/src/SongOptions.cpp b/stepmania/src/SongOptions.cpp
index 2fd0870ce9..30a9a4a5aa 100644
--- a/stepmania/src/SongOptions.cpp
+++ b/stepmania/src/SongOptions.cpp
@@ -185,26 +185,26 @@ bool SongOptions::FromOneModString( const RString &sOneMod, RString &sErrorOut )
 			on = false;
 	}
 
-	if(	 sBit == "norecover" )			m_DrainType = DRAIN_NO_RECOVER;
-	else if( sBit == "suddendeath" || sBit == "death" )		m_DrainType = DRAIN_SUDDEN_DEATH;
-	else if( sBit == "power-drop" )		m_DrainType = DRAIN_NO_RECOVER;
-	else if( sBit == "normal-drain" )	m_DrainType = DRAIN_NORMAL;
+	if(	 sBit == "norecover" )				m_DrainType = DRAIN_NO_RECOVER;
+	else if( sBit == "suddendeath" || sBit == "death" )	m_DrainType = DRAIN_SUDDEN_DEATH;
+	else if( sBit == "power-drop" )				m_DrainType = DRAIN_NO_RECOVER;
+	else if( sBit == "normal-drain" )			m_DrainType = DRAIN_NORMAL;
 
-	else if( sBit == "clap" )			m_bAssistClap = on;
-	else if( sBit == "metronome" )		m_bAssistMetronome = on;
+	else if( sBit == "clap" )				m_bAssistClap = on;
+	else if( sBit == "metronome" )				m_bAssistMetronome = on;
 	else if( sBit == "autosync" || sBit == "autosyncsong" )	m_AutosyncType = on ? AUTOSYNC_SONG : AUTOSYNC_OFF;
-	else if( sBit == "autosyncmachine" )	m_AutosyncType = on ? AUTOSYNC_MACHINE : AUTOSYNC_OFF; 
-	else if( sBit == "autosynctempo" )	m_AutosyncType = on ? AUTOSYNC_TEMPO : AUTOSYNC_OFF;
-	else if( sBit == "effect" && !on )	m_SoundEffectType = SOUNDEFFECT_OFF;
-	else if( sBit == "effectspeed" )	m_SoundEffectType = on ? SOUNDEFFECT_SPEED : SOUNDEFFECT_OFF;
-	else if( sBit == "effectpitch" )	m_SoundEffectType = on ? SOUNDEFFECT_PITCH : SOUNDEFFECT_OFF;
-	else if( sBit == "staticbg" )		m_bStaticBackground = on;
-	else if( sBit == "randombg" )		m_bRandomBGOnly = on;
-	else if( sBit == "savescore" )		m_bSaveScore = on;
-	else if( sBit == "bar" )			m_LifeType = LIFE_BAR;
-	else if( sBit == "battery" )		m_LifeType = LIFE_BATTERY;
-	else if( sBit == "lifetime" )		m_LifeType = LIFE_TIME;
-	else if( sBit == "haste" )			m_fHaste = on? 1.0f:0.0f;
+	else if( sBit == "autosyncmachine" )			m_AutosyncType = on ? AUTOSYNC_MACHINE : AUTOSYNC_OFF; 
+	else if( sBit == "autosynctempo" )			m_AutosyncType = on ? AUTOSYNC_TEMPO : AUTOSYNC_OFF;
+	else if( sBit == "effect" && !on )			m_SoundEffectType = SOUNDEFFECT_OFF;
+	else if( sBit == "effectspeed" )			m_SoundEffectType = on ? SOUNDEFFECT_SPEED : SOUNDEFFECT_OFF;
+	else if( sBit == "effectpitch" )			m_SoundEffectType = on ? SOUNDEFFECT_PITCH : SOUNDEFFECT_OFF;
+	else if( sBit == "staticbg" )				m_bStaticBackground = on;
+	else if( sBit == "randombg" )				m_bRandomBGOnly = on;
+	else if( sBit == "savescore" )				m_bSaveScore = on;
+	else if( sBit == "bar" )				m_LifeType = LIFE_BAR;
+	else if( sBit == "battery" )				m_LifeType = LIFE_BATTERY;
+	else if( sBit == "lifetime" )				m_LifeType = LIFE_TIME;
+	else if( sBit == "haste" )				m_fHaste = on? 1.0f:0.0f;
 	else
 		return false;