diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 240111737e..b2f4cc08a5 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -20,7 +20,7 @@ IsBaseTheme=1
 # How big the design of the theme is. for example, if a theme was designed for
 # 1080p, it would be shrunken for 640x480, as well as that, if it was designed
 # for 480p, it would be enlarged for bigger screens!
-ScreenWidth=640
+ScreenWidth=1
 ScreenHeight=480
 # Allows you to pick all available game modes for your gametype: for example,
 # inserting enough coins for 1p would let you choose between solo, single
@@ -510,7 +510,7 @@ InitialValue=0.5
 MeterWidth=0.0
 MeterHeight=0.0
 # How little there is to fill?
-MinLifeTime=25.5
+MinLifeTime=15
 
 [LyricDisplay]
 LyricFrontChangedCommand=LyricCommand,"Front"
@@ -1600,6 +1600,7 @@ ShowIcon=false
 #
 ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;screen,ScreenSelectMusic"
 ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse"
+ChoiceSurvival="applydefaultoptions;name,Survival;playmode,oni;mod,lifetime;screen,ScreenSelectCourse"
 
 [ScreenSelectCharacter]
 Class="ScreenSelectMaster"
diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua
index c65d5d0f59..3b4c234ce3 100644
--- a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua	
+++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua	
@@ -23,8 +23,8 @@ return Def.StepsDisplayList {
 				(cmd(bouncebegin,0.3;zoom,0))(self);
 			end;
 		end;
-		LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
-			InitCommand=cmd(diffuse,PlayerColor(PLAYER_1));
+ 		LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
+			InitCommand=cmd(diffuse,PlayerColor(PLAYER_1);x,8;zoom,0.75);
 		};
 		LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. {
 			InitCommand=cmd(x,20;diffuse,PlayerColor(PLAYER_1));
@@ -32,7 +32,8 @@ return Def.StepsDisplayList {
 		};
 		LoadFont("Common Normal") .. {
 			Text="P1";
-			InitCommand=cmd(x,-4;diffuse,PlayerColor(PLAYER_1));
+			InitCommand=cmd(x,2;diffuse,PlayerColor(PLAYER_1);shadowlength,1);
+			OnCommand=cmd(zoom,0.75);
 		};
 	};
 	CursorP2 = Def.ActorFrame {
@@ -49,8 +50,8 @@ return Def.StepsDisplayList {
 				(cmd(bouncebegin,0.3;zoom,0))(self);
 			end;
 		end;
-		LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
-			InitCommand=cmd(diffuse,PlayerColor(PLAYER_2);zoomx,-1);
+ 		LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
+			InitCommand=cmd(diffuse,PlayerColor(PLAYER_2);x,-8;zoom,0.75;zoomx,-0.75;);
 		};
 		LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. {
 			InitCommand=cmd(x,-20;diffuse,PlayerColor(PLAYER_2);zoomx,-1);
@@ -58,7 +59,8 @@ return Def.StepsDisplayList {
 		};
 		LoadFont("Common Normal") .. {
 			Text="P2";
-			InitCommand=cmd(x,8;diffuse,PlayerColor(PLAYER_2));
+			InitCommand=cmd(x,-2;diffuse,PlayerColor(PLAYER_2);shadowlength,1);
+			OnCommand=cmd(zoom,0.75);
 		};
 	};
 	CursorP1Frame = Def.Actor{
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 8ef8840371..7230e58321 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -181,9 +181,9 @@ UseEasyMarkerFlag=true
 #
 
 [MusicWheelItem]
-WheelNotifyIconX=-128-16+1
+WheelNotifyIconX=-128-16+0.5
 WheelNotifyIconY=0
-WheelNotifyIconOnCommand=
+WheelNotifyIconOnCommand=shadowlength,2;
 #
 SongNameX=-120
 SongNameY=0
@@ -293,6 +293,47 @@ ProtimingMissCommand=
 # In The Groove
 ReceptorArrowsYStandard=GetTapPosition('Standard')
 ReceptorArrowsYReverse=GetTapPosition('Reverse')
+[ScoreDisplayNormal]
+FrameX=
+FrameY=
+FrameOnCommand=
+FrameOffCommand=
+TextX=
+TextY=
+TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75)
+TextOffCommand=
+
+[ScoreDisplayLifeTime]
+FrameX=
+FrameY=
+FrameOnCommand=
+FrameOffCommand=
+#
+TextX=
+TextY=
+TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75)
+TextOffCommand=
+#
+TimeRemainingX=
+TimeRemainingY=
+TimeRemainingOnCommand=zoom,1
+TimeRemainingOffCommand=
+#
+DeltaSecondsOnCommand=y,-40;zoom,0.5;settext,"";
+DeltaSecondsNoneCommand=
+DeltaSecondsHitMineCommand=
+DeltaSecondsAvoidMineCommand=
+DeltaSecondsCheckpointMissCommand=
+DeltaSecondsCheckpointHitCommand=
+DeltaSecondsMissCommand=
+DeltaSecondsW5Command=
+DeltaSecondsW4Command=
+DeltaSecondsW3Command=
+DeltaSecondsW2Command=
+DeltaSecondsW1Command=
+DeltaSecondsLetGoCommand=
+DeltaSecondsHeldCommand=
+DeltaSecondsGainLifeCommand=
 [ScoreDisplayPercentage Percent]
 PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5)
 PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5)
@@ -853,14 +894,10 @@ IconChoice14KeysOffCommand=linear,0.1175;zoomx,0
 
 [ScreenSelectPlayMode]
 DefaultChoice="Normal"
-ChoiceNames="Normal,Extended"
+# ChoiceNames="Normal,Extended,Survival"
 #~ ChoiceNames="Normal,Rave,Extended,Oni,Survival"
 #
 PerChoiceIconElement=false
-# todo: re-implement ScreenGameInformation
-ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;screen,ScreenSelectMusic"
-ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse"
-#~ ChoiceExtended="name,Extended;playmode,nonstop;sort,AllCourses;screen,ScreenSelectCourse"
 #
 ShowScroller=false
 ShowIcon=true
@@ -879,6 +916,11 @@ IconChoiceExtendedX=SCREEN_CENTER_X+160
 IconChoiceExtendedY=SCREEN_CENTER_Y
 IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,1
 IconChoiceExtendedOffCommand=linear,0.1175;zoomx,0
+#
+IconChoiceSurvivalX=SCREEN_CENTER_X
+IconChoiceSurvivalY=SCREEN_CENTER_Y+64
+IconChoiceSurvivalOnCommand=zoom,0;bounceend,0.35;zoom,1
+IconChoiceSurvivalOffCommand=linear,0.1175;zoomx,0
 [ScreenSelectMusic]
 #~ NextScreen=ScreenSelectMusicNext()
 #
diff --git a/Themes/default/~res/ScreenSelectProfile Card.psd b/Themes/default/~res/ScreenSelectProfile Card.psd
index 1b86161a98..f66fc5be75 100644
Binary files a/Themes/default/~res/ScreenSelectProfile Card.psd and b/Themes/default/~res/ScreenSelectProfile Card.psd differ