From 4da45222aa022bd8a05a89ffb374f43b79c37261 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <PhosphorusGL@gmail.com>
Date: Thu, 27 Dec 2012 21:47:29 -0800
Subject: [PATCH] theme changes (incomplete)

---
 .../default.lua                               |  11 +---
 .../Graphics/LifeMeterBattery frame.png       | Bin 592 -> 4002 bytes
 .../LifeMeterBattery lives/default.lua        |  56 +++++++++++++++---
 .../ScreenSelectPlayMode scroller/default.lua |  17 ++++--
 .../ScreenWithMenuElements Footer.lua         |   7 +++
 .../ScreenWithMenuElements footer.png         | Bin 3521 -> 0 bytes
 .../ScreenWithMenuElements header/default.lua |   4 +-
 Themes/default/Scripts/02 Colors.lua          |   8 +--
 Themes/default/metrics.ini                    |   6 +-
 .../default/~res/LifeMeterBattery parts.psd   | Bin 0 -> 47596 bytes
 10 files changed, 77 insertions(+), 32 deletions(-)
 create mode 100644 Themes/default/Graphics/ScreenWithMenuElements Footer.lua
 delete mode 100644 Themes/default/Graphics/ScreenWithMenuElements footer.png
 create mode 100644 _assets/Themes/default/~res/LifeMeterBattery parts.psd

diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua
index 81dcd85977..bb37abf203 100644
--- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
+++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua	
@@ -10,7 +10,7 @@ t[#t+1] = Def.ActorFrame {
 	Def.ActorFrame {
 		InitCommand=cmd(hide_if,hideFancyElements;);
 		LoadActor("_checkerboard") .. {
-			InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
+			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.5;diffuse,color("#ffd400");diffusealpha,0.5;fadetop,1);
 		};
 	};
@@ -22,11 +22,7 @@ t[#t+1] = Def.ActorFrame {
 	}; --]]
 
 	Def.Quad {
-		InitCommand=cmd(vertalign,top;scaletoclipped,SCREEN_WIDTH+1,80;y,-SCREEN_CENTER_Y+20;fadebottom,0.75);
-		OnCommand=cmd(diffuse,color("#FFCB05"));
-	};
-	Def.Quad {
-		InitCommand=cmd(vertalign,bottom;scaletoclipped,SCREEN_WIDTH+1,80;y,SCREEN_CENTER_Y-20;fadetop,0.75);
+		InitCommand=cmd(vertalign,bottom;scaletoclipped,SCREEN_WIDTH+1,96;y,SCREEN_CENTER_Y-32;fadetop,0.75);
 		OnCommand=cmd(diffuse,color("#FFCB05"));
 	};
 --[[ 	LoadActor("_pattern") .. {
@@ -39,9 +35,6 @@ t[#t+1] = Def.ActorFrame {
 		effectcolor2,Color("White");effectcolor1,Color("Black");fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;blend,Blend.Add;
 		diffusealpha,0.155);
 	}; --]]		
-	LoadActor("_bg top") .. {
-		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
-	};
 };
 
 return t;
diff --git a/Themes/default/Graphics/LifeMeterBattery frame.png b/Themes/default/Graphics/LifeMeterBattery frame.png
index a91ea54d81fc5863c6bc7d5f30f5272ecf5b8c59..1df9b67dfa3bc7641d144d5f56d63727f74aee5d 100644
GIT binary patch
literal 4002
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
IM6N<$g2icWFaQ7m

literal 592
zcmeAS@N?(olHy`uVBq!ia0y~yVB`U^bvT%T<nqokWgt}%;1lBd{rmTyKYxDx`t{ql
zZ$Ezg`2G7gPzDc3OiTpIzJ2=^P0jV|*Wn_sU%!6w;zeFw-j^?5{{R0EF&}6+(28Hb
zegSO+im%T&wh*X6u_VYZ7^1PkfPqa+PdOx8V}91>I$dGK#3wB3^`Aa3VPM!D_HZlE
z2Wg%zjv*CsZ!TE#H7E!$1g?(#$;$D+DP#Nh{R<P5eQXXJUA^*t$NsYVp5DUVB;zi<
z+eUuJ0=B9O#ASsVw)HKX{GqC2mZ6Q0(0!Kk5^Nm~6)p)9%-5|%=0r37NV0iz!BLQb
zfrY{GaifIW{|P4^yfix$HuH6`VcCOOj%<=C6CB+(J0CY=U=R>tRTb)4Sn>P(3WLU5
z`vv)w{;oXR;N504Wg$;0k9CO;GXoEk!v^8CJj=f8Z)E0VllVEgU@l|f`JkzclX;BK
z7#!v?wzDn?U}6w(3M}AXB<)=B*ShP*fz|a&KIskZvZj(7P6dEW>q%<w<78k^(BRsn
z&~|_S5=Z9M<$``)UzVFWTcu3^yUFnFEo;653Op_cO@2x=Pt;&sXj1)O+ihatt~m*n
zQ(x!W-j`tb{aA8F@{8(8>^_qMqS<TrhNk<Nah=dUJjc*;OS4@!-<>kfNdH$R>^uJj
dyb(IInqBPK&c3=Pr5aGQc)I$ztaD0e0sw!r>Qn##

diff --git a/Themes/default/Graphics/LifeMeterBattery lives/default.lua b/Themes/default/Graphics/LifeMeterBattery lives/default.lua
index 16cd3a5963..b2b1485d99 100755
--- a/Themes/default/Graphics/LifeMeterBattery lives/default.lua	
+++ b/Themes/default/Graphics/LifeMeterBattery lives/default.lua	
@@ -2,15 +2,55 @@ local player = Var "Player"
 local blinkTime = 1.2
 local barWidth = 256;
 local barHeight = 32;
+local c
 
-local t = Def.ActorFrame{
-	Def.Quad{
-		InitCommand=cmd(diffuse,color("#666666");zoomto,barWidth,barHeight);
+local function CreateLives(numLives)
+	local t = {};
+	for i=1,numLives do
+		t[#t+1] = Def.Quad {
+			Name=i;
+			OnCommand=cmd(zoom,1024);
+		};
+	end
+	return t
+end
+
+local t = Def.ActorFrame {
+	Def.ActorFrame {
+		Name="LifeContainer";
 	};
-	Def.Quad{
-		InitCommand=cmd(diffuse,color("#000000");zoomto,barWidth,barHeight;fadetop,1);
-	};
-	LoadActor("_lives")..{
+	InitCommand=function(self)
+		c = self:GetChildren();
+	end;
+
+	BeginCommand=function(self,param)
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "TEST", NoAnimate = true});
+		local c = self:GetChildren();
+		local screen = SCREENMAN:GetTopScreen();
+		local lifemeter = screen:GetLifeMeter(player);
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "TEST2", NoAnimate = true});
+		local TotalLives = lifemeter:GetTotalLives();	
+		local CurLives = lifemeter:GetLivesLeft();
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "ASSIGN CONTAINERS", NoAnimate = true});
+		c.LifeContainer[#c.LifeContainer+1] = CreateLives(TotalLives);
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "LIVES = " .. TotalLives .. " | CUR = " .. CurLives .. " | ACTORS: " .. self:GetNumChildren(), NoAnimate = true});
+	end;
+	LifeChangedMessageCommand=function(self,param)
+		if param.Player == player then
+			return
+		end
+	end;
+	StartCommand=function(self,param)
+		if param.Player == player then
+			return
+		end
+	end;
+	FinishCommand=function(self,param)
+		if param.Player == player then
+			return 
+		end
+	end;
+	--[[ LoadActor("_lives")..{
 		InitCommand=cmd(pause;horizalign,left;x,-(barWidth/2));
 		BeginCommand=function(self,param)
 			local screen = SCREENMAN:GetTopScreen();
@@ -40,7 +80,7 @@ local t = Def.ActorFrame{
 			end			
 		end;
 		FinishCommand=cmd(playcommand,"Start");
-	};
+	}; ]]
 	
 };
 
diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua
index b2971f5503..fab1a01a7f 100644
--- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua	
+++ b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua	
@@ -3,20 +3,25 @@ local colors = {
 	Easy		= color("#00ff00"),
 	Normal		= color("#feee00"),
 	Hard		= color("#feee00"),
-	Rave		= color("#c44dff"),
+	Rave		= color("#db93ff"),
 	Nonstop		= color("#00ffff"),
 	Oni			= color("#d70b8c"),
-	Endless		= color("748392"),
+	Endless		= color("#b4c3d2"),
 };
 local t = Def.ActorFrame {};
 -- Background!
 t[#t+1] = Def.ActorFrame {
 -- 	GainFocusCommand=cmd(visible,true);
 -- 	LoseFocusCommand=cmd(visible,false);
+	LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. {
+		InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.7);
+		GainFocusCommand=cmd(visible,true);
+		LoseFocusCommand=cmd(visible,false);
+	};
  	LoadActor("_HighlightFrame") .. {
 		InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0);
-		GainFocusCommand=cmd(stoptweening;linear,0.125;diffusealpha,1);
-		LoseFocusCommand=cmd(stoptweening;linear,0.125;diffusealpha,0);
+		GainFocusCommand=cmd(finishtweening;diffusealpha,1;glow,Color.Alpha(Color.White,1);linear,0.25;glow,Color.Invisible);
+		LoseFocusCommand=cmd(finishtweening;diffusealpha,0;glow,Color.Invisible);
 		OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible"));
 	};
 };
@@ -60,6 +65,6 @@ t[#t+1] = Def.ActorFrame {
 		LoseFocusCommand=cmd(stoptweening;x,320;accelerate,0.25;diffusealpha,0;x,320+16;diffusealpha,0);
 	};
 };
--- t.GainFocusCommand=cmd(visible,true);
--- t.LoseFocusCommand=cmd(visible,false);
+t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;bounceend,0.25;zoom,1);
+t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1);
 return t
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua
new file mode 100644
index 0000000000..d1f3da8740
--- /dev/null
+++ b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua	
@@ -0,0 +1,7 @@
+local t = Def.ActorFrame {};
+
+t[#t+1] = Def.Quad {
+	InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,32;diffuse,Color.Black);
+};
+
+return t;
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScreenWithMenuElements footer.png b/Themes/default/Graphics/ScreenWithMenuElements footer.png
deleted file mode 100644
index 44c033f7c133e05134b03fc411168a0e76ac89a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3521
zcmbVPXEfZ~7XJ&;TSSd=2|@HOIx~6=MvUIVC}9Z6C?QI;aEa(-CQ@W{LX1rG-baf%
zgXlqqr)4C9=ic?!%ewF5`*41Huirj<?{oIqANEPUZEnCodyN(V00tvNT`K?}zjL9h
zQ&V1`CtiHuLeK;n+64mu-POMq8Bp+o698x}e8Aw_x4q#Z@L+FvAioh9%pZ6k?&WjO
z697Wzkk&AW^(MOpY2grLk`$d~0=HtL=C=Z+M6+fHiwV#$8z%|8nq{+WzoMr{!QEGs
zM4pxwoyuk@LI0F?hH6#dbz0n;q^AQXOA&AUrkY6W!)Nu=ni~}d$hr}#Hfs7DLwQTZ
zX!=qR-<2<My<I&^t5VuAv_gRZGj-ivf#6d?GT=B$U0wWo8&wNH7CJ#k4YZjRw#o1$
zo-=KM@*T;dpOCeMWZW{Lj%Ee4!_z?T0BwD;Xk?zSHBdwWxDI-_uK>3t0aua7>k~jU
z@;E<&3~<O2U?VHa0Qj$ZCg}p+YCy%vou_&LR0d%6GU-wQW+VX_BU>*+pr!$6!!gs<
z0@U<?jAc^%O@JZ-aP1Qm3<aL#1FZV{w(5K0Rm>Y=7nRDdRmTdc=*2itO9oNd+Dh?>
z;*2=NS(V%_xfN(jb%f<}$;BuzeK{BcfT9exi`yQYhT<5ja5$wj45N$WRx9QCb$9ob
zv$c`(Ky3h63W*v!laQ{v7Oh4Z?SJ<A#twzIGhNXGQi@kClXg8&v^i&c5cpSZ^j<x~
z&d#o_uFe>DfgIchY$MNL9WHIQr}utDssAD!eQ8-1iji}QF`zj9(lK;sTFf)@oaTu;
zVLjd8R|DPoFW!mkT}JL$s2J;tB}-76Zb9mST=Df}(DR$!H^$HJE-y-)kZUd~0yVyx
zWDyyXB~BjX-%UiAp&@O{BmmfNgtvbdr6!N|j$0Z*obPI#8Wi0CqP>is2LXVyu8<UD
zpiZlo8US>QV#I26xDVSoCE6%?+AkB@>3+E?Jpl=Ib%2;bw0EO<?z`Tshy{rz4A=0A
zxk`W5=2d93^iIeOWR&W#`N*gd$n?{V8r3e^6hlLy(?@;PO<*pG%>5};FpZicKmJ&t
z-H?JMMToyYiPiGDNrs}KtkqKpzl|a9zQ+AaDv6HzpEA_?0J+#-2~7sFSuwSi8lUOw
z!PpYzYftoF(~aH@ku6APFDe|p|KXZOs?w{C(Q<F5xpYl%uT0xlPAd7XdoofzouK!(
zBxo`{2H#(=pfB&aR&%F<yfOL6W8^)8f+a?;jYf$A0pfS#(=mjaLd|CkOZa(&6t2wC
zDASNXvFs4Jo>^k@LHN^^A6=a8a<Yj~LkYntmh`LA%n?c8E@dH>WU!nF_Sq$)_irKN
zEaUp)0ak*W5~YO-hSvl$`{(ZZ)l#WsN$`vJ#jhe)J6GjbxmN}D9cYp6+CguRt(Qfu
z27HaV)|l56)+jym<aBJ_6j;rdyn<X&Ot%MBzQR~lTPBuVRd`UKG91TlWKvxDI(y=p
zH-|ULr}}Hirz`W>eCD~Mw&R1F248c(k{=@I84}pydXr$HT!oxeoG>l~XLX+GJFbZo
zu3m_Yvg~%=Mm|$M+y*L!5qrdzF+iJboGqNqEhY^qEqhnCP)28SU^56wFLkz#tkSoU
zw_Yiw`J7X3Q--{~ZOv^BD^)8=EQ6K6AzE*v>`s#@?K(|6Ex>Ori{87eH1+V)d2rQ*
zN(lHdlqWohQS1_aKRo;Bp;%+yDQ{znMp@}A6|lUqyltJ;L6(;m)k<E_@rw|1nhjBO
z?m^Vk1=ii0%Qv~-DVSnqJsthZa&mK^<%Z>!<p$f$N>xNO@?EoDquogiqfW1}h@*%B
zEFE_lxnVtPJ&&eEvzuwC9#u(|`4w}&YScxv2B3HHP%X~UC{s9kA*^}hCr_mGDdg1u
zC;G^M9!gn9FGPu_$8oB6D+a;Ud8K>tdzN6QPHk|pTee&7(vuAAnEIPZ{Xg}YQhj<H
zSA<sld;ELe2vZ6R2%DH~ne7x<nPK1Ee5YorX4*SEH2ivaDqpcsLv~tjqi~~ex^S_<
z)jrf-0#kzd=xJ2DYX8n|2h$V~Z?9rk47IU$s?)DTR^FIutZYPIL1WD`&C5|!u+Ex2
zOh2ZyfvaY1h7w<e@yA5E!Q44u4c%3pJDJUyk)I;}Jk_9LNStLX=e6gJ3jT1PRrQYQ
zLILi@j#gy%Va}#B3_8L*G9$l&xjJ~W%Li#)IAH+efMJ8<4w6!mO=1V7ay6w2xqIgO
znpcfOj)I()!pD!0g>{7;#1ee<j?#|LP9ovukiyHGC_DM!(at{b7t6IVExMQ4GJcB{
zQ5Il}7+C#=ptOf{hHd3^O+zuFjO4b<q4{0&{>v536?NqWxdl6yA?3D)zJ@`IPB_XX
zei8gw@ciz1`1u%sj=n(#BTtUeiE+4eavc6hpfycP74P}Ic9y7<T7=bM(@Br5j9qK5
z6!7l*_N-EXw2_C)!1*x7-;Vk^HA>~S?v~OSMK2Pc7;l@Pl@^!;y*4JBtB4pQfP)ux
zf9mGwE)>FKEmW!{jTOZ-%cOkO=afGweA4QX^0FJ6gd(9v_e^+Hq{OO}0`9de{vsYE
zE+d!eRw6j^r2Cu#!(QP!4&%}6rBW;ssyW)GN#?h*{-wh#R>GcoWB)4RMjCBc2X6=L
zy7ZXRSkesGQH;-g-%!jf{Q0+xCdDwJZuw$~HS80S(q~Pk45ssiswnn?hy4C>8mi5*
zanCcJ1%b*0%rY^sE!eu(!@&yA_}a7XfRqMlzHF*~zq)4?m+d5JF`#!}A@-uvVpO#-
zPg}3n;p738oN|=-Fmb4E0RK$+#qP^<B1;F$(sN94f{CppFLb@R!dInMJtz!MyTW!^
zJmC&yh5E;*7%~4zi*llEZdFvXaJZRYjC1=yY<oSK-!`2M?OJ@~Hes6RWC4}7Tda5c
znSkWhWJ`Wp#fs<1WqUj$N(f!!PJ|D%<`c3$l$Lj4?~Ztldu^^SNTM7VbINkpa~T5|
zX6HUIEZ+G*Jo>JOm(Cp)#W%)bz}Ppf>K~gt(fzn#H7&?n$RXq>L}_PyzTR#6IACmt
zJEG~k!naAhLlfy#v%dvzLuO+(={4zjVsuhR(yB@>+dR%W@pq~;_YWfWl8=+0QVB9*
zrm>$VdB-&%R_RmX+Xjrif3%z-cM*~dN(?rCzUWyN4Ac!<-6YX0lK2=@=N_g;R4h?V
z{PB<%#w+a$D%da3FSIT=ad3C|WHF>UHnp`7{>uRW2h$4$b-OU*14zHm+-B@VCTxEs
z6`75UjFS36aK*pIL~MBA7JZrEyPudtmd5qYQ#RC^)NqdbA4B$Q@oQIYKiU>ltGf7a
zg>0#xWlmW1Hoj;qsKPq>VRyot>m$5Ko7^a6-27p4*dF`&)FetpW4`$y98T&c9WAoY
zN8J}W#SJ#jB1Cp7n=G1K4z-Cov*7u}NiByn!ptt=v2Poq=wOUsK%$I~8#&83N@oIJ
zPR~ytOkhaZM%~g>QCZfyf4cb#4Ia5WB8=iVdwn)o#lbEebv(H}jT_4wdzHJNo7w9B
zsQ7fNZJVna-_y~<*U}#<FYA1G=Y-gfARu^m-z+j&tUls@EPC$!<NcBKDEcImD>L()
zf;{iwmxsJ0{$k$b_b{|F1Ay=w01zDq06)$z<R$<-kO6=#R{&7W0{{;AbC+&?0J!wc
zNLL3EI`@rW5>PI~NqHNOwW8|x+5y$he5-CpDzMz(yhm>)hLrc&TWOFz+<P#Z7tDB(
z;$AKf*+o>>%NN<87aH|nLvJkGf8c-k{~CYu|8)AB|84y5{=Xys51-Y|+>z*Uk!VIJ
zkvZXU1D<$(8fDQbqaJ%FNj70Oeb0cF+X<c3L6{kPwoK?aMq}#jD^D{epJZ7*GA_`f
z>b5-j7OC*r`GsxS$*qlX6<mc&eSrUb{MnAiwDU-_cxCW3&adiwLL|q_ZNgstg2@`H
zXTzmVf3i+$Xxkp`S=q0~ruKa_<naXDfq}G0;4_g9oo}rBo{CZL+&bIjGa-%FER267
z{0m$~$PY$2A|@R+7gZa4)3HrI=J6c3n}{91_rw!KR;Azf5A_w3AIyg}Y!)o4A`yH?
z`ksZ`BSatjYDnwy(9?S5At%R(kTXS6g9&l`0WqwS7`B8p-(D@=Xt<5|dHQ9uV#>E#
zV<h1W9aN01_tU8Abtx>iPhZcn(nOkf{&>{lB9%K5+U$Iw&{q+8kLzThpgAHG-Q4`s
z^sM6`{K4>>^~1Cul`W_}4L_dA^R$<6-f8)V{sHjjDGYW|-fzyn8tt!fgh`v1+d*n-
zy?(r_8j+?|3*VKE7@GCiflqy#?^GiaCt>>>sOfUwo`lx3i%yW~)T+LC9p;J)pb)=+
z_KUxfcFm>#z(4ul#^3xuo&M&38~>kR(SnaI&UJoH4rE91(`%yM{?(>{k)FA3705OA
E-#tuVIsgCw

diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua
index c9b3a9c386..35349997c1 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua	
+++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua	
@@ -3,9 +3,9 @@ local t = Def.ActorFrame {};
 t[#t+1] = Def.Quad {
 	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,48;diffuse,Color.Black);
 }
-t[#t+1] = LoadActor("Header") .. {
+--[[ t[#t+1] = LoadActor("Header") .. {
 	InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"));
-};
+}; ]]
 --[[ t[#t+1] = LoadActor("_texture stripe") .. {
 	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+64,44;customtexturerect,0,0,SCREEN_WIDTH+64/8,44/32);
 	OnCommand=cmd(fadebottom,0.8;texcoordvelocity,1,0;skewx,-0.0025;diffuse,Color("Black");diffusealpha,0.235);
diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua
index 85c2e1d156..bd1e03056b 100644
--- a/Themes/default/Scripts/02 Colors.lua	
+++ b/Themes/default/Scripts/02 Colors.lua	
@@ -1,7 +1,7 @@
 ModeIconColors = {
 	Normal		= color("#FFEE00"), -- yellow
-	Rave		= color("#4400CC"), -- purple
-	Nonstop		= color("#00CCFF"), -- cyan
-	Oni			= color("#CC00FF"), -- redder purple
-	Endless		= color("#444488"), -- steel
+	Rave		= color("#db93ff"), -- violet
+	Nonstop		= color("#5ca9ff"), -- blue
+	Oni			= color("#00f1e2"), -- cyan
+	Endless		= color("#b4c3d2"), -- steel
 }
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 730c7d356a..3c534b782d 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -574,7 +574,7 @@ HeaderOffCommand=
 ShowFooter=true
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM
-FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400");
+FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
 FooterOffCommand=
 
 ShowHelp=true
@@ -817,7 +817,7 @@ ScrollerY=SCREEN_CENTER_Y-60
 ScrollerOnCommand=SetFastCatchup,true;
 ScrollerOffCommand=decelerate,0.8;y,SCREEN_CENTER_Y;sleep,1.5;linear,0.1;zoomy,0
 #
-ShowBackgroundFrame=true
+ShowBackgroundFrame=false
 BackgroundFrameX=SCREEN_CENTER_X
 BackgroundFrameY=SCREEN_CENTER_Y-60
 BackgroundFrameOnCommand=diffuse,Color("Black");diffusealpha,0.7
@@ -1408,7 +1408,7 @@ SongMeterDisplayOffCommand=
 ShowSongTitle=not GAMESTATE:IsDemonstration();
 SongTitleX=SCREEN_CENTER_X
 SongTitleY=SCREEN_TOP+54
-SongTitleOnCommand=draworder,55;strokecolor,Color.Outline;shadowlength,1;basezoom,0.675;zoomy,0;sleep,1;smooth,0.5;zoom,1;
+SongTitleOnCommand=draworder,55;strokecolor,Color.Outline;shadowlength,1;basezoom,0.55;zoomy,0;sleep,1;smooth,0.5;zoom,1;
 SongTitleOffCommand=
 #
 SongMeterDisplayP1X=Center1Player() and SCREEN_CENTER_X or SCREEN_LEFT+16
diff --git a/_assets/Themes/default/~res/LifeMeterBattery parts.psd b/_assets/Themes/default/~res/LifeMeterBattery parts.psd
new file mode 100644
index 0000000000000000000000000000000000000000..6d3002ea22ac252086426dd39eb209baa71eab2d
GIT binary patch
literal 47596
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
U=iu1+u&dc3V1X2^cK4D01O5IhR{#J2

literal 0
HcmV?d00001