diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 7fec6a2122..e13ff1b764 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -60,7 +60,7 @@ UnlockNames=""
 # Unlock2="song,ABC;code,59183751;roulette"
 
 [ScreenSelect]
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 UpdateOnMessage=""
 
 [ScreenTitleMenu]
@@ -68,7 +68,7 @@ UpdateOnMessage=""
 # the displayed text, which might be translated or otherwise changed.  The "name,foo"
 # parameter to ModeChoices is an asset name, which is used in filenames.
 Class="ScreenTitleMenu"
-Fallback=ScreenSelectMasterBlank
+Fallback="ScreenSelectMasterBlank"
 PrevScreen="ScreenCompany"
 ScreenOnCommand=lockinput,0
 CoinModeChangeScreen=ScreenTitleBranch()
@@ -115,21 +115,21 @@ PrevScreen="ScreenCompany"
 
 [ScreenExit]
 Class="ScreenExit"
-Fallback=Screen
+Fallback="Screen"
 AllowOperatorMenuButton=false
 
 [ScreenTitleJoin]
 Class="ScreenTitleMenu"
-Fallback=ScreenTitleMenu
+Fallback="ScreenTitleMenu"
 ChoiceNames="1"
 
 [ScreenCaution]
-Fallback=ScreenSelectMasterBlank
+Fallback="ScreenSelectMasterBlank"
 PrevScreen=ScreenTitleBranch()
 Choice1="screen,ScreenSelectStyle"
 
 [ScreenEz2SelectPlayer]
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 JoinFrameP1X=SCREEN_CENTER_X-200
 JoinFrameP1Y=SCREEN_CENTER_Y+110
 JoinFrameP2X=SCREEN_CENTER_X+200
@@ -149,7 +149,7 @@ FoldOnJoin=true
 
 [ScreenSelectStyle]
 Class="ScreenSelectStyle"
-Fallback=ScreenSelect
+Fallback="ScreenSelect"
 ChoiceNames="1,2,3,4,5"
 # The "name" here affects the announcer, eg. "ScreenSelectStyle comment single".
 Choice1="Style,single;name,single;screen,ScreenSelectDifficulty"
@@ -219,7 +219,7 @@ PictureOnCommand=diffusealpha,0;glow,1,1,1,0;linear,0.2;glow,1,1,1,1;linear,0.0;
 PictureOffCommand=linear,0.5;diffusealpha,0;glow,1,1,1,0
 
 [ScreenSelectMode]
-Fallback=ScreenSelect
+Fallback="ScreenSelect"
 JoinFrameP1X=SCREEN_CENTER_X-200
 JoinFrameP1Y=SCREEN_CENTER_Y+110
 JoinFrameP2X=SCREEN_CENTER_X+200
@@ -256,7 +256,7 @@ CharacterIconP2OffCommand=linear,0.3;diffusealpha,0;sleep,10
 
 [ScreenSelectDifficulty]
 Class="ScreenSelectDifficulty"
-Fallback=ScreenSelect
+Fallback="ScreenSelect"
 ScreenOnCommand=
 LockInputSeconds=0.8
 ChoiceNames="1,2,3,4,5,6,7,8"
@@ -379,7 +379,7 @@ DisabledCommand=diffuse,0.2,0.2,0.2,1
 Class="ScreenSelectGroup"
 NextScreen=GetScreenInstructions()
 PrevScreen=ScreenTitleBranch()
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 WaitForChildrenBeforeTweeningOut=true
 FrameX=SCREEN_CENTER_X-140
 FrameY=SCREEN_CENTER_Y-80
@@ -446,7 +446,7 @@ TitleInitCommand=horizalign,left;vertalign,top;shadowlength,2;zoom,0.5;
 
 [ScreenInstructions]
 Class="ScreenInstructions"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 NextScreen="ScreenSelectCharacter"
 PrevScreen=ScreenTitleBranch()
 TimerSeconds=15
@@ -454,7 +454,7 @@ StyleIcon=true
 
 [ScreenSelectMusic]
 Class="ScreenSelectMusic"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 NextScreen=GetSelectMusicNext()
 PrevScreen=ScreenTitleBranch()
 MusicWheelType="MusicWheel"
@@ -513,7 +513,7 @@ ScreenBeginCommand=setupmusicstagemods
 
 [ScreenSelectCourse]
 Class="ScreenSelectMusic"
-Fallback=ScreenSelectMusic
+Fallback="ScreenSelectMusic"
 BPMDisplayOnCommand=hidden,1
 CDTitleOnCommand=hidden,1
 ExplanationX=SCREEN_CENTER_X-188
@@ -525,11 +525,11 @@ DoRouletteOnMenuTimer=false
 ScreenBeginCommand=setupcoursestagemods
 
 [ScreenSelectCourseNonstop]
-Fallback=ScreenSelectCourse
+Fallback="ScreenSelectCourse"
 DefaultSort="Nonstop"
 
 [ScreenSelectCourseOni]
-Fallback=ScreenSelectCourse
+Fallback="ScreenSelectCourse"
 DefaultSort="Oni"
 ScoreP1OnCommand=hidden,1
 ScoreP2OnCommand=hidden,1
@@ -537,12 +537,12 @@ ScoreFrameP1OnCommand=hidden,1
 ScoreFrameP2OnCommand=hidden,1
 
 [ScreenSelectCourseEndless]
-Fallback=ScreenSelectCourse
+Fallback="ScreenSelectCourse"
 DefaultSort="Endless"
 
 [ScreenSMOnlineLogin]
 Class="ScreenSMOnlineLogin"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen=SMOnlineScreen()
 PrevScreen=ScreenTitleBranch()
 StyleIcon=false
@@ -562,7 +562,7 @@ TitleOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0
 TitleOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
 PrevScreen=ScreenTitleBranch()
 NextScreen="ScreenGameplayBranch"
-Fallback=ScreenNetSelectMusic
+Fallback="ScreenNetSelectMusic"
 Class="ScreenNetRoom"
 OpenRoomColor=color("1.0,1.0,1.0,1.0")
 PasswdRoomColor=color("1.0,0.5,0.5,1.0")
@@ -575,7 +575,7 @@ RoomWheelOnCommand=
 PrevScreen="ScreenNetRoom"
 Class="ScreenNetSelectMusic"
 RoomSelectScreen="ScreenNetRoom"
-Fallback=ScreenNetSelectMusic
+Fallback="ScreenNetSelectMusic"
 
 [ScreenNetSelectMusic]
 BannerWidth=200 // These dont do anything but prevent crashes
@@ -675,7 +675,7 @@ PrevScreen=ScreenTitleBranch()
 NextScreen="ScreenStage"
 NoSongsScreen=ScreenTitleBranch()
 Class="ScreenNetSelectMusic"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 
 [ScreenEz2SelectMusic]
 PrevScreen=ScreenTitleBranch()
@@ -739,14 +739,14 @@ StyleIcon=false
 
 [ScreenSplash]
 Class="ScreenSplash"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 MinimumLoadDelaySeconds=2
 AllowStartToSkip=false
 PrepareScreen=false
 
 [ScreenStage]
 Class="ScreenStage"
-Fallback=Screen
+Fallback="Screen"
 NextScreen=GetGameplayScreen()
 PrevScreen=SongSelectionScreen()
 // This is the minimum delay after the "in" transition before the
@@ -759,7 +759,7 @@ OverlayOffCommand=
 
 [ScreenGameplay]
 Class="ScreenGameplayNormal"
-Fallback=ScreenWithMenuElementsBlank
+Fallback="ScreenWithMenuElementsBlank"
 PrevScreen=SongSelectionScreen()
 NextScreen=GetGameplayNextScreen()
 TimerSeconds=-1
@@ -969,7 +969,7 @@ StopCourseEarly=false
 ShowEvaluationOnFail=true
 
 [ScreenGameplayExtra]
-Fallback=ScreenGameplay
+Fallback="ScreenGameplay"
 LifeFrameX=SCREEN_CENTER_X+0
 LifeFrameY=SCREEN_CENTER_Y+202
 LifeFrameOnCommand=addy,100;sleep,0.5;linear,1;addy,-100
@@ -1061,11 +1061,11 @@ DifficultyMeterP2Y=
 
 [ScreenGameplayShared]
 Class="ScreenGameplayShared"
-Fallback=ScreenGameplay
+Fallback="ScreenGameplay"
 PlayerType="PlayerShared"
 
 [ScreenEvaluation]
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 Class="ScreenEvaluation"
 Summary=0
 DifficultyIconP1X=
@@ -1243,7 +1243,7 @@ PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0
 
 [ScreenNetEvaluation]
 Class="ScreenNetEvaluation"
-Fallback=ScreenEvaluationStage
+Fallback="ScreenEvaluationStage"
 NextScreen=ScreenBranchNetAfterEval()
 UsersBG1Y=SCREEN_CENTER_Y+0
 UsersBG1X=SCREEN_CENTER_X-180
@@ -1266,7 +1266,7 @@ UserDeSelCommand=zoomx,1.4;zoomy,1.4;linear,0.1;zoomx,1.0;zoomy,1.0
 UserSelCommand=zoomx,1.0;zoomy,1.0;linear,0.1;zoomx,1.4;zoomy,1.4
 
 [ScreenEvaluationStage]
-Fallback=ScreenEvaluation
+Fallback="ScreenEvaluation"
 NextScreen=GetEvaluationNextScreen( ScreenEvaluationExitBranch(), "ScreenGameOver", "ScreenEvaluationSummary" )
 ShowGradeArea=true
 ShowPointsArea=false
@@ -1464,7 +1464,7 @@ TryExtraStageOffCommand=linear,0.7;diffusealpha,0
 CheerDelaySeconds=2.5
 
 [ScreenEvaluationSummary]
-Fallback=ScreenEvaluation
+Fallback="ScreenEvaluation"
 NextScreen=GetEvaluationNextScreen( "ScreenNameEntry", "ScreenGameOver", "ScreenNameEntry" )
 Summary=true
 ShowGradeArea=true
@@ -1632,7 +1632,7 @@ CourseRecordP2OffCommand=linear,0.7;diffusealpha,0
 CheerDelaySeconds=2.5
 
 [ScreenEvaluationNonstop]
-Fallback=ScreenEvaluation
+Fallback="ScreenEvaluation"
 NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseNonstop", "ScreenNameEntry", "ScreenNameEntry" )
 ShowGradeArea=true
 ShowPointsArea=false
@@ -1707,7 +1707,7 @@ ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
 CheerDelaySeconds=2.5
 
 [ScreenEvaluationOni]
-Fallback=ScreenEvaluation
+Fallback="ScreenEvaluation"
 NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseOni", "ScreenNameEntry", "ScreenNameEntry" )
 ShowGradeArea=false
 ShowPointsArea=true
@@ -1782,7 +1782,7 @@ TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
 CheerDelaySeconds=2.5
 
 [ScreenEvaluationEndless]
-Fallback=ScreenEvaluation
+Fallback="ScreenEvaluation"
 NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseEndless", "ScreenNameEntry", "ScreenNameEntry" )
 ShowGradeArea=false
 ShowPointsArea=true
@@ -1869,7 +1869,7 @@ TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
 CheerDelaySeconds=2.5
 
 [ScreenEvaluationRave]
-Fallback=ScreenEvaluation
+Fallback="ScreenEvaluation"
 NextScreen=GetEvaluationNextScreen( "ScreenSelectMusic", "ScreenGameOver", "ScreenEvaluationSummary" )
 ShowGradeArea=true
 ShowPointsArea=false
@@ -1972,7 +1972,7 @@ NumberOnCommandFunction=
 
 [ScreenMusicScroll]
 Class="ScreenMusicScroll"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 PrevScreen=
 FirstUpdateCommand=
 ScrollDelay=0.2
@@ -2021,7 +2021,7 @@ Row6Y=SCREEN_CENTER_Y+60
 Row7Y=SCREEN_CENTER_Y+100
 
 [ScreenEditMenu]
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 NextScreen="ScreenEdit"
 PrevScreen=ScreenTitleBranch()
 Class="ScreenEditMenu"
@@ -2037,7 +2037,7 @@ TimerSeconds=-1
 
 [ScreenJukeboxMenu]
 Class="ScreenOptionsMaster"
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 NextScreen="ScreenJukebox"
 PrevScreen=ScreenTitleBranch()
 StyleIcon=false
@@ -2051,7 +2051,7 @@ Line3="list,Difficulties"
 Line4="list,RandomModifiers"
 
 [ScreenSystemLayer]
-Fallback=Screen
+Fallback="Screen"
 Class="ScreenSystemLayer"
 MessageX=0
 MessageY=0
@@ -2071,15 +2071,15 @@ CreditsJoinOnly=false
 
 [ScreenDebugOverlay]
 Class="ScreenDebugOverlay"
-Fallback=Screen
+Fallback="Screen"
 
 [ScreenSyncOverlay]
 Class="ScreenSyncOverlay"
-Fallback=Screen
+Fallback="Screen"
 
 [ScreenStatsOverlay]
 Class="ScreenStatsOverlay"
-Fallback=Screen
+Fallback="Screen"
 StatsX=SCREEN_RIGHT-8
 StatsY=SCREEN_TOP+10
 StatsOnCommand=horizalign,right;vertalign,top;zoom,0.7;shadowlength,2
@@ -2090,7 +2090,7 @@ TextX=0
 TextY=0
 
 [MusicWheelItem]
-Fallback=WheelItemBase
+Fallback="WheelItemBase"
 IconX=-136
 IconY=0
 IconOnCommand=
@@ -2172,7 +2172,7 @@ ChoiceMediumMeter=sort,MediumMeter
 ChoiceHardMeter=sort,HardMeter
 
 [RoomWheel]
-Fallback=MusicWheel
+Fallback="MusicWheel"
 RoomWheelItemStartOnCommand=
 RoomWheelItemFinishOnCommand=
 CreateRoomColor=color("0.0,0.8,0.3,1.0")
@@ -2218,7 +2218,7 @@ StreamPassingOnCommand=
 MinStayAlive=W3
 
 [LifeMeterTime]
-Fallback=LifeMeterBar
+Fallback="LifeMeterBar"
 
 [DifficultyMeter]
 NumFeetInMeter=10
@@ -2251,7 +2251,7 @@ MeterSetChallengeCourseCommand=diffuse,DifficultyColor(DIFFICULTY_CHALLENGE)
 MeterSetEditCourseCommand=diffuse,DifficultyColor(DIFFICULTY_EDIT)
 
 [DifficultyMeterEdit]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 ShowMeter=true
 MeterX=-70
 MeterY=0
@@ -2273,7 +2273,7 @@ MeterSetEditCourseCommand=diffuse,DifficultyColor(DIFFICULTY_EDIT)
 ZeroMeterString= 
 
 [ScreenWithMenuElements]
-Fallback=Screen
+Fallback="Screen"
 AllowDisabledPlayerInput=false
 StyleIcon=true
 ShowStage=false
@@ -2342,7 +2342,7 @@ WarningCommand1=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
 WarningCommand0=stoptweening;stopeffect;linear,0.2;zoomx,1
 
 [ScreenOptions]
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 NavigationMode="normal"
 InputMode="individual"
 ForceAllPlayers=false
@@ -2432,7 +2432,7 @@ LineExitTitle=list,ExitTitle
 
 [ScreenMapControllers]
 Class="ScreenMapControllers"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 ButtonsToMap=""
 LineScrollerOnCommand=%function(self) self:y(50) self:SetTransformFromHeight(24) end
@@ -2467,7 +2467,7 @@ DevicesOffCommand=linear,0.5;diffusealpha,0
 
 [ScreenCenterImage]
 Class="ScreenCenterImage"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 AllowResize=true
 TimerOnCommand=hidden,1
 NextScreen="ScreenOptionsService"
@@ -2475,7 +2475,7 @@ PrevScreen="ScreenOptionsService"
 
 [ScreenTestFonts]
 Class="ScreenTestFonts"
-Fallback=ScreenTest
+Fallback="ScreenTest"
 Font1="Common normal"
 Font2="_shared1"
 Font3="_shared2"
@@ -2498,17 +2498,17 @@ TextOnCommand=wrapwidthpixels,SCREEN_WIDTH
 
 [ScreenTestFonts]
 Class="ScreenTestFonts"
-Fallback=ScreenTest
+Fallback="ScreenTest"
 
 [ScreenTestInput]
 Class="ScreenTestInput"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 
 [ScreenTestLights]
 Class="ScreenTestLights"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 TextX=SCREEN_CENTER_X-200
@@ -2518,19 +2518,19 @@ TextOffCommand=
 
 [ScreenNetworkOptions2]
 Class="ScreenNetworkOptions"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenCaution"
 PrevScreen="ScreenTitleMenu"
 
 [ScreenNetworkOptions]
 Class="ScreenNetworkOptions"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 
 [ScreenBookkeeping]
 Class="ScreenBookkeeping"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 AllTimeX=SCREEN_CENTER_X
@@ -2593,7 +2593,7 @@ TimerSeconds=
 PrevScreen=ScreenTitleBranch()
 NextScreen="ScreenStage"
 NoSongsScreen=ScreenTitleBranch()
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 
 [HoldGhostArrow]
 WarmUpSeconds=0.25
@@ -2708,7 +2708,7 @@ TapJudgmentsUnderField=false
 HoldJudgmentsUnderField=false
 
 [PlayerShared]
-Fallback=Player
+Fallback="Player"
 ComboXOffsetOneSideP1=-120
 ComboXOffsetOneSideP2=120
 JudgmentTransformCommandFunction=JudgmentTransformSharedCommand
@@ -2773,7 +2773,7 @@ CancelAllPlayerOptions=""
 BackInEventMode=""
 
 [CourseCodeDetector]
-Fallback=CodeDetector
+Fallback="CodeDetector"
 NextSort1=
 NextSort2=
 NextSort3=
@@ -2941,7 +2941,7 @@ PercentP8OffCommand=
 AttackDurationSeconds=10
 
 [ScreenSelectMaster]
-Fallback=ScreenSelect
+Fallback="ScreenSelect"
 Class="ScreenSelectMaster"
 WrapCursor=false
 AllowRepeatingInput=false
@@ -3034,7 +3034,7 @@ IdleCommentSeconds=0
 IdleTimeoutSeconds=0
 
 [ScreenInputOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6"
 Line1="conf,AutoMapOnJoyChange"
 Line2="conf,OnlyDedicatedMenuButtons"
@@ -3044,7 +3044,7 @@ Line5="conf,ArcadeOptionsNavigation"
 Line6="conf,MusicWheelSwitchSpeed"
 
 [ScreenCoinOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5"
 Line1="conf,CoinMode"
 Line2="conf,SongsPerPlay"
@@ -3053,7 +3053,7 @@ Line4="conf,Premium"
 Line5="conf,EventMode"
 
 [ScreenMachineOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6,7,8,9,10,11"
 Line1="conf,MenuTimer"
 Line2="conf,ScoringType"
@@ -3068,7 +3068,7 @@ Line10="conf,GetRankingName"
 Line11="conf,AllowW1"
 
 [ScreenGraphicOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
@@ -3086,7 +3086,7 @@ Line13="conf,ShowStats"
 Line14="conf,ShowBanners"
 
 [ScreenGameplayOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6"
 Line1="conf,Center1Player"
 Line2="conf,HiddenSongs"
@@ -3096,7 +3096,7 @@ Line5="conf,PickExtraStage"
 Line6="conf,UseUnlockSystem"
 
 [ScreenBackgroundOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6"
 Line1="conf,RandomBackgroundMode"
 Line2="conf,BGBrightness"
@@ -3106,7 +3106,7 @@ Line5="conf,ShowBeginnerHelper"
 Line6="conf,NumBackgrounds"
 
 [ScreenAppearanceOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13"
 Line1="conf,Language"
 Line2="conf,Announcer"
@@ -3123,14 +3123,14 @@ Line12="conf,ShowNativeLanguage"
 Line13="conf,ShowLyrics"
 
 [ScreenOtherOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3"
 Line1="conf,AutogenSteps"
 Line2="conf,AutogenGroupCourses"
 Line3="conf,FastLoad"
 
 [ScreenSoundOptions]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 LineNames="1,2,3"
 Line1="conf,SoundResampleQuality"
 Line2="conf,AttractSoundFrequency"
@@ -3138,12 +3138,12 @@ Line3="conf,SoundVolume"
 
 [ScreenAttract]
 StartScreen=ScreenTitleBranch()
-Fallback=ScreenWithMenuElementsBlank
+Fallback="ScreenWithMenuElementsBlank"
 BackGoesToStartScreen=true
 PrevScreen=
 
 [ScreenWithMenuElementsBlank]
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 HeaderX=
 HeaderY=
 HeaderOnCommand=hidden,1
@@ -3162,11 +3162,11 @@ TimerOnCommand=hidden,1
 TimerOffCommand=
 
 [ScreenSelectBlank]
-Fallback=ScreenWithMenuElementsBlank
+Fallback="ScreenWithMenuElementsBlank"
 UpdateOnMessage=""
 
 [ScreenSelectMasterBlank]
-Fallback=ScreenSelectBlank
+Fallback="ScreenSelectBlank"
 Class="ScreenSelectMaster"
 AllowRepeatingInput=false
 ChoiceNames="1"
@@ -3226,7 +3226,7 @@ IdleTimeoutSeconds=0
 
 [ScreenUnlockStatus]
 Class="ScreenUnlockStatus"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 TypeOfPointsToDisplay="DP"
 TimeToDisplay=10
 PointsDisplayX=SCREEN_CENTER_X-220
@@ -3287,7 +3287,7 @@ DancePointsZoom=2
 
 [ScreenRanking]
 Class="ScreenRankingLines"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenUnlockStatus"
 PrevScreen="ScreenHowToPlay"
 TimerSeconds=-1
@@ -3418,35 +3418,35 @@ ScoreOffCommand=
 
 [ScreenIntroMovie]
 Class="ScreenAttract"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenDemonstration"
 
 [ScreenMemoryCard]
 Class="ScreenAttract"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenCompany"
 
 [ScreenCompany]
 Class="ScreenAttract"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenLogo"
 PrevScreen="ScreenCompany"
 TimerSeconds=999
 
 [ScreenAlbums]
 Class="ScreenAttract"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenLogo"
 
 [ScreenLogo]
 Class="ScreenAttract"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenHowToPlay"
 PrevScreen="ScreenCompany"
 
 [ScreenHowToPlay]
 Class="ScreenHowToPlay"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 TimerSeconds=25
 NextScreen="ScreenDemonstration"
 PrevScreen="ScreenLogo"
@@ -3473,7 +3473,7 @@ NumW2s=4
 NumMisses=6
 
 [ScreenDemonstration]
-Fallback=ScreenGameplay
+Fallback="ScreenGameplay"
 Class="ScreenDemonstration"
 SecondsToShow=30
 NextScreen="ScreenRanking"
@@ -3487,14 +3487,14 @@ AllowStyleTypes="TwoPlayersTwoSides"
 [ScreenJukebox]
 ShowCourseModifiersProbability=0
 Class="ScreenJukebox"
-Fallback=ScreenGameplay
+Fallback="ScreenGameplay"
 NextScreen="ScreenJukebox"
 StartScreen=ScreenTitleBranch()
 AllowAdvancedModifiers=true
 
 [ScreenNameEntry]
 Class="ScreenNameEntry"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 TimerX=SCREEN_CENTER_X+0
 TimerY=SCREEN_CENTER_Y-210
 CategoryY=SCREEN_CENTER_Y+190
@@ -3551,10 +3551,10 @@ Row7Y=SCREEN_CENTER_Y+80
 Row8Y=SCREEN_CENTER_Y+120
 
 [EditCoursesSongMenu]
-Fallback=EditCoursesMenu
+Fallback="EditCoursesMenu"
 
 [ScreenOptionsSimple]
-Fallback=ScreenOptionsMaster
+Fallback="ScreenOptionsMaster"
 TitleX=SCREEN_CENTER_X-180
 TitleOnCommand=zoom,0.5;horizalign,left;ShadowLength,0
 TitleGainFocusCommand=diffuseshift;EffectColor1,1.3,1.3,1.3,1;EffectColor2,0.3,0.3,0.3,1
@@ -3566,7 +3566,7 @@ StyleIcon=false
 
 [ScreenOptionsService]
 Class="ScreenOptionsMaster"
-Fallback=ScreenOptionsSimple
+Fallback="ScreenOptionsSimple"
 NextScreen=ScreenTitleBranch()
 PrevScreen=ScreenTitleBranch()
 # "Rows" sets the number of rows; this field is required.
@@ -3608,7 +3608,7 @@ GroupedScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenBackgroundOpt
 PersistScreens="ScreenOptionsService,ScreenAppearanceOptions,ScreenBackgroundOptions,ScreenCenterImage,ScreenCoinOptions,ScreenMapControllers,ScreenInputOptions,ScreenGameplayOptions,ScreenGraphicOptions,ScreenMachineOptions,ScreenSoundOptions,ScreenOptionsManageProfiles,ScreenOtherOptions,ScreenNetworkOptions,ScreenReloadSongs,ScreenTestInput,ScreenGameplaySyncMachine,ScreenCredits2"
 
 [ScreenOptionsServiceChild]
-Fallback=ScreenOptionsMaster
+Fallback="ScreenOptionsMaster"
 NavigationMode="normal"
 InputMode="together"
 IconsOnCommand=x,-30
@@ -3621,7 +3621,7 @@ PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 
 [ScreenOptionsTestMenu]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 LineNames="1"
@@ -3646,7 +3646,7 @@ ThreeLinesSubtitleCommand=hidden,0;zoom,.5;maxwidth,360
 ThreeLinesArtistCommand=zoom,0.6;maxwidth,266;y,10
 
 [TextBannerCourseEntry]
-Fallback=TextBanner
+Fallback="TextBanner"
 TitleX=-90
 SubtitleX=-90
 ArtistX=-90
@@ -3680,14 +3680,14 @@ TipShowTime=1
 TipOnCommand=
 
 [ScreenSelectGame]
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 PrevScreen=ScreenTitleBranch()
 NextScreen=ScreenTitleBranch()
 LineNames="1"
 Line1="conf,Game"
 
 [ScreenPlayerOptions]
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 Class="ScreenPlayerOptions"
 PrevScreen=SongSelectionScreen()
 NextScreen=ScreenPlayerOptionsNext()
@@ -3712,7 +3712,7 @@ Line14="list,Steps"
 Line15="list,Characters"
 
 [ScreenRaveOptions]
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 Class="ScreenOptionsMaster"
 PrevScreen="ScreenSelectMusic"
 NextScreen="ScreenStage"
@@ -3727,7 +3727,7 @@ Line5="list,Steps"
 
 [ScreenSongOptions]
 Class="ScreenSongOptions"
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 PrevScreen=SelectFirstOptionsScreen()
 NextScreen="ScreenStage"
 Game=Change the current game type with this option.
@@ -3748,25 +3748,25 @@ StopMusicOnBack=false
 [ScreenCredits2]
 Class="ScreenWithMenuElementsSimple"
 BackGoesToStartScreen=false
-Fallback=ScreenCredits
+Fallback="ScreenCredits"
 StartScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 
 [ScreenCredits]
 Class="ScreenCredits"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 TimerSeconds=58
 NextScreen="ScreenRanking"
 
 [ScreenGameOver]
 Class="ScreenAttract"
-Fallback=ScreenAttract
+Fallback="ScreenAttract"
 NextScreen="ScreenCompany"
 
 [ScreenSelectCharacter]
 Class="ScreenSelectCharacter"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 WaitForChildrenBeforeTweeningOut=true
 TitleP1OnCommand=x,140;y,80;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 TitleP1OffCommand=sleep,0.2;bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
@@ -3828,7 +3828,7 @@ ExitItem=ScreenString("Exit")
 ExitTitle=""
 
 [ScreenOptionsMaster]
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 Class="ScreenOptionsMaster"
 
 # ExitItem is an exit row with the "Exit" text as a menu item; ExitTitle
@@ -4018,7 +4018,7 @@ Transfer From USB Drive,1="screen,ScreenOptionsManageEditSteps;name,Transfer Fro
 
 [ScreenReloadSongs]
 Class="ScreenReloadSongs"
-Fallback=Screen
+Fallback="Screen"
 NextScreen=ScreenTitleBranch()
 
 [DancingCharacters]
@@ -4084,7 +4084,7 @@ Class="ScreenSetTime"
 StyleIcon=false
 TimerSeconds=-1
 TimerOnCommand=hidden,1
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
 
@@ -4093,40 +4093,40 @@ ScrollRandom=false
 ScrollRoulette=false
 
 [ScreenGameplay DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplay DifficultyMeterP2]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplayExtra DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplayExtra DifficultyMeterP2]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenDemonstration DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenDemonstration DifficultyMeterP2]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenEvaluation DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenEvaluation DifficultyMeterP2]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplayMultiplayer DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplaySyncMachine DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplayShared DifficultyMeterP1]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenGameplayShared DifficultyMeterP2]
-Fallback=DifficultyMeter
+Fallback="DifficultyMeter"
 
 [ScreenEdit]
 PrepareScreens=GetEditModeSubScreens()
@@ -4134,7 +4134,7 @@ GroupedScreens=GetEditModeSubScreens()
 PersistScreens=GetEditModeSubScreens()
 
 EditMode="Full"
-Fallback=ScreenWithMenuElementsBlank
+Fallback="ScreenWithMenuElementsBlank"
 Class="ScreenEdit"
 NextScreen="ScreenEditMenu"
 PrevScreen="ScreenEditMenu"
@@ -4152,7 +4152,7 @@ PlayRecordHelpY=SCREEN_BOTTOM-20
 PlayRecordHelpOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
 
 [ScreenEditOptions]
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 Class="ScreenOptionsMaster"
 NextScreen="none"
 PrevScreen="none"
@@ -4240,7 +4240,7 @@ ItemUseRateSeconds=0
 
 [ScreenMiniMenu]
 Class="ScreenMiniMenu"
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 PrevScreen=
 TimerSeconds=-1
 ShowExplanations=false
@@ -4275,44 +4275,44 @@ CapitalizeAllOptionNames=false
 TweenSeconds=0
 
 [ScreenMiniMenuEditHelp]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 ColorDisabled=color("1,1,1,1")
 
 [ScreenMiniMenuMainMenu]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 TitleX=SCREEN_CENTER_X-80
 
 [ScreenMiniMenuAreaMenu]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuStepsInformation]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuSongInformation]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuBackgroundChange]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuPreferences]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuInsertTapAttack]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuInsertCourseAttack]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuCourseDisplay]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenMiniMenuCourseOptions]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 
 [ScreenTextEntry]
 Class="ScreenTextEntry"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 TimerSeconds=-1
 StyleIcon=false
 RowStartX=SCREEN_LEFT+100
@@ -4333,7 +4333,7 @@ KeysInitCommand=zoom,0.8;shadowlength,0
 
 [ScreenPrompt]
 Class="ScreenPrompt"
-Fallback=ScreenWithMenuElementsBlank
+Fallback="ScreenWithMenuElementsBlank"
 TimerSeconds=-1
 
 QuestionX=SCREEN_CENTER_X
@@ -4376,7 +4376,7 @@ GradeTierForExtra1=Tier03
 GradeTierForExtra2=Tier03
 
 [ScreenMiniMenuContext]
-Fallback=ScreenMiniMenu
+Fallback="ScreenMiniMenu"
 NumRowsShown=10
 RowPositionTransformFunction=function(self,positionIndex,itemIndex,numItems) self:y(24*(positionIndex-(numItems-1)/2)) end
 ItemsLongRowSharedX=0
@@ -4391,20 +4391,20 @@ ColorSelected=color("1,1,1,1")
 ColorNotSelected=color("0.7,0.7,0.7,1")
 
 [ScreenJukebox DifficultyMeterP1]
-Fallback=ScreenGameplay DifficultyMeterP1
+Fallback="ScreenGameplay DifficultyMeterP1"
 
 [ScreenJukebox DifficultyMeterP2]
-Fallback=ScreenGameplay DifficultyMeterP2
+Fallback="ScreenGameplay DifficultyMeterP2"
 
 [ScreenOptionsManage]
-Fallback=ScreenOptionsSimple
+Fallback="ScreenOptionsSimple"
 TimerSeconds=-1
 CapitalizeAllOptionNames=false
 AllowRepeatingChangeValueInput=true
 
 [ScreenOptionsManageEditSteps]
 Class="ScreenOptionsManageEditSteps"
-Fallback=ScreenOptionsManage
+Fallback="ScreenOptionsManage"
 CreateNewScreen="ScreenEditMenu"
 EditMode="Full"
 PrevScreen="ScreenSelectEditMode"
@@ -4414,7 +4414,7 @@ GroupedScreens="ScreenMiniMenuContext"
 PersistScreens="ScreenMiniMenuContext"
 
 [ScreenOptionsEditCoursesSimple]
-Fallback=ScreenOptions
+Fallback="ScreenOptions"
 EditMode="Full"
 PrepareScreens="ScreenMiniMenuContext"
 GroupedScreens="ScreenMiniMenuContext"
@@ -4434,7 +4434,7 @@ BulletOnCommand=hidden,1
 
 [ScreenOptionsManageCourses]
 Class="ScreenOptionsManageCourses"
-Fallback=ScreenOptionsEditCoursesSimple
+Fallback="ScreenOptionsEditCoursesSimple"
 PrevScreen=ScreenTitleBranch()
 NextScreen="ScreenOptionsEditCourse"
 TitleX=SCREEN_LEFT+32
@@ -4445,27 +4445,27 @@ CreateNewScreen=""
 
 [ScreenOptionsEditCourse]
 Class="ScreenOptionsEditCourse"
-Fallback=ScreenOptionsEditCoursesSimple
+Fallback="ScreenOptionsEditCoursesSimple"
 PrevScreen="ScreenOptionsManageCourses"
 NextScreen="ScreenOptionsEditCourseEntry"
 
 [ScreenOptionsEditCourseEntry]
 Class="ScreenOptionsEditCourseEntry"
-Fallback=ScreenOptionsEditCoursesSimple
+Fallback="ScreenOptionsEditCoursesSimple"
 ShowModsRow=true
 PrevScreen="ScreenOptionsEditCourse"
 NextScreen="ScreenEditCourseMods"
 
 [ScreenEditCourseMods]
 Class="ScreenEdit"
-Fallback=ScreenEdit
+Fallback="ScreenEdit"
 EditMode="CourseMods"
 NextScreen="ScreenOptionsEditCourseEntry"
 PrevScreen="ScreenOptionsEditCourseEntry"
 
 [ScreenOptionsManageProfiles]
 Class="ScreenOptionsManageProfiles"
-Fallback=ScreenOptionsSimple
+Fallback="ScreenOptionsSimple"
 PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 PrepareScreens="ScreenMiniMenuContext"
@@ -4476,7 +4476,7 @@ TimerSeconds=-1
 
 [ScreenOptionsEditProfile]
 Class="ScreenOptionsEditProfile"
-Fallback=ScreenOptionsServiceChild
+Fallback="ScreenOptionsServiceChild"
 PrevScreen="ScreenOptionsManageProfiles"
 NextScreen="ScreenOptionsManageProfiles"
 TimerSeconds=-1
@@ -4491,12 +4491,12 @@ NumFixedProfiles=1
 
 [ScreenJoinMultiplayer]
 Class="ScreenJoinMultiplayer"
-Fallback=ScreenWithMenuElements
+Fallback="ScreenWithMenuElements"
 TimerSeconds=-1
 
 [ScreenGameplaySyncMachine]
 Class="ScreenGameplaySyncMachine"
-Fallback=ScreenGameplay
+Fallback="ScreenGameplay"
 PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 PlayerType="PlayerSyncMachine"
@@ -4900,10 +4900,10 @@ CourseHandsLabelLoseFocusCommand=
 
 [ScreenSandbox]
 Class="ScreenSandbox"
-Fallback=Screen
+Fallback="Screen"
 
 [PlayerSyncMachine]
-Fallback=Player
+Fallback="Player"
 ComboOnCommand=hidden,1
 
 [Profile]
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index f96d5cc886..bfabb0cb40 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -825,7 +825,9 @@ RString ThemeManager::GetClassFallback( const RString &sClassName )
 	if( !GetMetricRawRecursive(g_pLoadedThemeData->iniMetrics,sClassName,"Fallback",sFallback) )
 		return RString();
 
-	return sFallback;
+	RString sRet;
+	LuaHelpers::RunExpressionS( sFallback, sRet );
+	return sRet;
 }
 
 bool ThemeManager::GetMetricRawRecursive( const IniFile &ini, const RString &sClassName_, const RString &sValueName, RString &sOut )