diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index d9329acca1..ae0311eafe 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -586,11 +586,14 @@ CString PlayerOptions::ThemeMod( CString sOneMod )
 		sOneMod.erase( sOneMod.begin(), sOneMod.begin()+sizeof(PERCENT_100) );
 	}
 
-	// Capitalize all tokens
+	// Change all token to first letter capitalized, rest lowercase
 	CStringArray asTokens;
 	split( sOneMod, " ", asTokens );
-	for( unsigned i=0; i<asTokens.size(); i++ )
-		asTokens[i] = Capitalize( asTokens[i] );
+	FOREACH( CString, asTokens, s )
+	{
+		s->MakeLower();
+		*s = Capitalize( *s );
+	}
 
 	/* Theme the mod name (the last string).  Allow this to not exist, since
 	 * characters might use modifiers that don't exist in the theme. */