diff --git a/Themes/default/BGAnimations/ScreenMiniMenu underlay/default.lua b/Themes/default/BGAnimations/ScreenMiniMenu underlay/default.lua
new file mode 100644
index 0000000000..a09aa50f02
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenMiniMenu underlay/default.lua	
@@ -0,0 +1,7 @@
+return Def.ActorFrame {
+	OnCommand= function(self) self:queuecommand("Recenter") end,
+	RecenterCommand= function(self) SCREENMAN:GetTopScreen():xy(0, 0) end,
+	Def.Quad{
+		InitCommand=cmd(scaletocover,-SCREEN_WIDTH*2,SCREEN_TOP,SCREEN_WIDTH*2,SCREEN_BOTTOM;diffuse,color("0,0,0,0.5"));
+	};
+};
\ No newline at end of file
diff --git a/Themes/default/BGAnimations/ScreenNo background/_base.png b/Themes/default/BGAnimations/ScreenNo background/_base.png
deleted file mode 100644
index b81620df99..0000000000
Binary files a/Themes/default/BGAnimations/ScreenNo background/_base.png and /dev/null differ
diff --git a/Themes/default/BGAnimations/ScreenNo background/_checkerboard (stretch).png b/Themes/default/BGAnimations/ScreenNo background/_checkerboard (stretch).png
deleted file mode 100644
index 35fd050a17..0000000000
Binary files a/Themes/default/BGAnimations/ScreenNo background/_checkerboard (stretch).png and /dev/null differ
diff --git a/Themes/default/BGAnimations/ScreenNo background/_particle normal.png b/Themes/default/BGAnimations/ScreenNo background/_particle normal.png
deleted file mode 100644
index dce80615c0..0000000000
Binary files a/Themes/default/BGAnimations/ScreenNo background/_particle normal.png and /dev/null differ
diff --git a/Themes/default/BGAnimations/ScreenNo background/_particleLoader.lua b/Themes/default/BGAnimations/ScreenNo background/_particleLoader.lua
deleted file mode 100644
index e44c6cca0b..0000000000
--- a/Themes/default/BGAnimations/ScreenNo background/_particleLoader.lua	
+++ /dev/null
@@ -1,74 +0,0 @@
-local hideFancyElements = (ThemePrefs.Get("FancyUIBG") == false)
-local t = Def.ActorFrame{};
-if hideFancyElements then return t; end
-
-local Params = { 
-	NumParticles = 30,
-	VelocityXMin = 100,
-	VelocityXMax = 400,
-	VelocityYMin = 0,
-	VelocityYMax = 0,
-	VelocityZMin = 0,
-	VelocityZMax = 0,
-	BobRateZMin = 0.4,
-	BobRateZMax = 0.7,
-	ZoomMin = 0.5,
-	ZoomMax = 1,
-	SpinZ = 0,
-	BobZ = 52,
-	File = "_particle normal",
-};
-
-local tParticleInfo = {}
-
-for i=1,Params.NumParticles do
-	tParticleInfo[i] = {
-		X = math.random(Params.VelocityXMin, Params.VelocityXMax),
-		Y = Params.VelocityYMin ~= Params.VelocityYMax and math.random(Params.VelocityYMin, Params.VelocityYMax) or Params.VelocityYMin,
-		Z = Params.VelocityZMin ~= Params.VelocityZMax and math.random(Params.VelocityZMin, Params.VelocityZMax) or Params.VelocityZMin,
-		Zoom = math.random(Params.ZoomMin*1000,Params.ZoomMax*1000) / 1000,
-		BobZRate = math.random(Params.BobRateZMin*1000,Params.BobRateZMax*1000) / 1000,
-		Age = 0,
-	};
-	t[#t+1] = LoadActor( Params.File )..{
-	Name="Particle"..i;
-		InitCommand=function(self)
-		self:basezoom(tParticleInfo[i].Zoom);
-		self:x(math.random(SCREEN_LEFT+(self:GetWidth()/2),SCREEN_RIGHT-(self:GetWidth()/2)));
-		self:y(math.random(SCREEN_TOP+(self:GetHeight()/2),SCREEN_BOTTOM-(self:GetHeight()/2)));
-		--self:z(math.random(-64,0));
-	end;
-		OnCommand=cmd(diffuse,ColorLightTone(color("#ffd400"));diffusealpha,0.8);
-	};
-end
-
-local function UpdateParticles(self,DeltaTime)
-	tParticles = self:GetChildren();
-	for i=1, Params.NumParticles do
-		local p = tParticles["Particle"..i];
-		local vX = tParticleInfo[i].X;
-		local vY = tParticleInfo[i].Y;
-		local vZ = tParticleInfo[i].Z;
-		tParticleInfo[i].Age = tParticleInfo[i].Age + DeltaTime;
-		p:x(p:GetX() + (vX * DeltaTime));
-		p:y(p:GetY() + (vY * DeltaTime));
-		p:z(p:GetZ() + (vZ * DeltaTime));
---		p:zoom( 1 + math.cos(
---			(tParticleInfo[i].Age * math.pi*2) 
---			)	* 0.125 );
-		if p:GetX() > SCREEN_RIGHT + (p:GetWidth()/2 - p:GetZ()) then
-			p:x(SCREEN_LEFT - (p:GetWidth()/2));
-		elseif p:GetX() < SCREEN_LEFT - (p:GetWidth()/2 - p:GetZ()) then
-			p:x(SCREEN_RIGHT + (p:GetWidth()/2));
-		end
-		if p:GetY() > SCREEN_BOTTOM + (p:GetHeight()/2 - p:GetZ()) then
-			p:y(SCREEN_TOP - (p:GetHeight()/2));
-		elseif p:GetY() < SCREEN_TOP - (p:GetHeight()/2 - p:GetZ()) then
-			p:y(SCREEN_BOTTOM + (p:GetHeight()/2));
-		end
-	end;
-end;
-
-t.InitCommand = cmd(fov,90;SetUpdateFunction,UpdateParticles);
-
-return t;
diff --git a/Themes/default/BGAnimations/ScreenNo background/default.lua b/Themes/default/BGAnimations/ScreenNo background/default.lua
deleted file mode 100644
index cd80a19112..0000000000
--- a/Themes/default/BGAnimations/ScreenNo background/default.lua	
+++ /dev/null
@@ -1,19 +0,0 @@
-local t = Def.ActorFrame {};
-
-t[#t+1] = Def.ActorFrame {
-  FOV=90;
-  InitCommand=cmd(Center);
-	Def.Quad {
-		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
-		OnCommand=cmd(diffuse,color("#fdbe28");diffusebottomedge,color("#f67849"));
-	};
-	Def.ActorFrame {
-    InitCommand=cmd(diffusealpha,0.2;);
-		LoadActor("_checkerboard") .. {
-			InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3.5;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
-			OnCommand=cmd(texcoordvelocity,0,0.25;diffuse,color("#ffffff");fadetop,1);
-		};
-	};
-};
-
-return t;
diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
index 785d0df9c7..fc70b35190 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
@@ -272,7 +272,7 @@ t[#t+1] = Def.ActorFrame {
 			  end
 		};
 		LoadFont("Common Normal") .. { 
-			  InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000"););
+			  InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000");maxwidth,130);
 			  OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;);
 			  OffCommand=cmd(linear,0.3;diffusealpha,0;);
 			  CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); 
@@ -382,7 +382,7 @@ t[#t+1] = Def.ActorFrame {
 			  end
 		};
 		LoadFont("Common Normal") .. { 
-			  InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000"););
+			  InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000");maxwidth,130);
 			  OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;);
 			  OffCommand=cmd(linear,0.3;diffusealpha,0;);
 			  CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); 
diff --git a/Themes/default/Graphics/Banner all music.png b/Themes/default/Graphics/Banner all music.png
new file mode 100644
index 0000000000..e67ef6794e
Binary files /dev/null and b/Themes/default/Graphics/Banner all music.png differ
diff --git a/Themes/default/Graphics/Banner mode.png b/Themes/default/Graphics/Banner mode.png
new file mode 100644
index 0000000000..b130a08c55
Binary files /dev/null and b/Themes/default/Graphics/Banner mode.png differ
diff --git a/Themes/default/Graphics/Banner preferred.png b/Themes/default/Graphics/Banner preferred.png
new file mode 100644
index 0000000000..b59051e553
Binary files /dev/null and b/Themes/default/Graphics/Banner preferred.png differ
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index a4710379a2..99c6daa439 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -509,17 +509,16 @@ LineCC="lua,ThemePrefRow('CustomComboContinue')"
 LineCM="lua,ThemePrefRow('CustomComboMaintain')"
 
 [ScreenMiniMenuContext]
-PageOnCommand=visible,false
-LineHighlightX=SCREEN_CENTER_X/2
+PageOnCommand=visible,true
+NumRowsShown=12
+RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-217+43*offsetFromCenter) end
+ItemsStartX=SCREEN_CENTER_X+120
+ItemsEndX=SCREEN_CENTER_X+280
+LineHighlightX=SCREEN_CENTER_X
 
-TitleX=SCREEN_CENTER_X
-TitleOnCommand=shadowlength,1;
-ItemsStartX=SCREEN_CENTER_X
-ItemsEndX=SCREEN_CENTER_X
-ItemsGapX=14
-ItemsLongRowP1X=SCREEN_CENTER_X
-ItemsLongRowP2X=SCREEN_CENTER_X
-ItemsLongRowSharedX=SCREEN_CENTER_X
+[OptionRowMiniMenuContext]
+Fallback="OptionRowMiniMenu"
+TitleX=240
 
 [ScreenSelectStyle]
 UpdateOnMesage=""