diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua
index bb37abf203..f1f9335318 100644
--- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
+++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
@@ -20,11 +20,6 @@ t[#t+1] = Def.ActorFrame {
 --[[ 	LoadActor("_particles") .. {
 		InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y);
 	}; --]]
-
-	Def.Quad {
-		InitCommand=cmd(vertalign,bottom;scaletoclipped,SCREEN_WIDTH+1,96;y,SCREEN_CENTER_Y-32;fadetop,0.75);
-		OnCommand=cmd(diffuse,color("#FFCB05"));
-	};
 --[[ 	LoadActor("_pattern") .. {
 		InitCommand=cmd(z,32;x,4;y,4;;rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
 		OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,Color("Black");diffusealpha,0.5);
diff --git a/Themes/default/Graphics/LifeMeterBattery lives/default.lua b/Themes/default/Graphics/LifeMeterBattery lives/default.lua
index e042e41c79..8fd1c40f0e 100755
--- a/Themes/default/Graphics/LifeMeterBattery lives/default.lua	
+++ b/Themes/default/Graphics/LifeMeterBattery lives/default.lua	
@@ -7,44 +7,7 @@ local LifeMeter, MaxLives, CurLives;
 local LifeRatio;
 
 local t = Def.ActorFrame {
-	Def.Quad {
-		Name="LifeFill";
-		InitCommand=cmd(zoomto,barWidth,barHeight);
-		--OnCommand=cmd(diffuseramp;effectcolor2,PlayerColor(player);effectcolor1,ColorMidTone(PlayerColor(player));
-		--	effectclock,'beatnooffset';effectperiod,1);
-	};
-	InitCommand=function(self)
-		--c = self:GetChildren();
-	end;
-
-	BeginCommand=function(self,param)
-		local screen = SCREENMAN:GetTopScreen() or nil;
-		if screen ~= nil then 
-			LifeMeter = screen:GetLifeMeter(player);
-			MaxLives = LifeMeter:GetTotalLives();	
-			CurLives = LifeMeter:GetLivesLeft();
-			MESSAGEMAN:Broadcast("SystemMessage",
-				{ Message = "(" .. MaxLives .. ", " .. CurLives ")", NoAnimate = true });
-		else
-			MESSAGEMAN:Broadcast("SystemMessage", { Message = "WE DONE FUCKED UP"});
-		end
-	end;
-	LifeChangedMessageCommand=function(self,param)
-		if param.Player == player then
-			LifeRatio = CurLives / MaxLives;
-		end
-	end;
-	StartCommand=function(self,param)
-		if param.Player == player then
-			LifeRatio = CurLives / MaxLives;
-		end
-	end;
-	FinishCommand=function(self,param)
-		if param.Player == player then
-			LifeRatio = CurLives / MaxLives;
-		end
-	end;
-	--[[ LoadActor("_lives")..{
+	LoadActor("_lives")..{
 		InitCommand=cmd(pause;horizalign,left;x,-(barWidth/2));
 		BeginCommand=function(self,param)
 			local screen = SCREENMAN:GetTopScreen();
@@ -74,8 +37,7 @@ local t = Def.ActorFrame {
 			end			
 		end;
 		FinishCommand=cmd(playcommand,"Start");
-	}; ]]
-	
+	};
 };
 
 return t;
\ No newline at end of file
diff --git a/Themes/default/Graphics/StepsDisplay autogen.redir b/Themes/default/Graphics/StepsDisplay autogen.redir
deleted file mode 100644
index 04b2ead777..0000000000
--- a/Themes/default/Graphics/StepsDisplay autogen.redir	
+++ /dev/null
@@ -1 +0,0 @@
-_blank
\ No newline at end of file
diff --git a/Themes/default/Graphics/StepsDisplay autogen/_badge.png b/Themes/default/Graphics/StepsDisplay autogen/_badge.png
new file mode 100644
index 0000000000..6655de25f1
Binary files /dev/null and b/Themes/default/Graphics/StepsDisplay autogen/_badge.png differ
diff --git a/Themes/default/Graphics/StepsDisplay autogen/default.lua b/Themes/default/Graphics/StepsDisplay autogen/default.lua
new file mode 100644
index 0000000000..0f9601f4ed
--- /dev/null
+++ b/Themes/default/Graphics/StepsDisplay autogen/default.lua	
@@ -0,0 +1,11 @@
+local t = Def.ActorFrame{};
+
+t[#t+1] = LoadActor("_badge") .. {
+	InitCommand=cmd(shadowlength,1;diffuse,Color.Green;pulse;effectmagnitude,0.75,1,1;effecttiming,0,0,1,0);
+};
+t[#t+1] = LoadFont("Common","Normal") .. {
+	Text="AG";
+	InitCommand=cmd(shadowlength,1;zoom,0.875);
+};
+
+return t;
\ No newline at end of file
diff --git a/Themes/default/Graphics/StepsDisplayListRow autogen.png b/Themes/default/Graphics/StepsDisplayListRow autogen.png
deleted file mode 100644
index cb2073ec7e..0000000000
Binary files a/Themes/default/Graphics/StepsDisplayListRow autogen.png and /dev/null differ
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 3c534b782d..d5639d7026 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -458,11 +458,11 @@ DescriptionSetCommand=%function(self,param) \
 	end; \
 end;
 #
-ShowAutogen=true
+ShowAutogen=false
 AutogenX=0
 AutogenY=0
 #AutogenOnCommand=diffuseshift;effectcolor1,Color.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") );
-AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088");
+AutogenOnCommand=zoom,0.75;
 #
 ShowStepsType=ThemePrefs.Get("AutoSetStyle")
 StepsTypeX=-64-8
@@ -1150,11 +1150,19 @@ DescriptionSetCommand=%function(self,param) \
 	end; \
 end;
 #
-ShowAutogen=false
-AutogenX=40-32
+ShowAutogen=true
+AutogenX=-132
 AutogenY=0
 AutogenOnCommand=
-AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end
+AutogenSetCommand=%function(self,param) \
+	if param.Steps:IsAutogen() then \
+		self:finishtweening(); \
+	else \
+		self:finishtweening(); \
+	end \
+end;
+AutogenTweenOnCommand=finishtweening;decelerate,0.25;zoom,1;
+AutogenTweenOffCommand=finishtweening;bounceend,0.2;zoomx,8;zoomy,0
 #
 ShowStepsType=ThemePrefs.Get("AutoSetStyle")
 StepsTypeX=-20-32
diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
index 7c594519a6..7205408c8a 100644
--- a/src/ScreenSelectMusic.cpp
+++ b/src/ScreenSelectMusic.cpp
@@ -394,6 +394,18 @@ void ScreenSelectMusic::Update( float fDeltaTime )
 }
 void ScreenSelectMusic::Input( const InputEventPlus &input )
 {
+	// HACK: This screen eats mouse inputs if we don't check for them first.
+	bool mouse_evt = false;
+	for (int i = MOUSE_LEFT; i <= MOUSE_WHEELDOWN; i++)
+	{
+		if (input.DeviceI == DeviceInput( DEVICE_MOUSE, (DeviceButton)i ))
+			mouse_evt = true;
+	}
+	if (mouse_evt)	
+	{
+		ScreenWithMenuElements::Input(input);
+		return;
+	}
 //	LOG->Trace( "ScreenSelectMusic::Input()" );
 
 	// reset announcer timer
@@ -505,23 +517,6 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 		m_bStepsChosen[input.pn] )
 		return; // ignore
 
-	// todo: Allow mousewheel to scroll MusicWheel -aj
-	/*
-	if( input.DeviceI.device == DEVICE_MOUSE )
-	{
-		if( input.DeviceI.button == MOUSE_WHEELUP )
-		{
-			MESSAGEMAN->Broadcast( "PreviousSong" );
-			m_MusicWheel.Move( -1 );
-		}
-		else if( input.DeviceI.button == MOUSE_WHEELDOWN )
-		{
-			MESSAGEMAN->Broadcast( "NextSong" );
-			m_MusicWheel.Move( +1 );
-		}
-	}
-	*/
-
 	if( USE_PLAYER_SELECT_MENU )
 	{
 		if( input.type == IET_RELEASE  &&  input.MenuI == GAME_BUTTON_SELECT )