diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 649c4bb82f..c9d56fc832 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -456,29 +456,29 @@ ArtistDisplayX=
 ArtistDisplayY=
 ArtistDisplayOnCommand=hidden,1
 ArtistDisplayOffCommand=
-BannerX=SCREEN_CENTER_X-172-SCREEN_WIDTH*0.6
-BannerY=SCREEN_CENTER_Y-68
+BannerX=SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6
+BannerY=SCREEN_CENTER_Y-84
 BannerOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BannerOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
-BannerWidth=284
-BannerHeight=88
-BannerFrameX=SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6
-BannerFrameY=SCREEN_CENTER_Y-78
+BannerWidth=256
+BannerHeight=80
+BannerFrameX=SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6
+BannerFrameY=SCREEN_CENTER_Y-97
 BannerFrameOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BannerFrameOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 BPMDisplayX=SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6
-BPMDisplayY=SCREEN_CENTER_Y-119
+BPMDisplayY=SCREEN_CENTER_Y-133
 BPMDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 ShowStage=1
-StageX=SCREEN_CENTER_X-280-SCREEN_WIDTH*0.6
-StageY=SCREEN_CENTER_Y-119
+StageX=SCREEN_CENTER_X-272-SCREEN_WIDTH*0.6
+StageY=SCREEN_CENTER_Y-134
 StageOnCommand=draworder,1;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 StageOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
-CDTitleX=SCREEN_CENTER_X-68-SCREEN_WIDTH*0.6
-CDTitleY=SCREEN_CENTER_Y-92
-CDTitleFrontCommand=spin;effectmagnitude,0,90,0;cullmode,back
-CDTitleBackCommand=spin;effectmagnitude,0,90,0;cullmode,front;diffuse,#333333
+CDTitleX=SCREEN_CENTER_X-80-SCREEN_WIDTH*0.6
+CDTitleY=SCREEN_CENTER_Y-98
+CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,back;
+CDTitleBackCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,front;diffuse,#606060;
 CDTitleOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6
 CDTitleOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 CharacterIconP1Y=-1000
@@ -489,56 +489,56 @@ CharacterIconP1OnCommand=hidden,1
 CharacterIconP2OnCommand=hidden,1
 CharacterIconP1OffCommand=
 CharacterIconP2OffCommand=
-DifficultyFrameP1X=SCREEN_CENTER_X-260
-DifficultyFrameP1Y=SCREEN_CENTER_Y+8
+DifficultyFrameP1X=SCREEN_CENTER_X-275
+DifficultyFrameP1Y=SCREEN_CENTER_Y-15
 DifficultyFrameP1OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
 DifficultyFrameP1OffCommand=linear,0.5;diffusealpha,0
-DifficultyFrameP2X=SCREEN_CENTER_X-60
-DifficultyFrameP2Y=SCREEN_CENTER_Y+8
+DifficultyFrameP2X=SCREEN_CENTER_X-82
+DifficultyFrameP2Y=SCREEN_CENTER_Y-15
 DifficultyFrameP2OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
 DifficultyFrameP2OffCommand=linear,0.5;diffusealpha,0
-DifficultyIconP1X=SCREEN_CENTER_X-272
-DifficultyIconP1Y=SCREEN_CENTER_Y+8
+DifficultyIconP1X=SCREEN_CENTER_X-290
+DifficultyIconP1Y=SCREEN_CENTER_Y-15
 DifficultyIconP1OnCommand=zoomy,0;linear,0.5;zoomy,1
 DifficultyIconP1OffCommand=linear,0.5;zoomy,0
-DifficultyIconP2X=SCREEN_CENTER_X-48
-DifficultyIconP2Y=SCREEN_CENTER_Y+8
+DifficultyIconP2X=SCREEN_CENTER_X-68
+DifficultyIconP2Y=SCREEN_CENTER_Y-15
 DifficultyIconP2OnCommand=zoomy,0;linear,0.5;zoomy,1
 DifficultyIconP2OffCommand=linear,0.5;zoomy,0
-AutogenIconP1X=SCREEN_CENTER_X-272
-AutogenIconP1Y=SCREEN_CENTER_Y+8
+AutogenIconP1X=SCREEN_CENTER_X-290
+AutogenIconP1Y=SCREEN_CENTER_Y-15
 AutogenIconP1OnCommand=zoomy,0;linear,0.5;zoomy,1
 AutogenIconP1OffCommand=linear,0.5;zoomy,0
-AutogenIconP2X=SCREEN_CENTER_X-48
-AutogenIconP2Y=SCREEN_CENTER_Y+8
+AutogenIconP2X=SCREEN_CENTER_X-68
+AutogenIconP2Y=SCREEN_CENTER_Y-15
 AutogenIconP2OnCommand=zoomy,0;linear,0.5;zoomy,1
 AutogenIconP2OffCommand=linear,0.5;zoomy,0
-DifficultyDisplayX=SCREEN_CENTER_X-15-SCREEN_WIDTH*0.6
-DifficultyDisplayY=SCREEN_CENTER_Y-60
+DifficultyDisplayX=SCREEN_CENTER_X-35-SCREEN_WIDTH*0.6
+DifficultyDisplayY=SCREEN_CENTER_Y-70
 DifficultyDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6
 DifficultyDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
 ShowRadar=1
 RadarX=SCREEN_CENTER_X-160
-RadarY=SCREEN_CENTER_Y+94
+RadarY=SCREEN_CENTER_Y+92
 RadarOnCommand=
 RadarOffCommand=
 ShowDifficultyList=0
 ShowCourseContents=1
 ShowPanes=0
-ScoreFrameP1X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6
-ScoreFrameP1Y=SCREEN_CENTER_Y-30
+ScoreFrameP1X=SCREEN_CENTER_X-262+SCREEN_WIDTH*0.6
+ScoreFrameP1Y=SCREEN_CENTER_Y+92
 ScoreFrameP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 ScoreFrameP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
-ScoreFrameP2X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6
-ScoreFrameP2Y=SCREEN_CENTER_Y+46
+ScoreFrameP2X=SCREEN_CENTER_X-51+SCREEN_WIDTH*0.6
+ScoreFrameP2Y=SCREEN_CENTER_Y+92
 ScoreFrameP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 ScoreFrameP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
-ScoreP1X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6
-ScoreP1Y=SCREEN_CENTER_Y-30
+ScoreP1X=SCREEN_CENTER_X-262+SCREEN_WIDTH*0.6
+ScoreP1Y=SCREEN_CENTER_Y+86
 ScoreP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 ScoreP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
-ScoreP2X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6
-ScoreP2Y=SCREEN_CENTER_Y+46
+ScoreP2X=SCREEN_CENTER_X-50+SCREEN_WIDTH*0.6
+ScoreP2Y=SCREEN_CENTER_Y+86
 ScoreP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6
 ScoreP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
 # Don't use relative motion here.  It's usually possible to change the
@@ -709,12 +709,12 @@ BPMDisplayX=SCREEN_CENTER_X-50
 BPMDisplayY=SCREEN_CENTER_Y+175
 BPMDisplayOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
-OptionIconsP1X=SCREEN_CENTER_X-290
-OptionIconsP1Y=SCREEN_CENTER_Y-175
+OptionIconsP1X=SCREEN_CENTER_X-300
+OptionIconsP1Y=SCREEN_CENTER_Y-182
 OptionIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1
 OptionIconsP1OffCommand=linear,0.5;zoomy,0
-OptionIconsP2X=SCREEN_CENTER_X-290
-OptionIconsP2Y=SCREEN_CENTER_Y-145
+OptionIconsP2X=SCREEN_CENTER_X-300
+OptionIconsP2Y=SCREEN_CENTER_Y-164
 OptionIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
 OptionIconsP2OffCommand=linear,0.5;zoomy,0
 ChatInputBoxY=SCREEN_CENTER_Y+110
@@ -1373,8 +1373,9 @@ ShowSurvivedArea=0
 ShowWinArea=0
 ShowMaxCombo=1
 ShowScoreArea=1
-ShowTimeArea=0
+ShowTimeArea=1
 TimerSeconds=15
+
 LargeBannerX=SCREEN_CENTER_X+0
 LargeBannerY=SCREEN_CENTER_Y-140
 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1384,10 +1385,12 @@ LargeBannerFrameY=SCREEN_CENTER_Y-140
 LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
 ShowStage=1
+
 StageX=SCREEN_CENTER_X+0
 StageY=SCREEN_CENTER_Y-168
 StageOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 StageOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+
 DifficultyIconP1X=SCREEN_CENTER_X-106
 DifficultyIconP1Y=SCREEN_CENTER_Y-160
 DifficultyIconP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1396,6 +1399,7 @@ DifficultyIconP2X=SCREEN_CENTER_X+106
 DifficultyIconP2Y=SCREEN_CENTER_Y-160
 DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+
 PlayerOptionsP1X=SCREEN_CENTER_X-120
 PlayerOptionsP1Y=SCREEN_CENTER_Y-100
 PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1404,6 +1408,7 @@ PlayerOptionsP2X=SCREEN_CENTER_X+120
 PlayerOptionsP2Y=SCREEN_CENTER_Y-100
 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
+
 GradeFrameP1X=SCREEN_CENTER_X-226
 GradeFrameP1Y=SCREEN_CENTER_Y-140
 GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1412,6 +1417,7 @@ GradeFrameP2X=SCREEN_CENTER_X+226
 GradeFrameP2Y=SCREEN_CENTER_Y-140
 GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2
 GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2
+
 GradeP1X=SCREEN_CENTER_X-226
 GradeP1Y=SCREEN_CENTER_Y-140
 GradeP1OnCommand=glowshift;scroll;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1420,6 +1426,7 @@ GradeP2X=SCREEN_CENTER_X+226
 GradeP2Y=SCREEN_CENTER_Y-140
 GradeP2OnCommand=glowshift;scroll;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2
 GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2
+
 BonusFrameP1X=SCREEN_CENTER_X-224
 BonusFrameP1Y=SCREEN_CENTER_Y+16
 BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
@@ -1428,91 +1435,104 @@ BonusFrameP2X=SCREEN_CENTER_X+224
 BonusFrameP2Y=SCREEN_CENTER_Y+16
 BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
 BonusFrameP2OffCommand=linear,0.7;diffusealpha,0
-BarPossible1P1X=SCREEN_CENTER_X-144
-BarPossible1P1Y=SCREEN_CENTER_Y-46
+
+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
 BarPossible1P1OffCommand=linear,0.7;diffusealpha,0
-BarPossible1P2X=SCREEN_CENTER_X+146
-BarPossible1P2Y=SCREEN_CENTER_Y-46
+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
 BarPossible1P2OffCommand=linear,0.7;diffusealpha,0
-BarPossible2P1X=SCREEN_CENTER_X-144
-BarPossible2P1Y=SCREEN_CENTER_Y-19
+
+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
 BarPossible2P1OffCommand=linear,0.7;diffusealpha,0
-BarPossible2P2X=SCREEN_CENTER_X+146
-BarPossible2P2Y=SCREEN_CENTER_Y-19
+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
 BarPossible2P2OffCommand=linear,0.7;diffusealpha,0
-BarPossible3P1X=SCREEN_CENTER_X-144
-BarPossible3P1Y=SCREEN_CENTER_Y+8
+
+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
 BarPossible3P1OffCommand=linear,0.7;diffusealpha,0
-BarPossible3P2X=SCREEN_CENTER_X+146
-BarPossible3P2Y=SCREEN_CENTER_Y+8
+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
 BarPossible3P2OffCommand=linear,0.7;diffusealpha,0
-BarPossible4P1X=SCREEN_CENTER_X-144
-BarPossible4P1Y=SCREEN_CENTER_Y+35
+
+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
 BarPossible4P1OffCommand=linear,0.7;diffusealpha,0
-BarPossible4P2X=SCREEN_CENTER_X+146
-BarPossible4P2Y=SCREEN_CENTER_Y+35
+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
 BarPossible4P2OffCommand=linear,0.7;diffusealpha,0
-BarPossible5P1X=SCREEN_CENTER_X-144
-BarPossible5P1Y=SCREEN_CENTER_Y+62
+
+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
 BarPossible5P1OffCommand=linear,0.7;diffusealpha,0
-BarPossible5P2X=SCREEN_CENTER_X+146
-BarPossible5P2Y=SCREEN_CENTER_Y+62
+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
 BarPossible5P2OffCommand=linear,0.7;diffusealpha,0
-BarActual1P1X=SCREEN_CENTER_X-144
-BarActual1P1Y=SCREEN_CENTER_Y-46
+
+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
 BarActual1P1OffCommand=linear,0.7;diffusealpha,0
-BarActual1P2X=SCREEN_CENTER_X+146
-BarActual1P2Y=SCREEN_CENTER_Y-46
+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
 BarActual1P2OffCommand=linear,0.7;diffusealpha,0
-BarActual2P1X=SCREEN_CENTER_X-144
-BarActual2P1Y=SCREEN_CENTER_Y-19
+
+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
 BarActual2P1OffCommand=linear,0.7;diffusealpha,0
-BarActual2P2X=SCREEN_CENTER_X+146
-BarActual2P2Y=SCREEN_CENTER_Y-19
+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
 BarActual2P2OffCommand=linear,0.7;diffusealpha,0
-BarActual3P1X=SCREEN_CENTER_X-144
-BarActual3P1Y=SCREEN_CENTER_Y+8
+
+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
 BarActual3P1OffCommand=linear,0.7;diffusealpha,0
-BarActual3P2X=SCREEN_CENTER_X+146
-BarActual3P2Y=SCREEN_CENTER_Y+8
+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
 BarActual3P2OffCommand=linear,0.7;diffusealpha,0
-BarActual4P1X=SCREEN_CENTER_X-144
-BarActual4P1Y=SCREEN_CENTER_Y+35
+
+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
 BarActual4P1OffCommand=linear,0.7;diffusealpha,0
-BarActual4P2X=SCREEN_CENTER_X+146
-BarActual4P2Y=SCREEN_CENTER_Y+35
+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
 BarActual4P2OffCommand=linear,0.7;diffusealpha,0
-BarActual5P1X=SCREEN_CENTER_X-144
-BarActual5P1Y=SCREEN_CENTER_Y+62
+
+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
 BarActual5P1OffCommand=linear,0.7;diffusealpha,0
-BarActual5P2X=SCREEN_CENTER_X+146
-BarActual5P2Y=SCREEN_CENTER_Y+62
+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
 BarActual5P2OffCommand=linear,0.7;diffusealpha,0
+
 BarActualMaxCommand=glowshift;effectperiod,0.5
+
 ScoreLabelX=SCREEN_CENTER_X+0
 ScoreLabelY=SCREEN_CENTER_Y+140
 ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT
 ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT
+
 ScoreNumberP1X=SCREEN_CENTER_X-160
 ScoreNumberP1Y=SCREEN_CENTER_Y+140
 ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1521,6 +1541,20 @@ ScoreNumberP2X=SCREEN_CENTER_X+160
 ScoreNumberP2Y=SCREEN_CENTER_Y+140
 ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2
 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
+
+TimeLabelX=SCREEN_CENTER_X
+TimeLabelY=SCREEN_CENTER_Y+160
+TimeLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.7;decelerate,0.3;addy,-SCREEN_HEIGHT
+TimeLabelOffCommand=sleep,0.1;accelerate,0.3;addy,SCREEN_HEIGHT
+TimeNumberP1X=SCREEN_CENTER_X-120
+TimeNumberP1Y=SCREEN_CENTER_Y+160
+TimeNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,SCREEN_WIDTH/2
+TimeNumberP1OffCommand=sleep,0.1;accelerate,0.3;addx,-SCREEN_WIDTH/2
+TimeNumberP2X=SCREEN_CENTER_X+140
+TimeNumberP2Y=SCREEN_CENTER_Y+160
+TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,-SCREEN_WIDTH/2
+TimeNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2
+
 TryExtraStageX=SCREEN_CENTER_X+0
 TryExtraStageY=SCREEN_CENTER_Y+188
 TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
@@ -2280,7 +2314,7 @@ MaxFeetInMeter=14
 AutoColorFeet=1
 FeetX=0
 FeetY=0
-FeetOnCommand=shadowlength,2
+FeetOnCommand=shadowlength,0
 FeetDifficultyChangedCommand=%function(self) self:diffuse(DifficultyColor(self.Difficulty)) if self.Meter > 9 then self:glowshift() else self:stopeffect() end end
 ShowFeet=1
 ShowDifficulty=0
@@ -2649,22 +2683,22 @@ LetGoCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.
 HeldCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0
 
 [Combo]
-ShowComboAt=4
+ShowComboAt=2
 LabelX=SCREEN_CENTER_X-314
 LabelY=SCREEN_CENTER_Y-220
-LabelOnCommand=shadowlength,4;HorizAlign,left;VertAlign,bottom
+LabelOnCommand=shadowlength,0;HorizAlign,left;VertAlign,bottom
 NumberX=0
 NumberY=SCREEN_CENTER_Y-220
-NumberOnCommand=shadowlength,4;HorizAlign,right;VertAlign,bottom
-NumberMinZoom=0.5
-NumberMaxZoom=0.9
-NumberMaxZoomAt=300
+NumberOnCommand=shadowlength,0;HorizAlign,right;VertAlign,bottom
+NumberMinZoom=1
+NumberMaxZoom=1
+NumberMaxZoomAt=2
 PulseCommand=%function(self) local origZoom=self:GetZoom(); self:zoom(1.2*origZoom); self:linear(0.05); self:zoom(origZoom); end
 FullComboW3Command=
 FullComboW2Command=
 FullComboW1Command=
 FullComboBrokenCommand=
-MissComboCommand=hidden,1
+MissComboCommand=%function(self) local origZoom=self:GetZoom(); self:zoom(1.2*origZoom); self:linear(0.05); self:zoom(origZoom); end
 
 
 [Player]
@@ -2713,7 +2747,7 @@ AvoidMineCommand=
 HitMineCommand=
 
 [BPMDisplay]
-NormalColor=1.0,1.0,0.0,1	// yellow
+NormalColor=1.0,1.0,1.0,1	// white
 ChangeColor=1.0,0.5,0.0,1	// orange
 ExtraColor=0.7,0.0,0.0,1	// dark red
 Cycle=1
@@ -4128,8 +4162,8 @@ NextScreen=ScreenOptionsService
 PrevScreen=ScreenOptionsService
 
 [Banner]
-ScrollRandom=1
-ScrollRoulette=1
+ScrollRandom=0
+ScrollRoulette=0
 
 [ScreenGameplay DifficultyMeterP1]
 Fallback=DifficultyMeter