diff --git a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua
index 623256ce29..bb4b662826 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua	
@@ -4,11 +4,23 @@ function CreditsText( pn )
 		self:settext(str);
 	end
 
-	local text = LoadFont("ScreenManager","credits") .. {
-		InitCommand=cmd(shadowlength,0);
+	function UpdateVisible(self)
+		local screen = SCREENMAN:GetTopScreen();
+		local bShow = true;
+		if screen then
+			local sClass = screen:GetName();
+			bShow = THEME:GetMetric( sClass, "ShowCoinsAndCredits" );
+		end
+
+		self:visible( bShow );
+	end
+
+	local text = LoadFont(Var "LoadingScreen","credits") .. {
+		InitCommand=THEME:GetMetric(Var "LoadingScreen","CreditsInitCommand");
 		RefreshCreditTextMessageCommand=update;
 		CoinInsertedMessageCommand=update;
 		PlayerJoinedMessageCommand=update;
+		ScreenChangedMessageCommand=UpdateVisible;
 	};
 	return text;
 end
@@ -36,10 +48,10 @@ local t = Def.ActorFrame {
 			HideSystemMessageMessageCommand = cmd(finishtweening);
 		};
 		CreditsText( PLAYER_1 ) .. {
-			InitCommand=cmd(x,SCREEN_LEFT+120;y,SCREEN_BOTTOM-6);
+			InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen","CreditsP1X");y,THEME:GetMetric(Var "LoadingScreen","CreditsP1Y"););
 		};
 		CreditsText( PLAYER_2 ) .. {
-			InitCommand=cmd(x,SCREEN_RIGHT-120;y,SCREEN_BOTTOM-6);
+			InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen","CreditsP2X");y,THEME:GetMetric(Var "LoadingScreen","CreditsP2Y"););
 		};
 
 	};
diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer credits 16x16.png b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits 16x16.png
new file mode 100644
index 0000000000..3f965793d8
Binary files /dev/null and b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits 16x16.png differ
diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini
new file mode 100644
index 0000000000..1227909ad4
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenSystemLayer credits.ini	
@@ -0,0 +1,276 @@
+[Char Widths]
+AddToAllWidths=2
+AddToAllHeights=2
+
+# row 1, dots
+0=5
+1=5
+2=5
+3=5
+4=5
+5=5
+6=5
+7=5
+8=5
+9=56
+10=0
+11=5
+12=5
+13=0
+14=5
+15=5
+16=5
+# row 2, more dots
+17=5
+18=5
+19=5
+20=5
+21=5
+22=5
+23=5
+24=5
+25=5
+26=5
+27=5
+28=5
+29=5
+30=5
+31=5
+32=3
+# row 3, punctuation
+33=3
+34=4 #!
+35=5 #"
+36=5
+37=8
+38=8 #%
+39=3 #heart
+40=5 #'
+41=5 #(
+42=6 #)
+43=6 #*
+44=4 #+
+45=5 #,
+46=3 #-
+47=8 #.
+48=8 #/
+# row 4, numbers and more punctuation
+49=9 #0
+50=8 #1
+51=9 #2
+52=8 #3
+53=8 #4
+54=8 #5
+55=8 #6
+56=8 #7
+57=8 #8
+58=3 #9
+59=4 #:
+60=6 #;
+61=5 #<
+62=6 #=
+63=7 #>
+64=5 #?
+# row 5, space, A-O
+65=8 #A
+66=8 #B
+67=8 #C
+68=8 #D
+69=8 #E
+70=8 #F
+71=8 #G
+72=8 #H
+73=7 #I
+74=8 #J
+75=8 #K
+76=8 #L
+77=8 #M
+78=8 #N
+79=8 #O
+80=8 #P
+# row 6, P-Z, [ ] _
+81=8 #Q
+82=8 #R
+83=8 #S
+84=8 #T
+85=8 #U
+86=8 #V
+87=8 #W
+88=8 #X
+89=7 #Y
+90=8 #Z
+91=5
+92=5
+93=5
+94=5
+95=5
+96=5
+# row 7, space, a-o
+97=7  #a
+98=7  #b
+99=7  #c
+100=7 #d
+101=7 #e
+102=7 #f
+103=7 #g
+104=7 #h
+105=3 #i
+106=7 #j
+107=7 #k
+108=3 #l
+109=8 #m
+110=7 #n
+111=7 #o
+112=7 #p
+# row 8, p-z
+113=7
+114=6
+115=7
+116=7
+117=7
+118=7
+119=8
+120=8
+121=7
+122=7
+123=5
+124=5
+125=5
+126=13
+127=5
+128=5
+#--nothing matters after this point--#
+129=5
+130=5
+131=5
+132=5
+133=5
+134=5
+135=5
+136=5
+137=5
+138=5
+139=5
+140=5
+141=5
+142=5
+143=5
+144=5
+
+145=5
+146=5
+147=5
+148=5
+149=5
+150=5
+151=5
+152=5
+153=5
+154=5
+155=5
+156=5
+157=5
+158=5
+159=5
+160=5
+
+161=5
+162=5
+163=5
+164=5
+165=5
+166=5
+167=5
+168=5
+169=5
+170=5
+171=5
+172=5
+173=5
+174=5
+175=5
+176=5
+
+177=5
+178=5
+179=5
+180=5
+181=5
+182=5
+183=5
+184=5
+185=5
+186=5
+187=5
+188=5
+189=5
+190=5
+191=5
+192=5
+
+193=5
+194=5
+195=5
+196=5
+197=5
+198=5
+199=5
+200=5
+201=5
+202=5
+203=5
+204=5
+205=5
+206=5
+207=5
+208=5
+
+209=5
+210=5
+211=5
+212=5
+213=5
+214=5
+215=5
+216=5
+217=5
+218=5
+219=5
+220=5
+221=5
+222=5
+223=5
+224=5
+
+225=5
+226=5
+227=5
+228=5
+229=5
+230=5
+231=5
+232=5
+233=5
+234=5
+235=5
+236=5
+237=5
+238=5
+239=5
+240=5
+
+241=5
+242=5
+243=5
+244=5
+245=5
+246=5
+247=5
+248=5
+249=5
+250=5
+251=5
+252=5
+253=5
+254=5
+255=5
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 78005a83bc..201faffe17 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -31,6 +31,7 @@ PrepareScreens=
 PersistScreens=
 GroupedScreens=
 CancelCancelCommand=
+ShowCoinsAndCredits=true
 
 [ModeSwitcher]
 PrevModeX=-200
@@ -1916,6 +1917,11 @@ Line4="list,RandomModifiers"
 Fallback="Screen"
 Class="ScreenSystemLayer"
 CreditsJoinOnly=false
+CreditsP1X=SCREEN_LEFT+120
+CreditsP1Y=SCREEN_BOTTOM-6
+CreditsP2X=SCREEN_RIGHT-120
+CreditsP2Y=SCREEN_BOTTOM-6
+CreditsInitCommand=shadowlength,0
 
 [ScreenDebugOverlay]
 Class="ScreenDebugOverlay"