whatever I have done lately.

Themes/_fallback/BGAnimations/ScreenSelectProfile overlay.lua

@@ -1,9 +1,9 @@
 function GetLocalProfiles()
-	local ret = {};
+	local t = {};
 
 	for p = 0,PROFILEMAN:GetNumLocalProfiles()-1 do
 		local profile=PROFILEMAN:GetLocalProfileFromIndex(p);
-		local item = Def.ActorFrame {
+		local ProfileCard = Def.ActorFrame {
 --[[ 			Def.Quad {
 				InitCommand=cmd(zoomto,200,1;y,40/2);
 				OnCommand=cmd(diffuse,Color('Outline'););
@@ -22,10 +22,10 @@ function GetLocalProfiles()
 				end;
 			};
 		};
-		table.insert( ret, item );
+		t[#t+1]=ProfileCard;
 	end;
 
-	return ret;
+	return t;
 end;
 
 function LoadCard(cColor)
@@ -38,14 +38,14 @@ function LoadCard(cColor)
 	return t
 end
 function LoadPlayerStuff(Player)
-	local ret = {};
+	local t = {};
 
 	local pn = (Player == PLAYER_1) and 1 or 2;
 
 --[[ 	local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. {
 		Name = 'BigFrame';
 	}; --]]
-	local t = Def.ActorFrame {
+	t[#t+1] = Def.ActorFrame {
 		Name = 'JoinFrame';
 		LoadCard(Color('Orange'));
 --[[ 		Def.Quad {
@@ -62,23 +62,13 @@ function LoadPlayerStuff(Player)
 			OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5"));
 		};
 	};
-	table.insert( ret, t );
 	
-	t = Def.ActorFrame {
+	t[#t+1] = Def.ActorFrame {
 		Name = 'BigFrame';
 		LoadCard(PlayerColor(Player));
 	};
-	table.insert( ret, t );
+	t[#t+1] = Def.ActorFrame {
-
---[[ 	t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 170, 20) .. {
 		Name = 'SmallFrame';
-	}; --]]
-	t = Def.ActorFrame {
-		Name = 'SmallFrame';
---[[ 		Def.Quad {
-			InitCommand=cmd(zoomto,170+4,32+4);
-			OnCommand=cmd(shadowlength,1);
-		}; --]]
 		InitCommand=cmd(y,-2);
 		Def.Quad {
 			InitCommand=cmd(zoomto,200-10,40+2);
@@ -97,9 +87,8 @@ function LoadPlayerStuff(Player)
 			OnCommand=cmd(diffuse,PlayerColor(Player);glow,color("1,1,1,0.25"));
 		};	
 	};
-	table.insert( ret, t );
 
-	t = Def.ActorScroller{
+	t[#t+1] = Def.ActorScroller{
 		Name = 'Scroller';
 		NumItemsToDraw=6;
 -- 		InitCommand=cmd(y,-230/2+20;);
@@ -114,34 +103,17 @@ function LoadPlayerStuff(Player)
 		end;
 		children = GetLocalProfiles();
 	};
-	table.insert( ret, t );
 	
-	t = Def.ActorFrame {
+	t[#t+1] = Def.ActorFrame {
 		Name = "EffectFrame";
-	--[[ 		Def.Quad {
-				InitCommand=cmd(y,-230/2;vertalign,top;zoomto,200,8;fadebottom,1);
-				OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
-			};
-			Def.Quad {
-				InitCommand=cmd(y,230/2;vertalign,bottom;zoomto,200,8;fadetop,1);
-				OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
-			}; --]]
 	};
-	table.insert( ret, t );
+	t[#t+1] = LoadFont("Common Normal") .. {
---[[ 	t = Def.BitmapText {
-		OnCommand = cmd(y,160);
-		Name = 'SelectedProfileText';
-		Font = "Common Normal";
-		Text = 'No profile';
-	}; --]]
-	t = LoadFont("Common Normal") .. {
 		Name = 'SelectedProfileText';
 		--InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player));
 		InitCommand=cmd(y,160;shadowlength,1;);
 	};
-	table.insert( ret, t );
 
-	return ret;
+	return t;
 end;
 
 function UpdateInternal3(self, Player)

Themes/_fallback/metrics.ini

@@ -1760,7 +1760,7 @@ LoadEdits=true
 Fallback="ScreenWithMenuElements"
 Class="ScreenSelectProfile"
 #
-ScreenOnCommand=lockinput,1
+ScreenOnCommand=%function(self) self:lockinput(3); end;
 #
 NextScreen=Branch.AfterSelectProfile()
 PrevScreen=Branch.TitleMenu()
@@ -1773,7 +1773,8 @@ CodeUp="+MenuUp"
 CodeUp2="+Up"
 CodeDown="+MenuDown"
 CodeDown2="+Down"
-CodeStart="Start"
+# Holding Start let us skip ( annoying )
+CodeStart="~Start,+Start"
 CodeBack="Back"
 CodeCenter="Center"
 CodeDownLeft="DownLeft"
@@ -1793,16 +1794,16 @@ DefaultChoice="Single"
 ChoiceNames=GameCompatibleModes()
 #
 OptionOrderAuto="1:2,2:1"
-ChoiceSingle="name,Single;style,single;screen,"..Branch.AfterSelectPlayMode()
+ChoiceSingle="name,Single;style,single;text,Single;screen,"..Branch.AfterSelectPlayMode()
-ChoiceDouble="name,Double;style,double;screen,"..Branch.AfterSelectPlayMode()
+ChoiceDouble="name,Double;style,double;text,Double;screen,"..Branch.AfterSelectPlayMode()
-ChoiceSolo="name,Solo;style,solo;screen,"..Branch.AfterSelectPlayMode()
+ChoiceSolo="name,Solo;style,solo;text,Solo;screen,"..Branch.AfterSelectPlayMode()
-ChoiceVersus="name,Versus;style,versus;screen,"..Branch.AfterSelectPlayMode()
+ChoiceVersus="name,Versus;style,versus;text,Versus;screen,"..Branch.AfterSelectPlayMode()
-ChoiceCouple="name,Couple;style,couple;screen,"..Branch.AfterSelectPlayMode()
+ChoiceCouple="name,Couple;style,couple;text,Couple;screen,"..Branch.AfterSelectPlayMode()
-ChoiceHalfDouble="name,HalfDouble;style,halfdouble;screen,"..Branch.AfterSelectPlayMode()
+ChoiceHalfDouble="name,HalfDouble;style,halfdouble;text,HalfDouble;screen,"..Branch.AfterSelectPlayMode()
-Choice5Keys="name,5Keys;style,single5;;screen,"..Branch.AfterSelectPlayMode()
+Choice5Keys="name,5Keys;style,single5;text,5Keys;screen,"..Branch.AfterSelectPlayMode()
-Choice7Keys="name,7Keys;style,single7;screen,"..Branch.AfterSelectPlayMode()
+Choice7Keys="name,7Keys;style,single7;text,7Keys;screen,"..Branch.AfterSelectPlayMode()
-Choice10Keys="name,10Keys;style,double10;screen,"..Branch.AfterSelectPlayMode()
+Choice10Keys="name,10Keys;style,double10;text,10Keys;screen,"..Branch.AfterSelectPlayMode()
-Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode()
+Choice14Keys="name,14Keys;style,double14;text,14Keys;screen,"..Branch.AfterSelectPlayMode()
 ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectPlayMode()
 #
 PerChoiceScrollElement=false
@@ -1823,7 +1824,7 @@ PrevScreen=Branch.TitleMenu()
 #
 TimerSeconds=40
 #
-DefaultChoice="Easy"
+DefaultChoice="Normal"
 ChoiceNames="Normal,Rave,Extended,Oni,Endless"
 #
 PerChoiceScrollElement=false
@@ -1833,13 +1834,13 @@ ShowScroller=true
 WrapScroller=true
 ShowIcon=false
 #
-ChoiceEasy="applydefaultoptions;name,Easy;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
+ChoiceEasy="applydefaultoptions;name,Easy;text,Easy;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
-ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
+ChoiceNormal="applydefaultoptions;name,Normal;text,Normal;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
-ChoiceHard="applydefaultoptions;name,Hard;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal"
+ChoiceHard="applydefaultoptions;name,Hard;text,Hard;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal"
-ChoiceRave="applydefaultoptions;name,Rave;playmode,rave;screen,ScreenSelectMusic;setenv,sMode,Rave"
+ChoiceRave="applydefaultoptions;name,Rave;text,Rave;playmode,rave;screen,ScreenSelectMusic;setenv,sMode,Rave"
-ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Extended"
+ChoiceExtended="applydefaultoptions;name,Extended;text,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Extended"
-ChoiceOni="applydefaultoptions;name,Oni;playmode,oni;screen,ScreenSelectCourse;setenv,sMode,Oni"
+ChoiceOni="applydefaultoptions;name,Oni;text,Oni;playmode,oni;screen,ScreenSelectCourse;setenv,sMode,Oni"
-ChoiceEndless="applydefaultoptions;name,Endless;playmode,endless;screen,ScreenSelectCourse;setenv,sMode,Endless"
+ChoiceEndless="applydefaultoptions;name,Endless;text,Endless;playmode,endless;screen,ScreenSelectCourse;setenv,sMode,Endless"
 
 [ScreenSelectCharacter]
 Class="ScreenSelectMaster"

Themes/themekit/Graphics/MusicWheelItem Song ColorPart.lua

@@ -1,14 +0,0 @@
-return Def.ActorFrame {
-	Def.Quad {
-		InitCommand=cmd(x,-128+4;zoomto,4,46);
--- 		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
-	};
---[[ 	Def.Quad {
-		InitCommand=cmd(x,-128+16+6;zoomto,32,46);
--- 		OnCommand=cmd(faderight,1;diffusealpha,0.5);
-	}; --]]
---[[ 	Def.Quad {
-		InitCommand=cmd(x,2;y,23;zoomto,320,1);
--- 		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
-	}; --]]
-};

Themes/themekit/Graphics/MusicWheelItem Song NormalPart.lua

@@ -1,6 +0,0 @@
-return Def.ActorFrame {
-	Def.Quad {
-		InitCommand=cmd(x,4;zoomto,256-4,46);
-		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
-	};
-};

Themes/themekit/Graphics/ScreenSelectPlayMode scroll.lua

@@ -0,0 +1,12 @@
+local gc = Var("GameCommand");
+
+local t = Def.ActorFrame {
+	LoadActor("PlayMode " .. gc:GetText() );
+};
+
+t[1].OnCommand=Screen.Metric("ScrollerItemOnCommand");
+t[1].GainFocusCommand=Screen.Metric("ScrollerItemGainFocusCommand");
+t[1].LoseFocusCommand=Screen.Metric("ScrollerItemLoseFocusCommand");
+t[1].OffFocusedCommand=Screen.Metric("ScrollerItemOffFocusedCommand");
+t[1].OffUnfocusedCommand=Screen.Metric("ScrollerItemOffUnfocusedCommand");
+return t;

Themes/themekit/Graphics/ScreenSelectStyle scroll.lua

@@ -0,0 +1,12 @@
+local gc = Var("GameCommand");
+
+local t = Def.ActorFrame {
+	LoadActor("Style " .. gc:GetText() );
+};
+-- This works.
+t[1].OnCommand=Screen.Metric("ScrollerItemOnCommand");
+t[1].GainFocusCommand=Screen.Metric("ScrollerItemGainFocusCommand");
+t[1].LoseFocusCommand=Screen.Metric("ScrollerItemLoseFocusCommand");
+t[1].OffFocusedCommand=Screen.Metric("ScrollerItemOffFocusedCommand");
+t[1].OffUnfocusedCommand=Screen.Metric("ScrollerItemOffUnfocusedCommand");
+return t;

Themes/themekit/Scripts/02 TextBanner.lua

@@ -0,0 +1,19 @@
+local mainMaxWidth = 228; -- zoom w/subtitle is 0.75 (multiply by 1.25)
+local subMaxWidth = 420; -- zoom is 0.6 (multiply zoom,1 value by 1.4)
+local artistMaxWidth = 300/0.8;
+
+function TextBannerAfterSet(self,param) 
+	local Title=self:GetChild("Title"); 
+	local Subtitle=self:GetChild("Subtitle"); 
+	local Artist=self:GetChild("Artist"); 
+	if Subtitle:GetText() == "" then 
+		(cmd(maxwidth,mainMaxWidth;y,-8;zoom,1;))(Title);
+		(cmd(visible,false))(Subtitle);
+		(cmd(zoom,0.66;maxwidth,artistMaxWidth;y,8))(Artist);
+	else
+		-- subtitle below
+		(cmd(maxwidth,mainMaxWidth*1.25;y,-11;zoom,0.75;))(Title);
+		(cmd(visible,true;zoom,0.6;y,0;maxwidth,subMaxWidth))(Subtitle); 
+		(cmd(zoom,0.6;maxwidth,artistMaxWidth;y,10))(Artist); 
+	end
+end

Themes/themekit/Sounds/_Music title (loop).sm

@@ -1,5 +1,5 @@
-#TITLE:Break The Sabbath;
+#TITLE:Technotris;
 #OFFSET:0.000;
-#BPMS:0.000=140.000;
+#BPMS:0.000=148.000;
 #STOPS:;
 

Themes/themekit/metrics.ini

@@ -3,43 +3,46 @@ FallbackTheme=_fallback
 [ScreenSystemLayer]
 CreditsP1X=SCREEN_CENTER_X-256-32
 CreditsP1Y=SCREEN_BOTTOM-4
-CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_1);
+# ColorLightTone & ColorDarkTone make colors 50% brighter or darker, where ColorMidTone makes them 25% darker
+# ColorLightTone( color here ); example: ColorLightTone( PlayerColor(PLAYER_1) );
+CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,Color("Black");
 #
 CreditsP2X=SCREEN_CENTER_X+256+32
 CreditsP2Y=SCREEN_BOTTOM-4
-CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,PlayerColor(PLAYER_2);
+CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffusebottomedge,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,Color("Black");
 [ScreenWithMenuElements]
 # Header ( Top of Screen )
 ShowHeader=true
 HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP
-HeaderOnCommand=vertalign,top
+HeaderOnCommand=vertalign,top;addy,-64;decelerate,0.35;addy,64;
 HeaderOffCommand=
 # Text Header ( Text displayed at top of screen on top of header )
 ShowTextHeader=true
 TextHeaderX=SCREEN_CENTER_X-256-32
 TextHeaderY=SCREEN_TOP+32+8-1.5
-TextHeaderOnCommand=horizalign,left;vertalign,bottom;
+TextHeaderOnCommand=horizalign,left;vertalign,bottom;skewx,-0.125;shadowlength,1;diffusealpha,0;addx,-16;sleep,0.35;decelerate,0.125;diffusealpha,1;addx,16;
 TextHeaderOffCommand=
 # Footer ( Bottom Of Screen )
 ShowFooter=true
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM
-FooterOnCommand=vertalign,bottom
+FooterOnCommand=vertalign,bottom;addy,48;decelerate,0.35;addy,-48
 FooterOffCommand=
 # Menu Timer
 TimerX=SCREEN_CENTER_X+256+32
 TimerY=SCREEN_TOP+32+8-1.5
+# We animate the timer in [MenuTimer], since diffusion doesn't work here.
 TimerOnCommand=
 TimerOffCommand=
 [MenuTimer]
-# Text
+# Text associated with the menutimer
-Text1OnCommand=stopeffect;stoptweening;horizalign,right;vertalign,bottom;
+Text1OnCommand=stopeffect;stoptweening;horizalign,right;vertalign,bottom;shadowlength,1;diffusealpha,0;x,16;sleep,0.35;decelerate,0.125;diffusealpha,1;x,0;
 Text1FormatFunction=function(fSeconds) \
 	return string.format("%0.1f", fSeconds); \
 end
 FrameOnCommand=
-# Warning
+# 
 Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1");
 [ScreenTitleMenu]
 # Don't show these
@@ -66,9 +69,227 @@ ScrollerItemLoseFocusCommand=stoptweening;linear,0.125;zoom,0.75;
 ScrollerItemOffFocusedCommand=sleep,0.35;linear,0.15;zoom,0;
 # OffUnfocused is for items that were not selected and the screen is exiting.
 ScrollerItemOffUnfocusedCommand=linear,0.15;zoom,0;
+[ScreenSelectStyle]
+# Let items do OffCommand
+WaitForChildrenBeforeTweening=true
+# Explanatory
+ShowIcon=true
+ShowScroller=true
+# Force theme to load image for each style type, instead of a lua file
+PerChoiceIconElement=true
+PerChoiceScrollElement=false
+#
+ScrollerX=SCREEN_CENTER_X
+ScrollerY=SCREEN_CENTER_Y-16
+# Menu Items [ThemeKit Only]
+ScrollerItemOnCommand=
+ScrollerItemOnFocusedCommand=visible,true
+# GainFocus is when an item is selected.
+ScrollerItemGainFocusCommand=visible,true;finishtweening;zoom,1.25;linear,0.125;zoom,1;
+# LoseFocus is when an item is deselected.
+ScrollerItemLoseFocusCommand=finishtweening;visible,false;
+# OffFocused is for items you have selected and the screen is exiting.
+ScrollerItemOffFocusedCommand=sleep,0.35;linear,0.15;zoom,0;
+# OffUnfocused is for items that were not selected and the screen is exiting.
+ScrollerItemOffUnfocusedCommand=linear,0.15;zoom,0;
+# Need this so that icons animate from metrics
+UseIconMetrics=true
+# Positions of all da 'cons
+IconChoiceSingleX=SCREEN_CENTER_X-256
+IconChoiceSingleY=SCREEN_BOTTOM-64
+IconChoiceSingleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceSingleGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceSingleLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceSingleEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceSingleDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceSingleOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceSingleOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoiceSoloX=SCREEN_CENTER_X-128
+IconChoiceSoloY=SCREEN_BOTTOM-64
+IconChoiceSoloOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceSoloGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceSoloLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceSoloEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceSoloDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceSoloOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceSoloOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+IconChoiceHalfDoubleX=SCREEN_CENTER_X-128
+IconChoiceHalfDoubleY=SCREEN_BOTTOM-64
+IconChoiceHalfDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceHalfDoubleGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceHalfDoubleLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceHalfDoubleEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceHalfDoubleDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceHalfDoubleOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceHalfDoubleOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoiceDoubleX=SCREEN_CENTER_X
+IconChoiceDoubleY=SCREEN_BOTTOM-64
+IconChoiceDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceDoubleGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceDoubleLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceDoubleEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceDoubleDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceDoubleOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceDoubleOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoiceVersusX=SCREEN_CENTER_X+128
+IconChoiceVersusY=SCREEN_BOTTOM-64
+IconChoiceVersusOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceVersusGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceVersusLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceVersusEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceVersusDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceVersusOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceVersusOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoiceCoupleX=SCREEN_CENTER_X+256
+IconChoiceCoupleY=SCREEN_BOTTOM-64
+IconChoiceCoupleOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceCoupleGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceCoupleLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceCoupleEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceCoupleDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceCoupleOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceCoupleOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoiceKB7X=SCREEN_CENTER_X
+IconChoiceKB7Y=SCREEN_BOTTOM-64
+IconChoiceKB7OnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceKB7GainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceKB7LoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceKB7EnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceKB7DisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceKB7OffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceKB7OffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoice5KeysX=SCREEN_CENTER_X-128
+IconChoice5KeysY=SCREEN_BOTTOM-64
+IconChoice5KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice5KeysGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoice5KeysLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoice5KeysEnabledCommand=diffuse,color("1,1,1,1");
+IconChoice5KeysDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoice5KeysOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoice5KeysOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoice7KeysX=SCREEN_CENTER_X-64
+IconChoice7KeysY=SCREEN_BOTTOM-64
+IconChoice7KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice7KeysGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoice7KeysLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoice7KeysEnabledCommand=diffuse,color("1,1,1,1");
+IconChoice7KeysDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoice7KeysOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoice7KeysOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoice10KeysX=SCREEN_CENTER_X+64
+IconChoice10KeysY=SCREEN_BOTTOM-64
+IconChoice10KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice10KeysGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoice10KeysLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoice10KeysEnabledCommand=diffuse,color("1,1,1,1");
+IconChoice10KeysDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoice10KeysOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoice10KeysOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+#
+IconChoice14KeysX=SCREEN_CENTER_X+128
+IconChoice14KeysY=SCREEN_BOTTOM-64
+IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoice14KeysGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoice14KeysLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoice14KeysEnabledCommand=diffuse,color("1,1,1,1");
+IconChoice14KeysDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoice14KeysOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoice14KeysOffFocusedCommand=stopeffect;sleep,0.1175;linear,0.25;zoom,1.1;sleep,0.25;decelerate,0.3;zoom,0;
+[ScreenSelectPlayMode]
+# Let items do OffCommand
+WaitForChildrenBeforeTweening=true
+# Explanatory
+ShowIcon=true
+ShowScroller=true
+# Force theme to load image for each style type, instead of a lua file
+PerChoiceIconElement=true
+PerChoiceScrollElement=false
+#
+ScrollerX=SCREEN_CENTER_X
+ScrollerY=SCREEN_CENTER_Y-16
+# Menu Items [ThemeKit Only]
+ScrollerItemOnCommand=
+ScrollerItemOnFocusedCommand=visible,true
+# GainFocus is when an item is selected.
+ScrollerItemGainFocusCommand=visible,true;finishtweening;zoom,1.25;linear,0.125;zoom,1;
+# LoseFocus is when an item is deselected.
+ScrollerItemLoseFocusCommand=finishtweening;visible,false;
+# OffFocused is for items you have selected and the screen is exiting.
+ScrollerItemOffFocusedCommand=sleep,0.35;linear,0.15;zoom,0;
+# OffUnfocused is for items that were not selected and the screen is exiting.
+ScrollerItemOffUnfocusedCommand=linear,0.15;zoom,0;
+# Need this so that icons animate from metrics
+UseIconMetrics=true
+# Positions of all da 'cons
+IconChoiceNormalX=SCREEN_CENTER_X-256
+IconChoiceNormalY=SCREEN_BOTTOM-64
+IconChoiceNormalOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceNormalGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceNormalLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceNormalEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceNormalDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceNormalOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceNormalOffFocusedCommand=stopeffect;sleep,0
+#
+IconChoiceRaveX=SCREEN_CENTER_X-128
+IconChoiceRaveY=SCREEN_BOTTOM-64
+IconChoiceRaveOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceRaveGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceRaveLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceRaveEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceRaveDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceRaveOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceRaveOffFocusedCommand=stopeffect;sleep,0
+#
+IconChoiceExtendedX=SCREEN_CENTER_X
+IconChoiceExtendedY=SCREEN_BOTTOM-64
+IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceExtendedGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceExtendedLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceExtendedEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceExtendedDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceExtendedOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceExtendedOffFocusedCommand=stopeffect;sleep,0
+#
+IconChoiceOniX=SCREEN_CENTER_X+128
+IconChoiceOniY=SCREEN_BOTTOM-64
+IconChoiceOniOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceOniGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceOniLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceOniEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceOniDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceOniOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceOniOffFocusedCommand=stopeffect;sleep,0
+#
+IconChoiceEndlessX=SCREEN_CENTER_X+256
+IconChoiceEndlessY=SCREEN_BOTTOM-64
+IconChoiceEndlessOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceEndlessGainFocusCommand=stoptweening;zoom,1;pulse;effectmagnitude,1,1.125,1;
+IconChoiceEndlessLoseFocusCommand=stoptweening;stopeffect;zoom,0.75;
+IconChoiceEndlessEnabledCommand=diffuse,color("1,1,1,1");
+IconChoiceEndlessDisabledCommand=diffuse,color("1,0,0,0.5");
+IconChoiceEndlessOffUnfocusedCommand=linear,0.1175;zoomx,0
+IconChoiceEndlessOffFocusedCommand=stopeffect;sleep,0
 [ScreenSelectMusic]
 MusicWheelX=SCREEN_RIGHT-128-18
 MusicWheelOnCommand=draworder,-1
 [MusicWheel]
 ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*0 ); self:y( offsetFromCenter*48  ); end
 NumWheelItems=13
+[MusicWheelItem]
+# Move Song all the way to the left, since it is left aligned
+# see [TextBanner]
+SongNameX=-124
+[TextBanner]
+TitleOnCommand=horizalign,left;shadowlength,1;
+SubtitleOnCommand=horizalign,left;shadowlength,1;
+ArtistOnCommand=horizalign,left;shadowlength,1;skewx,-0.2
+ArtistPrependString=""