diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index a735dd1843..7496b18e26 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -44,7 +44,10 @@ Challenge=Expert
 Edit=Edit
 Couple=Couple
 Routine=Routine
+#
+Freestyle=Freestyle
 Crazy=Crazy
+Nightmare=Nightmare
 
 [CourseDifficulty]
 Beginner=BEGINNER
@@ -1899,7 +1902,7 @@ DoubleFor1Credit=Double For 1 Credit
 Next=Next
 Final=Final
 Extra1=Extra
-Extra2=Extra2
+Extra2=Another
 Nonstop=Nonstop
 Oni=Oni
 Endless=Endless
diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua
index fe1e16882d..a11f6bc7f7 100644
--- a/Themes/_fallback/Scripts/02 Colors.lua	
+++ b/Themes/_fallback/Scripts/02 Colors.lua	
@@ -159,7 +159,6 @@ Color = {
 		return { c[1],c[2],c[3],fAlpha };
 	end
 }
-
 -- Remapped Color Module, since some themes are crazy
 Colors = Color
 
@@ -191,6 +190,9 @@ local DifficultyColors = {
 	Difficulty_Couple	= color("#ed0972"),				-- hot pink
 	Difficulty_Routine	= color("#ff9a00")				-- orange
 }
+DifficultyColors["Crazy"] = DifficultyColors["Hard"];
+-- DifficultyColors["Freestyle"] = Color["Purple"];
+DifficultyColors["Nightmare"] = DifficultyColors["Challenge"];
 
 local StageColors = {
 	Stage_1st	= color("#00ffc7"),
diff --git a/Themes/default/Graphics/ScreenOptions disqualify.lua b/Themes/default/Graphics/ScreenOptions disqualify.lua
new file mode 100644
index 0000000000..250e18f633
--- /dev/null
+++ b/Themes/default/Graphics/ScreenOptions disqualify.lua	
@@ -0,0 +1,3 @@
+return LoadFont("Common Normal") .. {
+	Text="Score will be disqualified!";
+};
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenOptions disqualify.redir b/Themes/default/Graphics/ScreenOptions disqualify.redir
deleted file mode 100644
index 04b2ead777..0000000000
--- a/Themes/default/Graphics/ScreenOptions disqualify.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
\ No newline at end of file
diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua
index dab5375a8c..351479271b 100644
--- a/Themes/default/Scripts/03 ThemePrefs.lua	
+++ b/Themes/default/Scripts/03 ThemePrefs.lua	
@@ -186,14 +186,21 @@ function GetDefaultOptionLines()
 		"1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17", -- All
 		"1,2,7,8,13,14,16,17", -- DDR Essentials ( no turns, fx )
 	};
-	if not GAMESTATE:IsExtraStage() then
+	local function IsExtra()
+		if GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() then
+			return true
+		else
+			return false
+		end
+	end
+	if not IsExtra() then
 		if GetUserPrefB("UserPrefShowLotsaOptions") then
 			return GetUserPrefB("UserPrefShowLotsaOptions") and LineSets[1] or LineSets[2];
 		else
 			return LineSets[2]; -- Just make sure!
 		end
 	else
-		return "1,2,7,8,13,14,17" -- No Steps Selection
+		return "1,2,7,8,13,14,17" -- "failsafe" list
 	end
 end;
 
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 2abba5d37f..1add6b5614 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -443,16 +443,17 @@ MeterSetCommand=%function(self,param) \
 	end; \
 	if param.Meter then \
 		if param.Meter >= 100 then \
-			self:zoom(0.8); \
+			self:basezoom(0.8); \
 			self:glowshift(); \
 		elseif param.Meter >= 10 then \
-			self:zoom(1); \
+			self:basezoom(1); \
 			self:glowshift(); \
 		else \
-			self:zoom(1); \
+			self:basezoom(1); \
 			self:stopeffect(); \
 		end; \
 	end; \
+	(cmd(finishtweening;zoomx,1.5;diffusealpha,0;smooth,0.125;zoom,1;diffusealpha,1))(self); \
 end;
 #
 ShowDescription=true
@@ -467,6 +468,7 @@ DescriptionSetCommand=%function(self,param) \
 		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
 		self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
 	end; \
+	(cmd(finishtweening;diffusealpha,0;addx,-4;smooth,0.125;addx,4;diffusealpha,1))(self); \
 end;
 #
 ShowAutogen=false
@@ -631,6 +633,15 @@ ShowHeader=false
 ShowFooter=false
 
 [ScreenOptions]
+DisqualifyP1X=SCREEN_CENTER_X-160
+DisqualifyP1Y=SCREEN_BOTTOM-140
+DisqualifyP1OnCommand=
+DisqualifyP1OffCommand=
+DisqualifyP2X=SCREEN_CENTER_X+160
+DisqualifyP2Y=SCREEN_BOTTOM-140
+DisqualifyP2OnCommand=
+DisqualifyP2OffCommand=
+
 ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT
 # PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0;
 CursorOnCommand=
@@ -1073,12 +1084,14 @@ StepsDisplayP1X=SCREEN_CENTER_X-160
 StepsDisplayP1Y=SCREEN_BOTTOM-60
 StepsDisplayP1OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP1");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y
 StepsDisplayP1OffCommand=bouncebegin,0.15;zoomx,0;
+# StepsDisplayP1CurrentStepsP1ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.1;zoom,1
 #
 ShowStepsDisplayP2=GAMESTATE:IsHumanPlayer(PLAYER_2)
 StepsDisplayP2X=SCREEN_CENTER_X+160
 StepsDisplayP2Y=SCREEN_BOTTOM-60
 StepsDisplayP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP2");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y
 StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0;
+# StepsDisplayP2CurrentStepsP2ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.1;zoom,1
 
 [ScreenSelectCourse]
 #~ ScreenInitCommand=%function(self) \
@@ -1143,7 +1156,6 @@ Line14="list,Persp"
 Line15="list,ScoreDisplay"
 Line16="list,Steps"
 Line17="list,Characters"
-
 [ScreenStageInformation]
 ForceTimer=true
 TimerOnCommand=visible,false