diff --git a/Themes/default/Graphics/StepsDisplay StepsType.lua b/Themes/default/Graphics/StepsDisplay StepsType.lua
new file mode 100644
index 0000000000..7886496693
--- /dev/null
+++ b/Themes/default/Graphics/StepsDisplay StepsType.lua	
@@ -0,0 +1,26 @@
+local sString;
+local t = Def.ActorFrame{
+	LoadFont("Common normal")..{
+		InitCommand=cmd(shadowlength,1);
+		SetMessageCommand=function(self,param)
+			sString = THEME:GetString("StepsDisplay StepsType",ToEnumShortString(param.StepsType));
+			if param.Steps and param.Steps:IsAutogen() then
+				self:diffusebottomedge(color("0.75,0.75,0.75,1"));
+			else
+				self:diffuse(Color("White"));
+			end;
+			self:settext( sString );
+		end;
+	};
+	-- argh this isn't working as nicely as I would've hoped...
+	--[[
+	Def.Sprite{
+		SetMessageCommand=function(self,param)
+			self:Load( THEME:GetPathG("","_StepsType/"..ToEnumShortString(param.StepsType)) );
+			self:diffusealpha(0.5);
+		end;
+	};
+	--]]
+};
+
+return t;
\ No newline at end of file
diff --git a/Themes/default/Graphics/StepsDisplay StepsType.redir b/Themes/default/Graphics/StepsDisplay StepsType.redir
deleted file mode 100644
index 04b2ead777..0000000000
--- a/Themes/default/Graphics/StepsDisplay StepsType.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
\ No newline at end of file
diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini
index 997c973e93..b54e695a29 100644
--- a/Themes/default/Languages/en.ini
+++ b/Themes/default/Languages/en.ini
@@ -46,4 +46,37 @@ UserPrefGameplayShowScore=Show or Hide the score display in gameplay.
 UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in gameplay.
 UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods.
 UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! )
-UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short).
\ No newline at end of file
+UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short).
+[StepsListDisplayRow StepsType]
+Dance_Single=DS
+Dance_Double=DB
+Dance_Couple=DC
+Dance_Solo=DX
+Dance_Routine=DR
+Pump_Single=PS
+Pump_Double=PD
+Pump_Halfdouble=HD
+Pump_Couple=PC
+Pump_Routine=PR
+Kb7_Single=KB7
+Ez2_Single=ES
+Ez2_Double=ED
+Ez2_Real=ER
+Para_Single=PS
+Ds3ddx_Single=XS
+Bm_Single5=5K
+Bm_Double5=10K
+Bm_Single7=7K
+Bm_Double7=14K
+Maniax_Single=MS
+Maniax_Double=MD
+Techno_Single4=S4
+Techno_Single5=S5
+Techno_Single8=S8
+Techno_Double4=D4
+Techno_Double5=D5
+Pnm_Five=5B
+Pnm_Nine=9B
+Guitar_Five=5F
+Karaoke=KA
+Lights_Cabinet=!
\ No newline at end of file
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index fdfab76370..22794ad06f 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -28,6 +28,10 @@ ShowQMarksInRandomCycle=true
 # - = In Conjuction With / Then
 # ~ = Released
 # + = At The Same Time
+[DifficultyList]
+CapitalizeDifficultyNames=false
+ItemsSpacingY=24
+NumShownItems=8
 [HelpDisplay]
 TipShowTime=7
 [Combo]
@@ -357,7 +361,7 @@ end;
 #
 ShowDescription=true
 DescriptionX=-20
-DescriptionY=0
+DescriptionY=-5
 DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8
 DescriptionSetCommand=%function(self,param) \
 	if self:GetText() == "" then \
@@ -375,10 +379,10 @@ AutogenY=0
 AutogenOnCommand=
 AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end
 #
-ShowStepsType=false
-StepsTypeX=0
-StepsTypeY=0
-StepsTypeOnCommand=zoom,0.5
+ShowStepsType=true
+StepsTypeX=-20
+StepsTypeY=7
+StepsTypeOnCommand=zoom,0.45
 
 [StepsDisplayEdit]
 Fallback="StepsDisplay"
@@ -397,7 +401,7 @@ Fallback="StepsDisplay"
 
 [StepsDisplayListRow]
 #
-ItemsSpacingY=30
+ItemsSpacingY=24
 NumShownItems=5
 #
 MoveCommand=decelerate,0.3
@@ -408,8 +412,7 @@ FrameOnCommand=
 FrameOffCommand=
 FrameSetCommand=%function(self,param) \
 	if param.CustomDifficulty then \
-		self:diffuse(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
-		self:diffusetopedge(CustomDifficultyToColor(param.CustomDifficulty)); \
+		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
 	else \
 		self:diffuse(color('1,1,1,1')); \
 	end; \
@@ -424,7 +427,7 @@ ShowMeter=true
 ZeroMeterString="0"
 MeterX=56
 MeterY=0
-MeterOnCommand=shadowlength,1;
+MeterOnCommand=shadowlength,1;zoom,0.65
 MeterOffCommand=
 MeterSetCommand=%function(self,param) \
 	if param.CustomDifficulty then \
@@ -441,9 +444,9 @@ MeterSetCommand=%function(self,param) \
 end;
 #
 ShowDescription=true
-DescriptionX=-64-8
-DescriptionY=-5
-DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8;uppercase,true;
+DescriptionX=-64-8+20
+DescriptionY=0
+DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true;
 DescriptionOffCommand=
 DescriptionSetCommand=%function(self,param) \
 	if self:GetText() == "" then \
@@ -458,13 +461,13 @@ end;
 ShowAutogen=true
 AutogenX=0
 AutogenY=0
-AutogenOnCommand=diffuseshift;effectcolor1,color("0,0.5,1,0.85");effectcolor2,BoostColor(color("0,0.5,1,1"),1.5);
+AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") );
 AutogenSetCommand=
 #
 #ShowStepsType=GetUserPref("UserPrefAutoSetStyle")
 ShowStepsType=true
 StepsTypeX=-64-8
-StepsTypeY=7
+StepsTypeY=0
 StepsTypeOnCommand=zoom,0.45;skewx,-0.125
 StepsTypeSetCommand=
 
@@ -960,7 +963,7 @@ BPMLabelOffCommand=bouncebegin,0.15;zoomx,0;
 #
 ShowDifficultyList=not GAMESTATE:IsCourseMode();
 DifficultyListX=SCREEN_CENTER_X-160
-DifficultyListY=SCREEN_TOP+216+6
+DifficultyListY=SCREEN_TOP+216
 DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X;
 DifficultyListOffCommand=bouncebegin,0.15;zoomx,0;
 #
diff --git a/Themes/default/~res/StepsDisplayMusic frame.psd b/Themes/default/~res/StepsDisplayMusic frame.psd
index 85d6fd12a6..04c2d45c04 100644
Binary files a/Themes/default/~res/StepsDisplayMusic frame.psd and b/Themes/default/~res/StepsDisplayMusic frame.psd differ