diff --git a/Themes/_portKit-sm4/metrics.ini b/Themes/_portKit-sm4/metrics.ini
index 68069d45aa..0140d6ce62 100644
--- a/Themes/_portKit-sm4/metrics.ini
+++ b/Themes/_portKit-sm4/metrics.ini
@@ -120,7 +120,9 @@ IdleCommentSeconds=12
 IdleTimeoutSeconds=30
 IdleTimeoutScreen=THEME:GetMetric("Common","FirstAttractScreen")
 OutDelay=.2
+# frieza hax
 DoublePressToSelect=false
+# this one sucks though
 UseTwoLists=false
 OptionOrderBUp=""
 OptionOrderBDown=""
@@ -137,6 +139,7 @@ AllowOperatorMenuButton=false
 Class="ScreenTitleMenu"
 Fallback="ScreenTitleMenu"
 ChoiceNames="1"
+# frieza hax
 ChoiceNamesB=""
 OptionOrderBUp=""
 OptionOrderBDown=""
@@ -144,7 +147,6 @@ OptionOrderBLeft=""
 OptionOrderBRight=""
 OptionOrderBAuto=""
 
-
 [ScreenCaution]
 Fallback="ScreenSplash"
 PrepareScreen="ScreenSelectStyle"
@@ -222,7 +224,9 @@ ExplanationPage2X=0
 ExplanationPage2Y=0
 HeaderOnCommand=
 HeaderOffCommand=
+# frieza hax
 DoublePressToSelect=false
+# this one sucks
 UseTwoLists=false
 ChoiceNamesB=""
 OptionOrderBUp=""
@@ -286,13 +290,15 @@ ExplanationPage2X=0
 ExplanationPage2Y=0
 HeaderOnCommand=
 HeaderOffCommand=
+# frieza hax
 DoublePressToSelect=false
+# this one sucks
+UseTwoLists=
 OptionOrderBUp=
 OptionOrderBDown=
 OptionOrderBLeft=
 OptionOrderBRight=
 OptionOrderBAuto=
-UseTwoLists=
 
 [ScreenSelectMode]
 Fallback="ScreenSelect"
@@ -357,7 +363,7 @@ StartX=0
 StartY=0
 SpacingX=150
 CropWidth=146
-TitleInitCommand=horizalign,left;vertalign,top;shadowlength,2;
+TitleInitCommand=halign,0;valign,0;shadowlength,2;
 
 [ScreenInstructions]
 Class="ScreenInstructions"
@@ -386,7 +392,7 @@ ShowStageFrame=true
 CDTitleX=SCREEN_CENTER_X+240
 CDTitleY=SCREEN_CENTER_Y-50
 CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Back";
-CDTitleBackCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Front";diffuse,#606060;
+CDTitleBackCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Front";diffuse,color("#606060");
 CDTitleOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6;draworder,101
 CDTitleOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 ScoreFrameP1X=
@@ -430,6 +436,7 @@ PreviousSongButton="MenuLeft"
 NextSongButton="MenuRight"
 UseOptionsList=false
 TwoPartSelection=false
+# this metric is not supported in regular sm4 anymore:
 TwoPartConfirmsOnly=false
 UsePlayerSelectMenu=false
 StepsDisplayP1X=
@@ -456,7 +463,9 @@ OptionsAreaP2X=SCREEN_CENTER_X+166
 OptionsAreaP2Y=SCREEN_CENTER_Y+148
 OptionsAreaP2OnCommand=
 OptionsAreaP2OffCommand=
-SelectMenuChangesDifficulty=false
+SelectMenuChangesDifficulty=true
+SelectMenuScreenName="ScreenPlayerOptions"
+OptionsListTimeout=0.5
 WrapChangeSteps=false
 
 [ScreenSelectCourse]
@@ -522,7 +531,7 @@ Fallback="ScreenNetSelectMusic"
 [ScreenNetSelectMusic]
 Fallback="ScreenWithMenuElements"
 Class="ScreenNetSelectMusic"
-BannerWidth=0 // These dont do anything but prevent crashes
+BannerWidth=0
 BannerHeight=0
 MusicWheelX=SCREEN_CENTER_X-178
 MusicWheelY=SCREEN_CENTER_Y-10
@@ -531,7 +540,7 @@ MusicWheelOffCommand=
 TimerStealth=true
 BPMDisplayX=SCREEN_CENTER_X*0.3
 BPMDisplayY=SCREEN_CENTER_Y+120
-BPMDisplayOnCommand=horizalign,right;shadowlength,1;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
+BPMDisplayOnCommand=halign,1;shadowlength,1;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 ModIconsP1X=SCREEN_CENTER_X+144
 ModIconsP1Y=SCREEN_CENTER_Y-165
@@ -547,14 +556,14 @@ ChatInputBoxOnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 ChatInputBoxOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
 ChatInputBoxWidth=310
 ChatInputBoxHeight=60
-ChatInputBoxColor=color("0.5,0.5,1.0,0.7") //transparent cyan
+ChatInputBoxColor=color("0.5,0.5,1.0,0.7")
 ChatOutputBoxX=SCREEN_CENTER_X+144
 ChatOutputBoxY=SCREEN_CENTER_Y-37
 ChatOutputBoxOnCommand=zoomy,1.1;addx,SCREEN_WIDTH*0.6;bounceend,0.5;diffusealpha,1;addx,-SCREEN_WIDTH*0.6
 ChatOutputBoxOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoom,0;
 ChatOutputBoxWidth=310
 ChatOutputBoxHeight=210
-ChatOutputBoxColor=color("1.0,0.5,0.5,0.7") //transparent reddish
+ChatOutputBoxColor=color("1.0,0.5,0.5,0.7")
 ChatInputX=SCREEN_CENTER_X-2
 ChatInputY=SCREEN_CENTER_Y+90
 ChatInputOnCommand=diffusealpha,0;linear,0.55;diffusealpha,1
@@ -580,11 +589,11 @@ optionsOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,0.7;zoomx,0.7
 optionsOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
 MeterP1Y=SCREEN_CENTER_Y+150
 MeterP1X=SCREEN_CENTER_X-223
-MeterP1OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
+MeterP1OnCommand=halign,1;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
 MeterP1OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
 MeterP2Y=SCREEN_CENTER_Y+150
 MeterP2X=SCREEN_CENTER_X-110
-MeterP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
+MeterP2OnCommand=halign,1;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
 MeterP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
 DiffBGColor=color("0.7,0.7,0.7,0.7")
 DiffBGWidth=0
@@ -636,6 +645,7 @@ PrevScreen=SongSelectionScreen()
 NextScreen=GetGameplayNextScreen()
 LightsMode="LightsMode_Gameplay"
 TimerSeconds=-1
+# this metric is not supported in regular sm4 anymore:
 UseAlternativeInput=false
 PlayerType="Player"
 PlayerInitCommand=y,SCREEN_CENTER_Y
@@ -668,7 +678,7 @@ OniGameOverP2OffCommand=
 OniGameOverP2DieCommand=diffusealpha,1;bounceend,0.5;y,SCREEN_CENTER_Y;bob;effectperiod,4;effectmagnitude,0,6,0
 LifeFrameX=SCREEN_CENTER_X+0
 LifeFrameY=SCREEN_TOP
-LifeFrameOnCommand=vertalign,top;addy,-100;linear,0.5;addy,100
+LifeFrameOnCommand=valign,0;addy,-100;linear,0.5;addy,100
 LifeFrameOffCommand=linear,0.5;addy,-100
 LifeP1X=SCREEN_CENTER_X-184
 LifeP1Y=SCREEN_CENTER_Y-212
@@ -703,7 +713,7 @@ SongNumberP2OffCommand=linear,0.5;addy,-100
 ShowScoreInRave=true
 ScoreFrameX=SCREEN_CENTER_X
 ScoreFrameY=SCREEN_BOTTOM
-ScoreFrameOnCommand=vertalign,bottom;addy,100;linear,0.5;addy,-100;draworder,2
+ScoreFrameOnCommand=valign,1;addy,100;linear,0.5;addy,-100;draworder,2
 ScoreFrameOffCommand=linear,0.5;addy,100
 ScoreP1X=SCREEN_CENTER_X-220
 ScoreP1Y=SCREEN_CENTER_Y+200
@@ -1096,11 +1106,11 @@ LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 
 PlayerOptionsP1X=SCREEN_CENTER_X-70
 PlayerOptionsP1Y=SCREEN_CENTER_Y-182
-PlayerOptionsP1OnCommand=visible,false;horizalign,left;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
+PlayerOptionsP1OnCommand=visible,false;halign,0;valign,1;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 PlayerOptionsP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 PlayerOptionsP2X=SCREEN_CENTER_X+70
 PlayerOptionsP2Y=SCREEN_CENTER_Y-90
-PlayerOptionsP2OnCommand=visible,false;horizalign,right;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
+PlayerOptionsP2OnCommand=visible,false;halign,1;valign,1;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 
 SurvivedFrameP1X=SCREEN_CENTER_X-224
@@ -1212,92 +1222,92 @@ BonusFrameP2OffCommand=linear,0.7;diffusealpha,0
 
 BarPossible1P1X=SCREEN_CENTER_X-142
 BarPossible1P1Y=SCREEN_CENTER_Y-55
-BarPossible1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
+BarPossible1P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
 BarPossible1P1OffCommand=linear,0.7;diffusealpha,0
 BarPossible1P2X=SCREEN_CENTER_X+148
 BarPossible1P2Y=SCREEN_CENTER_Y-55
-BarPossible1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
+BarPossible1P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
 BarPossible1P2OffCommand=linear,0.7;diffusealpha,0
 
 BarPossible2P1X=SCREEN_CENTER_X-142
 BarPossible2P1Y=SCREEN_CENTER_Y-33
-BarPossible2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
+BarPossible2P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
 BarPossible2P1OffCommand=linear,0.7;diffusealpha,0
 BarPossible2P2X=SCREEN_CENTER_X+148
 BarPossible2P2Y=SCREEN_CENTER_Y-33
-BarPossible2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
+BarPossible2P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
 BarPossible2P2OffCommand=linear,0.7;diffusealpha,0
 
 BarPossible3P1X=SCREEN_CENTER_X-142
 BarPossible3P1Y=SCREEN_CENTER_Y-8
-BarPossible3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
+BarPossible3P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
 BarPossible3P1OffCommand=linear,0.7;diffusealpha,0
 BarPossible3P2X=SCREEN_CENTER_X+148
 BarPossible3P2Y=SCREEN_CENTER_Y-8
-BarPossible3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
+BarPossible3P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
 BarPossible3P2OffCommand=linear,0.7;diffusealpha,0
 
 BarPossible4P1X=SCREEN_CENTER_X-142
 BarPossible4P1Y=SCREEN_CENTER_Y+14
-BarPossible4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
+BarPossible4P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
 BarPossible4P1OffCommand=linear,0.7;diffusealpha,0
 BarPossible4P2X=SCREEN_CENTER_X+148
 BarPossible4P2Y=SCREEN_CENTER_Y+14
-BarPossible4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
+BarPossible4P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
 BarPossible4P2OffCommand=linear,0.7;diffusealpha,0
 
 BarPossible5P1X=SCREEN_CENTER_X-142
 BarPossible5P1Y=SCREEN_CENTER_Y+36
-BarPossible5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
+BarPossible5P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
 BarPossible5P1OffCommand=linear,0.7;diffusealpha,0
 BarPossible5P2X=SCREEN_CENTER_X+148
 BarPossible5P2Y=SCREEN_CENTER_Y+36
-BarPossible5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
+BarPossible5P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
 BarPossible5P2OffCommand=linear,0.7;diffusealpha,0
 
 BarActual1P1X=SCREEN_CENTER_X-142
 BarActual1P1Y=SCREEN_CENTER_Y-55
-BarActual1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
+BarActual1P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
 BarActual1P1OffCommand=linear,0.7;diffusealpha,0
 BarActual1P2X=SCREEN_CENTER_X+148
 BarActual1P2Y=SCREEN_CENTER_Y-55
-BarActual1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
+BarActual1P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
 BarActual1P2OffCommand=linear,0.7;diffusealpha,0
 
 BarActual2P1X=SCREEN_CENTER_X-142
 BarActual2P1Y=SCREEN_CENTER_Y-33
-BarActual2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
+BarActual2P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
 BarActual2P1OffCommand=linear,0.7;diffusealpha,0
 BarActual2P2X=SCREEN_CENTER_X+148
 BarActual2P2Y=SCREEN_CENTER_Y-33
-BarActual2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
+BarActual2P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
 BarActual2P2OffCommand=linear,0.7;diffusealpha,0
 
 BarActual3P1X=SCREEN_CENTER_X-142
 BarActual3P1Y=SCREEN_CENTER_Y-8
-BarActual3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
+BarActual3P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
 BarActual3P1OffCommand=linear,0.7;diffusealpha,0
 BarActual3P2X=SCREEN_CENTER_X+148
 BarActual3P2Y=SCREEN_CENTER_Y-8
-BarActual3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
+BarActual3P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
 BarActual3P2OffCommand=linear,0.7;diffusealpha,0
 
 BarActual4P1X=SCREEN_CENTER_X-142
 BarActual4P1Y=SCREEN_CENTER_Y+14
-BarActual4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
+BarActual4P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
 BarActual4P1OffCommand=linear,0.7;diffusealpha,0
 BarActual4P2X=SCREEN_CENTER_X+148
 BarActual4P2Y=SCREEN_CENTER_Y+14
-BarActual4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
+BarActual4P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
 BarActual4P2OffCommand=linear,0.7;diffusealpha,0
 
 BarActual5P1X=SCREEN_CENTER_X-142
 BarActual5P1Y=SCREEN_CENTER_Y+36
-BarActual5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
+BarActual5P1OnCommand=halign,0;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
 BarActual5P1OffCommand=linear,0.7;diffusealpha,0
 BarActual5P2X=SCREEN_CENTER_X+148
 BarActual5P2Y=SCREEN_CENTER_Y+36
-BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
+BarActual5P2OnCommand=halign,0;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
 BarActual5P2OffCommand=linear,0.7;diffusealpha,0
 
 ShowGraphDisplay=true
@@ -1360,6 +1370,7 @@ CheerDelaySeconds=2.5
 Class="ScreenNetEvaluation"
 Fallback="ScreenEvaluationStage"
 NextScreen=ScreenBranchNetAfterEval()
+# Players background
 UsersBG1Y=SCREEN_CENTER_Y+0
 UsersBG1X=SCREEN_CENTER_X-180
 UsersBG2Y=SCREEN_CENTER_Y+0
@@ -1369,6 +1380,7 @@ UsersBGHeight=400
 UsersBGCommand=diffuse,0.4,0.1,0.4,0.5
 UsersBGOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomx,1.0;zoomy,1.0
 UsersBGOffCommand=zoomx,1.0;zoomy,1.0;linear,0.5;zoomx,0.0;zoomy,0.0
+# Players list
 User1Y=SCREEN_CENTER_Y-160
 User1X=SCREEN_CENTER_X-180
 User2Y=SCREEN_CENTER_Y-160
@@ -1636,13 +1648,13 @@ Fallback="Screen"
 ############################################ REMOVE ME #########################
 DebugMenuHeaderX=SCREEN_LEFT+20
 DebugMenuHeaderY=SCREEN_TOP+20
-DebugMenuHeaderOnCommand=horizalign,left
+DebugMenuHeaderOnCommand=halign,0
 
 LineOnColor=color("1,1,1,1")
 LineOffColor=color("0.6,0.6,0.6,1")
 
-PageNameGainFocusCommand=diffuse,color("1,1,1,1")
-PageNameLoseFocusCommand=diffuse,color("0.6,0.6,0.6,1")
+PageTextGainFocusCommand=diffuse,color("1,1,1,1")
+PageTextLoseFocusCommand=diffuse,color("0.6,0.6,0.6,1")
 ############################################ REMOVE ME #########################
 
 [ScreenSyncOverlay]
@@ -1656,7 +1668,7 @@ Class="ScreenStatsOverlay"
 Fallback="Screen"
 StatsX=SCREEN_RIGHT-8
 StatsY=SCREEN_TOP+10
-StatsOnCommand=horizalign,right;vertalign,top;shadowlength,1
+StatsOnCommand=halign,1;valign,0;shadowlength,1
 ShowSkips=true
 SkipX=SCREEN_RIGHT-100
 SkipY=SCREEN_BOTTOM-100
@@ -1669,7 +1681,7 @@ WheelNotifyIconY=0
 WheelNotifyIconOnCommand=
 SongNameX=-30
 SongNameY=0
-SongNameOnCommand=maxwidth,208;
+SongNameOnCommand=
 SectionExpandedX=-18
 SectionExpandedY=-2
 SectionExpandedOnCommand=maxwidth,208;strokecolor,color("#00000077");shadowlength,0
@@ -1729,7 +1741,7 @@ MusicWheelSortOnCommand=
 MusicWheelSortOffCommand=
 MusicWheelItemSortOnCommand=addx,-SCREEN_WIDTH/2;accelerate,0.2;addx,SCREEN_WIDTH/2
 MusicWheelItemSortOffCommand=decelerate,0.2;addx,-SCREEN_WIDTH/2
-HighlightOnCommand=glowshift;effectcolor1,#00C0FF00;effectcolor2,#00C0FF7F;effectclock,"bgm";addx,-SCREEN_WIDTH/2;sleep,0.05;accelerate,0.4;addx,SCREEN_WIDTH/2
+HighlightOnCommand=glowshift;effectcolor1,color("#00C0FF00");effectcolor2,color("#00C0FF7F");effectclock,"bgm";addx,-SCREEN_WIDTH/2;sleep,0.05;accelerate,0.4;addx,SCREEN_WIDTH/2
 HighlightOffCommand=decelerate,0.2;addx,-SCREEN_WIDTH/2
 HighlightSortOnCommand=accelerate,0.2;addx,SCREEN_WIDTH/2
 HighlightSortOffCommand=decelerate,0.2;addx,-SCREEN_WIDTH/2
@@ -1807,8 +1819,6 @@ InitialValue=0.5
 HotValue=1.0
 LifeMultiplier=1.0
 MinStayAlive="TapNoteScore_W3"
-FlashHotOnNoteHit=false
-MinScoreToFlash="TapNoteScore_W3"
 LifePercentChangeW1=0.008
 LifePercentChangeW2=0.008
 LifePercentChangeW3=0.004
@@ -1839,7 +1849,7 @@ FrameX=0
 FrameY=0
 FrameOnCommand=
 FrameLoadCommand=%function(self,param) local bFlip = param.PlayerState and param.PlayerState:GetPlayerNumber() ~= PLAYER_1; self:zoomx(bFlip and -1 or 1); end
-FrameSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) end end
+FrameSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) end end
 NumTicks=10
 MaxTicks=14
 TicksX=0
@@ -1852,17 +1862,17 @@ ZeroMeterString="?"
 MeterX=30
 MeterY=0
 MeterOnCommand=shadowlength,0
-MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
+MeterSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowDescription=true
 DescriptionX=-10
 DescriptionY=0
 DescriptionOnCommand=shadowlength,0;uppercase,true;
-DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
+DescriptionSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowAutogen=true
 AutogenX=40
 AutogenY=0
 AutogenOnCommand=
-AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
+AutogenSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowStepsType=false
 StepsTypeX=0
 StepsTypeY=0
@@ -1910,6 +1920,7 @@ Fallback="StepsDisplayGameplay"
 
 [ScreenWithMenuElements]
 Fallback="Screen"
+Class="ScreenWithMenuElements"
 AllowDisabledPlayerInput=false
 ShowStyleIcon=true
 ShowStageDisplay=false
@@ -1930,7 +1941,7 @@ HeaderOnCommand=
 HeaderOffCommand=
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM
-FooterOnCommand=draworder,-1;vertalign,bottom
+FooterOnCommand=draworder,-1;valign,1
 FooterOffCommand=
 ShowHelp=true
 HelpX=SCREEN_CENTER_X
@@ -1981,7 +1992,7 @@ Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds
 Text2OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,13;y,2
 Text2FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.mod(fSeconds,10); return ""..digit end
 Warning6Command=stoptweening;sleep,0.8;linear,0.2;zoomx,0
-Warning5Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0;glowshift;effectperiod,0.15;effectcolor1,1,0,0,0;effectcolor2,1,0,0,1
+Warning5Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0;glowshift;effectperiod,0.15;effectcolor1,color("1,0,0,0");effectcolor2,color("1,0,0,1")
 Warning4Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
 Warning3Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
 Warning2Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0
@@ -2005,15 +2016,15 @@ RowOffCommand=
 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-146+36*offsetFromCenter) end
 ExplanationP1X=SCREEN_CENTER_X-300
 ExplanationP1Y=SCREEN_CENTER_Y+184
-ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
+ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;halign,0;cropright,1;linear,0.5;cropright,0
 ExplanationP1OffCommand=
 ExplanationP2X=SCREEN_CENTER_X+250
 ExplanationP2Y=SCREEN_CENTER_Y+184
-ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
+ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,500;halign,1;cropright,1;linear,0.5;cropright,0
 ExplanationP2OffCommand=
 ExplanationTogetherX=SCREEN_CENTER_X-302
 ExplanationTogetherY=SCREEN_CENTER_Y+184
-ExplanationTogetherOnCommand=shadowlength,0;wrapwidthpixels,600;horizalign,left;cropright,1;linear,0.5;cropright,0
+ExplanationTogetherOnCommand=shadowlength,0;wrapwidthpixels,600;halign,0;cropright,1;linear,0.5;cropright,0
 ExplanationTogetherOffCommand=
 DisqualifyP1X=
 DisqualifyP1Y=
@@ -2093,19 +2104,19 @@ TitleOnCommand=visible,false
 [OptionsCursor]
 LeftX=
 LeftY=
-LeftOnCommand=horizalign,right;
+LeftOnCommand=halign,1;
 MiddleX=
 MiddleY=
 MiddleOnCommand=
 RightX=
 RightY=
-RightOnCommand=horizalign,left;
+RightOnCommand=halign,0;
 CanGoLeftX=
 CanGoLeftY=
-CanGoLeftOnCommand=horizalign,right;
+CanGoLeftOnCommand=halign,1;
 CanGoRightX=
 CanGoRightY=
-CanGoRightOnCommand=horizalign,left;
+CanGoRightOnCommand=halign,0;
 
 [OptionsCursorP1]
 Fallback="OptionsCursor"
@@ -2159,7 +2170,7 @@ LineOnCommand=%function(self) self:y(0); self:visible(true); local LeftToRight =
 LineOffCommand=%function(self) local LeftToRight = math.mod(self.ItemIndex, 2) == 0 and 1 or -1; self:stoptweening() self:accelerate(0.3); self:addx(SCREEN_WIDTH * LeftToRight); self:queuecommand('Hide') end
 ErrorX=SCREEN_CENTER_X
 ErrorY=SCREEN_CENTER_Y
-ErrorOnCommand=diffuse,#00FF00;zoom,0.8
+ErrorOnCommand=diffuse,color("#00FF00");zoom,0.8
 LabelP1OnCommand=x,SCREEN_CENTER_X-195;zoom,0.7;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1
 LabelP1OffCommand=linear,0.5;diffusealpha,0
 LabelP2OnCommand=x,SCREEN_CENTER_X+195;zoom,0.7;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1
@@ -2172,11 +2183,11 @@ MappedToP1S3Command=x,SCREEN_CENTER_X-120
 MappedToP2S1Command=x,SCREEN_CENTER_X+120
 MappedToP2S2Command=x,SCREEN_CENTER_X+195
 MappedToP2S3Command=x,SCREEN_CENTER_X+270
-MappedToOnCommand=diffuse,#808080;shadowlength,0;maxwidth,150
-MappedToWaitingCommand=diffuse,#FF8080;pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
-MappedToMappedInputCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effectcolor1,#FFFFFF
-MappedToGainFocusCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effectcolor1,#FFFFFF
-MappedToLoseFocusCommand=diffuse,#808080;stopeffect
+MappedToOnCommand=diffuse,color("#808080");shadowlength,0;maxwidth,150
+MappedToWaitingCommand=diffuse,color("#FF8080");pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
+MappedToMappedInputCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
+MappedToGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
+MappedToLoseFocusCommand=diffuse,color("#808080");stopeffect
 DevicesX=SCREEN_CENTER_X
 DevicesY=SCREEN_TOP+30
 DevicesOnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
@@ -2243,7 +2254,7 @@ ShowDayOfWeek=true
 ShowHourOfDay=true
 AllTimeX=SCREEN_CENTER_X
 AllTimeY=110
-AllTimeOnCommand=zoom,0.7;diffuseshift;effectcolor1,0.5,0.5,0.5,1
+AllTimeOnCommand=zoom,0.7;diffuseshift;effectcolor1,color("0.5,0.5,0.5,1")
 TitleX=SCREEN_CENTER_X
 TitleY=140
 TitleOnCommand=zoom,0.8 
@@ -2258,15 +2269,15 @@ PackagesBGX=SCREEN_WIDTH/4
 PackagesBGWidth=SCREEN_WIDTH/3
 PackagesBGOnCommand=diffusealpha,0.0;linear,0.9;diffusealpha,1.0
 PackagesBGOffCommand=diffusealpha,1.0;linear,0.6;diffusealpha,0.0
-PackagesBGBackCommand=linear,0.2;diffuse,#CCCCCC;diffusealpha,0.9
-PackagesBGAwayCommand=linear,0.2;diffuse,#020101;diffusealpha,0.9
+PackagesBGBackCommand=linear,0.2;diffuse,color("#CCCCCC");diffusealpha,0.9
+PackagesBGAwayCommand=linear,0.2;diffuse,color("#020101");diffusealpha,0.9
 WebBGY=SCREEN_CENTER_Y
 WebBGX=SCREEN_WIDTH*3.0/4.0
 WebBGWidth=SCREEN_WIDTH/3
 WebBGOnCommand=diffusealpha,0.0;linear,0.9;diffusealpha,1.0
 WebBGOffCommand=diffusealpha,1.0;linear,0.6;diffusealpha,0.0
-WebBGAwayCommand=linear,0.2;diffuse,#020101;diffusealpha,0.9
-WebBGBackCommand=linear,0.2;diffuse,#CCCCCC;diffusealpha,0.9
+WebBGAwayCommand=linear,0.2;diffuse,color("#020101");diffusealpha,0.9
+WebBGBackCommand=linear,0.2;diffuse,color("#CCCCCC");diffusealpha,0.9
 PackagesY=SCREEN_CENTER_Y+10
 PackagesX=SCREEN_WIDTH/4
 PackagesOnCommand=diffusealpha,0.0;linear,1.0;diffusealpha,1.0
@@ -2349,7 +2360,7 @@ ShowDancingCharacters=true
 DontUseStaticBackground=false
 
 [Judgment]
-JudgmentW1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
+JudgmentW1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.8")
 JudgmentW2Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0
 JudgmentW3Command=shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
 JudgmentW4Command=shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;
@@ -2363,10 +2374,10 @@ HoldJudgmentHeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx
 [Combo]
 ShowComboAt=5
 ShowMissesAt=0
-ComboLabelOnCommand=x,6;y,22;horizalign,left;vertalign,bottom
-MissesLabelOnCommand=x,6;y,22;horizalign,left;vertalign,bottom
-ComboNumberOnCommand=y,240-216;shadowlength,0;horizalign,right;vertalign,bottom
-MissesNumberOnCommand=y,240-216;shadowlength,0;horizalign,right;vertalign,bottom
+ComboLabelOnCommand=x,6;y,22;halign,0;valign,1
+MissesLabelOnCommand=x,6;y,22;halign,0;valign,1
+ComboNumberOnCommand=y,240-216;shadowlength,0;halign,1;valign,1
+MissesNumberOnCommand=y,240-216;shadowlength,0;halign,1;valign,1
 NumberMinZoom=0.4
 NumberMaxZoom=0.6
 NumberMaxZoomAt=150
@@ -2405,10 +2416,11 @@ CheckpointsTapsSeparateJudgment=true
 Fallback="Player"
 ComboXOffsetOneSideP1=-120
 ComboXOffsetOneSideP2=120
-JudgmentTransformCommand=%JudgmentTransformSharedCommand
+# this was removed in SM4
+#JudgmentTransformCommand=%JudgmentTransformSharedCommand
 
 [ProTimingDisplay]
-W1Command=shadowlength,4;diffuse,1,1,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
+W1Command=shadowlength,4;diffuse,1,1,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.8")
 W2Command=shadowlength,4;diffuse,1,.8,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0
 W3Command=shadowlength,4;diffuse,.6,.9,0,1;zoom,2.4;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0
 W4Command=shadowlength,4;diffuse,0,1,1,1;zoom,2.2;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0
@@ -2571,7 +2583,7 @@ OutLength=
 
 [LifeMeterBattery Percent]
 Format=
-PercentP1X=+20
+PercentP1X=20
 PercentP1Y=0
 PercentP1OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP1OffCommand=
@@ -2579,7 +2591,7 @@ PercentP2X=-20
 PercentP2Y=0
 PercentP2OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP2OffCommand=
-DancePointsP1X=+20
+DancePointsP1X=20
 DancePointsP1Y=0
 DancePointsP1OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 DancePointsP1OffCommand=
@@ -2595,19 +2607,19 @@ FormatPercentScore=FormatPercentScore
 [ScreenEvaluation Percent]
 PercentP1X=0
 PercentP1Y=0
-PercentP1OnCommand=horizalign,right;vertalign,bottom;glowshift;effectperiod,2;shadowlength,0
+PercentP1OnCommand=halign,1;valign,1;glowshift;effectperiod,2;shadowlength,0
 PercentP1OffCommand=
 PercentP2X=0
 PercentP2Y=0
-PercentP2OnCommand=horizalign,right;vertalign,bottom;glowshift;effectperiod,2;shadowlength,0
+PercentP2OnCommand=halign,1;valign,1;glowshift;effectperiod,2;shadowlength,0
 PercentP2OffCommand=
 PercentRemainderP1X=0
 PercentRemainderP1Y=0
-PercentRemainderP1OnCommand=horizalign,left;vertalign,bottom;glowshift;effectperiod,2;shadowlength,0
+PercentRemainderP1OnCommand=halign,0;valign,1;glowshift;effectperiod,2;shadowlength,0
 PercentRemainderP1OffCommand=
 PercentRemainderP2X=0
 PercentRemainderP2Y=0
-PercentRemainderP2OnCommand=horizalign,left;vertalign,bottom;glowshift;effectperiod,2;shadowlength,0
+PercentRemainderP2OnCommand=halign,0;valign,1;glowshift;effectperiod,2;shadowlength,0
 PercentRemainderP2OffCommand=
 DancePointsP1X=-26
 DancePointsP1Y=-32
@@ -2623,7 +2635,7 @@ ApplyScoreDisplayOptions=false
 FormatPercentScore=FormatPercentScore
 
 [ScoreDisplayPercentage Percent]
-PercentP1X=+20
+PercentP1X=20
 PercentP1Y=0
 PercentP1OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP1OffCommand=
@@ -2638,7 +2650,7 @@ Format=FormatPercentScore
 PercentDecimalPlaces=2
 PercentTotalSize=5
 
-PercentP3X=+20
+PercentP3X=20
 PercentP3Y=0
 PercentP3OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP3OffCommand=
@@ -2646,7 +2658,7 @@ PercentP4X=-20
 PercentP4Y=0
 PercentP4OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP4OffCommand=
-PercentP5X=+20
+PercentP5X=20
 PercentP5Y=0
 PercentP5OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP5OffCommand=
@@ -2654,7 +2666,7 @@ PercentP6X=-20
 PercentP6Y=0
 PercentP6OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 PercentP6OffCommand=
-PercentP7X=+20
+PercentP7X=20
 PercentP7Y=0
 PercentP7OnCommand=shadowlength,0;diffuse,PlayerColor(PLAYER_1)
 PercentP7OffCommand=
@@ -2692,6 +2704,7 @@ WrapScroller=false
 LoopScroller=false
 PerChoiceIconElement=true
 PerChoiceScrollElement=true
+# huh what's that
 DoSwitchAnyways=false
 # All on page 1 by default.
 NumChoicesOnPage1=999
@@ -2702,10 +2715,9 @@ CursorP1OffsetYFromIcon=0
 CursorP2OffsetXFromIcon=0
 CursorP2OffsetYFromIcon=0
 DisabledColor=#606060
-
+# removed in SM4
 DoublePressToSelect=false
 
-
 # Blank defaults for a few options.
 IconChoice1SwitchToPage1Command=
 IconChoice1SwitchToPage2Command=
@@ -2765,7 +2777,7 @@ IdleTimeoutSeconds=0
 
 [ScreenOptionsAdvanced]
 Fallback="ScreenOptionsServiceChild"
-LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31"
+LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30"
 Line1="conf,MenuTimer"
 Line2="conf,ScoringType"
 Line3="conf,TimingWindowScale"
@@ -2796,7 +2808,8 @@ Line27="conf,MusicWheelSwitchSpeed"
 Line28="conf,AutogenSteps"
 Line29="conf,AutogenGroupCourses"
 Line30="conf,FastLoad"
-Line31="conf,OnlyPreferredDifficulties"
+# removed in sm4
+#Line31="conf,OnlyPreferredDifficulties"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
@@ -2847,6 +2860,7 @@ Line19="conf,NumBackgrounds"
 [ScreenAttract]
 ResetGameState=true
 StartScreen=ScreenTitleBranch()
+Class="ScreenAttract"
 Fallback="ScreenWithMenuElementsBlank"
 BackGoesToStartScreen=true
 PrevScreen=
@@ -2855,12 +2869,14 @@ LightsMode="LightsMode_Attract"
 
 [ScreenWithMenuElementsBlank]
 Fallback="ScreenWithMenuElements"
-ShowHeader=false
+# removed in sm4; remove here?
+#ShowHeader=false
 HeaderX=
 HeaderY=
 HeaderOnCommand=visible,false
 HeaderOffCommand=
-ShowFooter=false
+# removed in sm4; remove here?
+#ShowFooter=false
 FooterX=
 FooterY=
 FooterOnCommand=visible,false
@@ -3013,11 +3029,11 @@ ColumnDifficulty2="Difficulty_Easy"
 ColumnDifficulty3="Difficulty_Medium"
 ColumnDifficulty4="Difficulty_Hard"
 ColumnDifficulty5="Difficulty_Challenge"
-ColumnStepsType1=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType2=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType3=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType4=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
-ColumnStepsType5=GameManager.GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType1=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType2=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType3=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType4=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
+ColumnStepsType5=GAMEMAN:GetFirstStepsTypeForGame(GAMESTATE:GetCurrentGame())
 ScrollerItemsToDraw=7
 ScrollerSecondsPerItem=0.4
 ManualScrolling=false
@@ -3068,11 +3084,11 @@ Bullet4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Bullet5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
 NameStartX=SCREEN_CENTER_X-140
 NameStartY=SCREEN_CENTER_Y-100
-Name1OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
-Name2OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH
-Name3OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH
-Name4OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH
-Name5OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH
+Name1OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
+Name2OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH
+Name3OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH
+Name4OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH
+Name5OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH
 Name1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
 Name2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Name3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
@@ -3080,11 +3096,11 @@ Name4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Name5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
 ScoreStartX=SCREEN_CENTER_X+200
 ScoreStartY=SCREEN_CENTER_Y-100
-Score1OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
-Score2OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH
-Score3OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH
-Score4OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH
-Score5OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH
+Score1OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH
+Score2OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH
+Score3OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH
+Score4OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH
+Score5OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH
 Score1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
 Score2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Score3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
@@ -3166,17 +3182,17 @@ LifeMeterBarX=SCREEN_CENTER_X-160
 LifeMeterBarY=SCREEN_TOP+56
 LifeMeterBarOnCommand=addy,-90;sleep,1.4;linear,0.4;addy,90
 UseCharacter=true
-CharacterX=SCREEN_CENTER_X-200
+CharacterX=SCREEN_CENTER_X-160
 CharacterY=SCREEN_CENTER_Y+160
-CharacterOnCommand=Zoom,20;addy,-SCREEN_WIDTH;sleep,6.0;decelerate,0.4;addy,SCREEN_WIDTH
+CharacterOnCommand=zoom,15;draworder,2
 UsePad=true
-PadX=SCREEN_CENTER_X-280
-PadY=SCREEN_CENTER_Y+70
-PadOnCommand=Zoom,15;RotationY,180;sleep,4.7;linear,1.0;RotationY,360;Zoom,20;AddX,190;AddY,80
+PadX=SCREEN_CENTER_X-80
+PadY=SCREEN_CENTER_Y+160
+PadOnCommand=zoom,15;draworder,1;rotationx,5
 UsePlayer=true
 PlayerX=SCREEN_CENTER_X-160
 PlayerY=SCREEN_CENTER_Y+20
-PlayerOnCommand=
+PlayerOnCommand=draworder,10
 NumW2s=4
 NumMisses=6
 
@@ -3342,16 +3358,16 @@ LineNames="1"
 Line1="lua,OptionsRowTest()"
 
 [TextBanner]
-TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");horizalign,right;x,120;skewx,-0.1;maxwidth,208;
-SubtitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");horizalign,right;x,120;skewx,-0.1;
+TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");halign,1;x,120;skewx,-0.1;maxwidth,208;
+SubtitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");halign,1;x,120;skewx,-0.1;
 ArtistOnCommand=visible,false
 ArtistPrependString="/"
 AfterSetCommand=%TextBannerAfterSet
 
 [TextBannerHighScores]
 Fallback="TextBanner"
-TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");horizalign,center;
-SubtitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");horizalign,center;
+TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");halign,0.5;
+SubtitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");halign,0.5;
 
 [TextBannerCourseEntry]
 Fallback="TextBanner"
@@ -3416,7 +3432,6 @@ Class="ScreenSongOptions"
 Fallback="ScreenOptions"
 PrevScreen=SelectFirstOptionsScreen()
 NextScreen="ScreenStage"
-Game=Change the current game type with this option.
 TimerSeconds=30
 ShowStyleIcon=false
 PlayMusic=false
@@ -3438,10 +3453,6 @@ Fallback="ScreenAttract"
 Class="ScreenEnding"
 NextScreen="ScreenHighScores"
 
-[ScreenGameOver]
-Fallback="ScreenEnding"
-TimerSeconds=10
-
 RemoveCardP1X=SCREEN_WIDTH*0.1
 RemoveCardP1Y=SCREEN_CENTER_Y
 RemoveCardP1OnCommand=
@@ -3452,6 +3463,10 @@ RemoveCardP2Y=SCREEN_CENTER_Y
 RemoveCardP2OnCommand=
 RemoveCardP2OffCommand=
 
+[ScreenGameOver]
+Fallback="ScreenEnding"
+TimerSeconds=10
+
 [ScreenEnding1]
 Fallback="ScreenEnding"
 ; decorations send "SM_BeginFadingOut", so timer is disabled
@@ -3519,8 +3534,9 @@ Player1_X=-125
 Player2_X=SCREEN_CENTER_X-195
 PlayerAngle=40
 DancePadAngle=36
-HelperX=SCREEN_CENTER_X+0
-HelperY=SCREEN_CENTER_Y+80
+# HelperX,Y are set to SCREEN_CENTER_X and SCREEN_CENTER_Y in code...
+HelperX=SCREEN_LEFT
+HelperY=SCREEN_CENTER_Y/2
 
 [ScreenOptionsMaster]
 Fallback="ScreenOptions"
@@ -3830,13 +3846,13 @@ TimerSeconds=-1
 EditModifiers=""
 EditHelpX=SCREEN_LEFT+4
 EditHelpY=SCREEN_TOP+40
-EditHelpOnCommand=horizalign,left;vertalign,top;shadowlength,0
+EditHelpOnCommand=halign,0;valign,0;shadowlength,0
 InfoX=SCREEN_RIGHT-114
 InfoY=SCREEN_TOP+40
-InfoOnCommand=horizalign,left;vertalign,top;shadowlength,0;DrawOrder,-1
+InfoOnCommand=halign,0;valign,0;shadowlength,0;
 PlayRecordHelpX=SCREEN_LEFT+20
 PlayRecordHelpY=SCREEN_BOTTOM-20
-PlayRecordHelpOnCommand=horizalign,left;vertalign,top;shadowlength,0
+PlayRecordHelpOnCommand=halign,0;valign,0;shadowlength,0
 
 [ScreenEditOptions]
 Fallback="ScreenOptions"
@@ -3918,7 +3934,7 @@ IconsP2X=SCREEN_CENTER_X+280
 IconsOnCommand=x,-30
 FrameX=SCREEN_CENTER_X-232
 TitleX=SCREEN_CENTER_X-150
-TitleOnCommand=horizalign,left;shadowlength,2
+TitleOnCommand=halign,0;shadowlength,2
 ItemsStartX=SCREEN_CENTER_X-150
 ItemsEndX=SCREEN_CENTER_X+280
 ItemsGapX=14
@@ -4083,7 +4099,7 @@ GroupedScreens="ScreenOptionsManageCourses,ScreenTextEntry,ScreenPrompt,ScreenOp
 PersistScreens="ScreenOptionsManageCourses,ScreenTextEntry,ScreenPrompt"
 PrepareScreens="ScreenTextEntry,ScreenPrompt"
 CreateNewScreen="ScreenOptionsEditCourse"
-EditMode=Full
+EditMode="EditMode_Full"
 
 [ScreenOptionsEditCourse]
 Class="ScreenOptionsEditCourse"
@@ -4161,89 +4177,64 @@ NumStepsTextOnCommand=shadowlength,0;
 NumStepsTextOffCommand=linear,0.1;diffusealpha,0;
 NumStepsLabelX=-34-4+64*-0.5
 NumStepsLabelY=16*-1
-NumStepsLabelOnCommand=horizalign,right
+NumStepsLabelOnCommand=halign,1
 NumStepsLabelOffCommand=linear,0.1;diffusealpha,0;
-NumStepsNumLevels=8
-NumStepsLevel1=1;diffuse,#FFFFFF
-NumStepsLevel2=249;diffuse,#00FF00  -- 1-249     (green)
-NumStepsLevel3=374;diffuse,#C0FF00  -- 250-374   (greenish yellow)
-NumStepsLevel4=499;diffuse,#FFFF00  -- 375-499   (yellow)
-NumStepsLevel5=624;diffuse,#FF8800  -- 500-624   (orange)
-NumStepsLevel6=749;diffuse,#FF6600  -- 625-749   (darker orange)
-NumStepsLevel7=1000;diffuse,#00C0FF -- 750-999   (AJ Blue)
-NumStepsLevel8=9999;diffuse,#FF0000 -- 1000-9999 (Red)
+
 JumpsTextX=-18+64*-0.5
 JumpsTextY=16*0
 JumpsTextOnCommand=shadowlength,0;
 JumpsTextOffCommand=linear,0.1;diffusealpha,0;
 JumpsLabelX=-34+64*-0.5
 JumpsLabelY=16*0
-JumpsLabelOnCommand=horizalign,right
+JumpsLabelOnCommand=halign,1
 JumpsLabelOffCommand=linear,0.1;diffusealpha,0;
-JumpsNumLevels=6
-JumpsLevel1=1;diffuse,#FFFFFF
-JumpsLevel2=49;diffuse,#00FF00    -- 1-49     (green)
-JumpsLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
-JumpsLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
-JumpsLevel5=449;diffuse,#00C0FF   -- 200-450  (AJ Blue)
-JumpsLevel6=9999;diffuse,#FF0000  -- 450-inf  (red)
+
 HoldsTextX=-18+64*1.5
 HoldsTextY=16*-1
 HoldsTextOnCommand=shadowlength,0;
 HoldsTextOffCommand=linear,0.1;diffusealpha,0;
 HoldsLabelX=-34+64*1.5
 HoldsLabelY=16*-1
-HoldsLabelOnCommand=horizalign,right
+HoldsLabelOnCommand=halign,1
 HoldsLabelOffCommand=linear,0.1;diffusealpha,0;
-HoldsNumLevels=5
-HoldsLevel1=1;diffuse,#FFFFFF
-HoldsLevel2=49;diffuse,#00FF00    -- 1-49     (green)
-HoldsLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
-HoldsLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
-HoldsLevel5=9999;diffuse,#FF0000  -- 200-inf  (red)
+
 MinesTextX=-18+64*0.5
 MinesTextY=16*-1
 MinesTextOnCommand=shadowlength,0;
 MinesTextOffCommand=linear,0.1;diffusealpha,0;
 MinesLabelX=-34+64*0.5
 MinesLabelY=16*-1
-MinesLabelOnCommand=horizalign,right
+MinesLabelOnCommand=halign,1
 MinesLabelOffCommand=linear,0.1;diffusealpha,0;
-MinesNumLevels=6
-MinesLevel1=1;diffuse,#FFFFFF
-MinesLevel2=49;diffuse,#00FF00    -- 1-49     (green)
-MinesLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
-MinesLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
-MinesLevel5=999;diffuse,#00C0FF   -- 200-999  (AJ Blue)
-MinesLevel6=9999;diffuse,#FF0000  -- 1000-inf (red)
+
 HandsTextX=-18+64*0.5
 HandsTextY=16*0
 HandsTextOnCommand=shadowlength,0;
 HandsTextOffCommand=linear,0.1;diffusealpha,0;
 HandsLabelX=-34+64*0.5
 HandsLabelY=16*0
-HandsLabelOnCommand=horizalign,right
+HandsLabelOnCommand=halign,1
 HandsLabelOffCommand=linear,0.1;diffusealpha,0;
-HandsNumLevels=5
-HandsLevel1=1;diffuse,#FFFFFF
-HandsLevel2=14;diffuse,#00FF00    -- 1-7     (green)
-HandsLevel3=34;diffuse,#FFFF00    -- 8-34    (yellow)
-HandsLevel4=99;diffuse,#FF8800   -- 35-99  (orange)
-HandsLevel5=9999;diffuse,#FF0000  -- 100-inf  (red)
+
 RollsTextX=-18+64*1.5
 RollsTextY=16*0
 RollsTextOnCommand=shadowlength,0;
 RollsTextOffCommand=linear,0.1;diffusealpha,0;
 RollsLabelX=-34+64*1.5
 RollsLabelY=16*0
-RollsLabelOnCommand=horizalign,right
+RollsLabelOnCommand=halign,1
 RollsLabelOffCommand=linear,0.1;diffusealpha,0;
-RollsNumLevels=5
-RollsLevel1=1;diffuse,#FFFFFF
-RollsLevel2=49;diffuse,#00FF00    -- 1-49     (green)
-RollsLevel3=99;diffuse,#FFFF00    -- 50-99    (yellow)
-RollsLevel4=199;diffuse,#FF8800   -- 100-199  (orange)
-RollsLevel5=9999;diffuse,#FF0000  -- 200-inf  (red)
+
+# lifts were added in sm-ssc. (hiding them for now though, since SM4 doesn't have 'em.)
+LiftsTextX=-18+64*1.5
+LiftsTextY=16*0
+LiftsTextOnCommand=shadowlength,0;visible,false
+LiftsTextOffCommand=linear,0.1;diffusealpha,0;
+LiftsLabelX=-34+64*1.5
+LiftsLabelY=16*0
+LiftsLabelOnCommand=halign,1;visible,false
+LiftsLabelOffCommand=linear,0.1;diffusealpha,0;
+
 MachineHighScoreTextX=170
 MachineHighScoreTextY=16*-1
 MachineHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
@@ -4251,19 +4242,7 @@ MachineHighScoreTextOffCommand=linear,0.1;diffusealpha,0;
 MachineHighScoreLabelX=
 MachineHighScoreLabelY=
 MachineHighScoreLabelOnCommand=visible,false;
-MachineHighScoreNumLevels=12
-MachineHighScoreLevel1=1;diffuse,#FFFFFF    -- No Play (white)
-MachineHighScoreLevel2=9;diffuse,#FF0000    -- below 10% (red)
-MachineHighScoreLevel3=19;diffuse,#FF3300   -- 10-19% (Brownish)
-MachineHighScoreLevel4=29;diffuse,#FF6600   -- 20-29% (Dark Orange)
-MachineHighScoreLevel5=39;diffuse,#FF9900   -- 30-39% (Orange)
-MachineHighScoreLevel6=49;diffuse,#FFCC00   -- 40-49% (Light Orange)
-MachineHighScoreLevel7=59;diffuse,#FFFF00   -- 50-59% (Yellow)
-MachineHighScoreLevel8=69;diffuse,#CCFF00   -- 60-69% (Greenish Yellow)
-MachineHighScoreLevel9=79;diffuse,#66FF00   -- 70-79% (Less Greenish Yellow)
-MachineHighScoreLevel10=89;diffuse,#33FF00  -- 80-89% (Least Greenish Yellow)
-MachineHighScoreLevel11=99;diffuse,#00FF00  -- 90-99% (Green)
-MachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue)
+
 MachineHighNameTextX=120
 MachineHighNameTextY=16*-1
 MachineHighNameTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
@@ -4272,7 +4251,7 @@ MachineHighNameLabelX=
 MachineHighNameLabelY=
 MachineHighNameLabelOnCommand=visible,false;
 MachineHighNameLabelOffCommand=
-MachineHighNameNumLevels=0
+
 ProfileHighScoreTextX=145
 ProfileHighScoreTextY=16*0
 ProfileHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
@@ -4281,7 +4260,6 @@ ProfileHighScoreLabelX=
 ProfileHighScoreLabelY=
 ProfileHighScoreLabelOnCommand=visible,false;
 ProfileHighScoreLabelOffCommand=
-ProfileHighScoreNumLevels=0
 
 [ScreenSandbox]
 Class="ScreenSandbox"
@@ -4303,6 +4281,8 @@ BarMeasureAlpha=1
 Bar4thAlpha=1
 Bar8thAlpha=1
 Bar16thAlpha=1
+RoutineNoteSkinP1=default
+RoutineNoteSkinP2=default
 
 [ArrowEffects]
 FrameWidthEffectsPixelsPerSecond=400
@@ -4338,7 +4318,7 @@ PropertyMax=9/8
 
 [StepsDisplayList]
 ItemsSpacingY=20
-NumShownItems=7
+NumShownItems=5
 CapitalizeDifficultyNames=1
 CursorP1OnCommand=
 CursorP1OffCommand=
@@ -4359,6 +4339,7 @@ CursorP2HideCommand=linear,.3;diffusealpha,0
 [StreamDisplay]
 ; a simple bar life meter:
 ; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local native_width=32; local zoomed_width=12; self:zoomx(zoomed_width/native_width); self:x((itemIndex-(numItems/2))*zoomed_width); end
+# this was moved to a file in scripts
 PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	local zoomed_width=28; \
 	local zoomed_height=8; \
@@ -4376,6 +4357,7 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 end
 TextureCoordScaleX=10
 NumPills=20
+# if these metrics aren't used, nuke 'em
 UseThreePartMethod=false
 ThreePartWidth=128
 AlwaysBounceNormalBar=false
@@ -4418,25 +4400,25 @@ BodyWidth=140
 [CustomScoring]
 ComboAboveThresholdAddsToScoreBonus=0
 ComboScoreBonusThreshold=50
-ComboScoreBonusValue=+1000
-
+ComboScoreBonusValue=1000
+# this was removed in SM4
 ComboMultiplier=0.0
 
 DoubleNoteScoreMultiplier=1.0
 TripleNoteScoreMultiplier=1.0
 QuadOrHigherNoteScoreMultiplier=1.0
 
-PointsW1=+1000
-PointsW2=+1000
-PointsW3=+500
-PointsW4=+100
+PointsW1=1000
+PointsW2=1000
+PointsW3=500
+PointsW4=100
 PointsW5=-200
 PointsMiss=-500
 PointsHitMine=-500
-PointsCheckpointHit=+1000
+PointsCheckpointHit=1000
 PointsCheckpointMiss=-200
 PointsNone=0
-PointsHoldHeld=+1000
+PointsHoldHeld=1000
 PointsHoldLetGo=-500
 
 [CustomDifficulty]