diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..9f0075b6cd
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..c143374cbb
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png
index c0067b1fd7..9ee973452c 100644
Binary files a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png
index f5f467be3e..d5501786a1 100644
Binary files a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini
index a48028a812..6af54be85f 100644
--- a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini	
+++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini	
@@ -1,8 +1,8 @@
-[common]
-Baseline=14
-Top=2
+[common]
+Baseline=15
+Top=3
 LineSpacing=17
-DrawExtraPixelsLeft=0
+DrawExtraPixelsLeft=1
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
@@ -27,17 +27,17 @@ Line 14=øùúûüýþÿ
 0=6
 1=4
 2=7
-3=19
-4=13
-5=10
-6=14
+3=12
+4=12
+5=14
+6=15
 7=4
 8=6
 9=6
-10=14
-11=14
+10=9
+11=11
 12=4
-13=14
+13=7
 14=4
 15=5
 16=11
@@ -52,11 +52,11 @@ Line 14=øùúûüýþÿ
 25=11
 26=4
 27=4
-28=18
-29=14
-30=18
+28=11
+29=11
+30=11
 31=9
-32=10
+32=15
 33=10
 34=11
 35=11
@@ -86,9 +86,9 @@ Line 14=øùúûüýþÿ
 59=5
 60=5
 61=5
-62=10
+62=11
 63=10
-64=10
+64=4
 65=10
 66=11
 67=11
@@ -118,130 +118,130 @@ Line 14=øùúûüýþÿ
 91=6
 92=4
 93=6
-94=10
-95=13
+94=11
+95=12
 96=4
-97=10
+97=0
 98=7
-99=10
-100=10
-101=10
-102=10
-103=10
-104=14
-105=10
-106=13
-107=14
+99=20
+100=0
+101=0
+102=0
+103=20
+104=0
+105=0
+106=17
+107=0
 108=4
 109=4
 110=7
 111=7
-112=10
-113=15
-114=16
-115=10
-116=10
-117=14
-118=10
-119=10
-120=14
-121=10
-122=14
+112=0
+113=20
+114=20
+115=0
+116=0
+117=0
+118=0
+119=17
+120=0
+121=0
+122=0
 123=4
-124=10
-125=10
-126=10
-127=10
-128=14
-129=10
-130=10
-131=10
-132=10
-133=10
-134=14
-135=14
-136=10
-137=14
-138=14
-139=10
-140=14
-141=14
-142=10
-143=10
-144=10
-145=14
-146=10
-147=14
-148=10
-149=10
-150=14
-151=14
-152=14
+124=0
+125=0
+126=20
+127=12
+128=0
+129=20
+130=20
+131=12
+132=6
+133=0
+134=0
+135=0
+136=12
+137=0
+138=20
+139=20
+140=6
+141=6
+142=11
+143=0
+144=0
+145=20
+146=0
+147=2
+148=6
+149=0
+150=0
+151=0
+152=0
 153=9
-154=18
-155=18
-156=18
-157=18
-158=18
-159=18
-160=27
-161=13
-162=13
-163=13
+154=10
+155=10
+156=10
+157=10
+158=10
+159=10
+160=14
+161=11
+162=10
+163=10
 164=10
-165=13
+165=10
 166=4
 167=4
 168=4
 169=4
-170=14
-171=15
-172=16
-173=16
-174=16
-175=16
-176=16
-177=14
-178=10
-179=15
-180=15
-181=15
-182=15
-183=14
-184=14
-185=10
+170=11
+171=11
+172=11
+173=11
+174=11
+175=11
+176=11
+177=20
+178=11
+179=11
+180=11
+181=11
+182=11
+183=11
+184=11
+185=11
 186=10
 187=10
 188=10
 189=10
 190=10
 191=10
-192=10
-193=10
+192=14
+193=11
 194=10
 195=10
 196=10
 197=10
-198=10
-199=10
-200=10
-201=10
-202=14
-203=10
-204=10
-205=10
-206=10
-207=10
-208=10
-209=14
-210=10
-211=10
-212=10
-213=10
-214=10
-215=14
-216=14
-217=10
+198=4
+199=4
+200=4
+201=4
+202=11
+203=11
+204=11
+205=11
+206=11
+207=11
+208=11
+209=20
+210=11
+211=11
+212=11
+213=11
+214=11
+215=11
+216=11
+217=11
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -255,99 +255,99 @@ Line 7=ćçčéęëěíîď
 Line 8=đńňóôőö÷řů
 Line 9=úűüýţ˙
 
-0=14
-1=14
-2=10
-3=14
-4=10
-5=14
-6=14
-7=10
-8=10
-9=14
-10=14
-11=14
-12=14
-13=14
-14=14
-15=14
-16=14
-17=14
-18=10
-19=14
-20=10
-21=14
-22=14
-23=10
-24=10
-25=14
-26=14
-27=14
-28=14
-29=10
-30=14
-31=14
-32=14
-33=18
-34=18
-35=14
-36=18
-37=14
-38=14
-39=13
-40=14
-41=13
-42=14
-43=13
-44=14
+0=0
+1=0
+2=0
+3=0
+4=20
+5=0
+6=0
+7=20
+8=20
+9=0
+10=0
+11=0
+12=0
+13=0
+14=0
+15=0
+16=20
+17=0
+18=0
+19=0
+20=11
+21=0
+22=0
+23=20
+24=0
+25=0
+26=0
+27=0
+28=0
+29=0
+30=0
+31=0
+32=0
+33=10
+34=10
+35=0
+36=10
+37=0
+38=0
+39=11
+40=0
+41=10
+42=0
+43=10
+44=0
 45=4
 46=4
-47=14
-48=14
-49=14
-50=14
-51=16
-52=16
-53=14
-54=16
-55=14
-56=14
-57=14
-58=15
-59=14
-60=15
-61=14
-62=14
-63=10
-64=14
+47=0
+48=0
+49=0
+50=0
+51=11
+52=11
+53=0
+54=11
+55=20
+56=0
+57=0
+58=11
+59=0
+60=11
+61=11
+62=0
+63=11
+64=0
 65=10
 66=10
-67=14
+67=0
 68=10
-69=14
-70=14
-71=10
-72=14
+69=0
+70=0
+71=11
+72=0
 73=10
-74=14
+74=0
 75=10
-76=14
-77=10
-78=10
-79=14
-80=14
-81=14
-82=14
-83=10
-84=10
-85=14
-86=10
-87=14
-88=14
-89=14
-90=10
-91=14
-92=10
-93=14
-94=14
-95=10
+76=20
+77=4
+78=4
+79=0
+80=0
+81=20
+82=20
+83=11
+84=11
+85=0
+86=11
+87=20
+88=0
+89=0
+90=11
+91=0
+92=11
+93=11
+94=0
+95=20
diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text [main] 15x15 (doubleres).png
index 742d7e943f..0a45068db5 100644
Binary files a/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text.ini
index 972bc9fb98..14f0d04274 100644
--- a/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text.ini	
+++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 26px header text.ini	
@@ -168,7 +168,7 @@ Line 14=øùúûüýþÿ
 141=12
 142=12
 143=12
-144=13
+144=12
 145=12
 146=12
 147=12
@@ -178,68 +178,72 @@ Line 14=øùúûüýþÿ
 151=12
 152=12
 153=14
-154=12
-155=12
-156=12
-157=12
-158=12
-159=12
-160=17
-161=12
-162=12
-163=12
-164=12
-165=12
+154=18
+155=18
+156=18
+157=18
+158=18
+159=18
+;AE
+160=24
+;Ç
+161=17
+162=17
+163=17
+164=17
+165=17
 166=10
 167=10
 168=10
 169=10
-170=14
-171=15
-172=13
-173=13
-174=13
-175=13
-176=13
-177=10
-178=12
-179=15
-180=15
-181=15
-182=15
-183=14
-184=13
-185=13
-186=10
-187=10
-188=10
-189=10
-190=10
-191=10
-192=12
-193=7
-194=6
-195=6
-196=6
-197=6
-198=4
-199=4
-200=4
-201=4
-202=9
-203=11
-204=9
-205=9
-206=9
-207=9
-208=9
-209=12
-210=9
-211=9
-212=9
-213=9
-214=9
-215=9
-216=12
-217=9
+170=18
+171=18
+172=18
+173=18
+174=18
+175=18
+176=18
+177=18
+178=18
+179=18
+180=18
+181=18
+182=18
+183=18
+184=18
+185=18
+;à
+186=18
+187=18
+188=18
+189=18
+190=18
+191=18
+192=25
+193=18
+194=18
+195=18
+196=18
+197=18
+198=8
+199=8
+200=8
+201=8
+202=18
+;ñ
+203=18
+204=18
+205=18
+206=18
+207=18
+208=18
+209=18
+210=18
+211=18
+212=18
+213=18
+214=18
+215=18
+216=18
+217=18
 
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 13px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..b3975039b3
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head 13px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 13px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..b8f0658228
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head 13px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png
index ed388bfc0a..81826884ed 100644
Binary files a/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf square head 13px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png
index bfb83b4340..7045404d5b 100644
Binary files a/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf square head 13px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px.ini b/stepmania/Themes/default/Fonts/_sf square head 13px.ini
index cf79adbdfc..2314b4ed3b 100644
--- a/stepmania/Themes/default/Fonts/_sf square head 13px.ini	
+++ b/stepmania/Themes/default/Fonts/_sf square head 13px.ini	
@@ -1,9 +1,9 @@
-[common]
+[common]
 Baseline=11
 Top=2
 LineSpacing=13
-DrawExtraPixelsLeft=
-DrawExtraPixelsRight=2
+DrawExtraPixelsLeft=1
+DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
 
@@ -88,7 +88,7 @@ Line 14=øùúûüýþÿ
 61=3
 62=10
 63=9
-64=12
+64=10
 65=10
 66=10
 67=10
@@ -118,130 +118,130 @@ Line 14=øùúûüýþÿ
 91=3
 92=2
 93=3
-94=12
+94=10
 95=12
 96=2
-97=12
+97=9
 98=4
-99=12
-100=12
-101=12
-102=12
-103=12
-104=16
-105=12
-106=16
-107=16
+99=9
+100=11
+101=9
+102=9
+103=9
+104=14
+105=9
+106=23
+107=14
 108=2
 109=2
 110=4
 111=4
-112=12
-113=18
-114=19
-115=12
+112=9
+113=14
+114=14
+115=9
 116=12
-117=16
-118=12
-119=12
-120=16
-121=12
-122=16
+117=14
+118=9
+119=23
+120=14
+121=14
+122=12
 123=2
 124=10
-125=12
-126=12
-127=12
-128=16
-129=12
-130=12
-131=12
-132=12
-133=12
-134=16
-135=16
-136=12
-137=16
-138=16
-139=12
-140=16
-141=16
-142=12
-143=12
-144=12
-145=16
-146=12
-147=16
-148=12
-149=12
-150=16
-151=16
-152=16
+125=0
+126=9
+127=10
+128=12
+129=9
+130=5
+131=10
+132=5
+133=9
+134=12
+135=7
+136=10
+137=9
+138=5
+139=7
+140=5
+141=5
+142=10
+143=10
+144=9
+145=2
+146=10
+147=5
+148=5
+149=9
+150=13
+151=13
+152=12
 153=10
-154=22
-155=22
-156=22
-157=22
-158=22
-159=22
-160=33
-161=16
-162=16
-163=16
-164=12
-165=16
-166=5
-167=5
-168=5
-169=5
-170=16
-171=18
-172=19
-173=19
-174=19
-175=19
-176=19
-177=16
-178=12
-179=18
-180=18
-181=18
-182=18
-183=16
-184=16
-185=12
-186=12
-187=12
-188=12
-189=12
-190=12
-191=12
-192=12
-193=12
-194=12
-195=12
-196=12
-197=12
-198=12
-199=12
-200=12
-201=12
-202=16
-203=12
-204=12
-205=12
-206=12
-207=12
-208=12
-209=16
-210=12
-211=12
-212=12
-213=12
-214=12
-215=16
-216=16
-217=12
+154=10
+155=10
+156=10
+157=10
+158=10
+159=10
+160=18
+161=10
+162=10
+163=10
+164=10
+165=10
+166=10
+167=10
+168=10
+169=10
+170=11
+171=10
+172=10
+173=10
+174=10
+175=10
+176=10
+177=7
+178=10
+179=10
+180=10
+181=10
+182=10
+183=10
+184=10
+185=10
+186=10
+187=10
+188=10
+189=10
+190=10
+191=10
+192=18
+193=10
+194=10
+195=10
+196=10
+197=10
+198=2
+199=2
+200=2
+201=2
+202=10
+203=10
+204=10
+205=10
+206=10
+207=10
+208=10
+209=7
+210=10
+211=10
+212=10
+213=10
+214=10
+215=10
+216=10
+217=10
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -255,99 +255,99 @@ Line 7=ćçčéęëěíîď
 Line 8=đńňóôőö÷řů
 Line 9=úűüýţ˙
 
-0=16
-1=16
-2=12
-3=16
-4=12
-5=16
-6=16
-7=12
-8=12
-9=16
-10=16
-11=16
-12=16
-13=16
-14=16
-15=16
-16=16
-17=16
-18=12
-19=16
-20=12
-21=16
-22=16
-23=12
-24=12
-25=16
-26=16
-27=16
-28=16
-29=9
-30=16
-31=16
-32=16
-33=22
-34=22
-35=16
-36=22
-37=16
-38=16
-39=16
-40=16
-41=16
-42=16
-43=16
-44=16
-45=5
-46=5
-47=16
-48=16
-49=16
-50=16
-51=19
-52=19
-53=16
-54=19
-55=16
-56=16
-57=16
-58=18
-59=16
-60=18
-61=16
-62=16
-63=12
-64=16
-65=12
-66=12
-67=16
-68=12
-69=16
-70=16
-71=12
-72=16
-73=12
-74=16
-75=12
-76=16
-77=12
-78=12
-79=16
-80=16
-81=16
-82=16
-83=12
-84=12
-85=16
-86=12
-87=16
-88=16
-89=16
-90=12
-91=16
-92=12
-93=16
-94=16
-95=12
+0=12
+1=12
+2=9
+3=12
+4=9
+5=12
+6=12
+7=9
+8=5
+9=14
+10=12
+11=12
+12=12
+13=7
+14=14
+15=12
+16=5
+17=12
+18=9
+19=12
+20=10
+21=12
+22=12
+23=9
+24=10
+25=14
+26=12
+27=12
+28=12
+29=0
+30=14
+31=12
+32=12
+33=10
+34=10
+35=12
+36=10
+37=12
+38=12
+39=10
+40=12
+41=10
+42=12
+43=10
+44=12
+45=10
+46=10
+47=12
+48=12
+49=12
+50=12
+51=10
+52=10
+53=12
+54=10
+55=7
+56=12
+57=12
+58=10
+59=12
+60=10
+61=10
+62=12
+63=10
+64=12
+65=10
+66=10
+67=12
+68=10
+69=12
+70=12
+71=10
+72=12
+73=10
+74=12
+75=10
+76=12
+77=2
+78=2
+79=12
+80=12
+81=12
+82=12
+83=10
+84=10
+85=12
+86=10
+87=7
+88=12
+89=12
+90=10
+91=12
+92=10
+93=10
+94=12
+95=9
diff --git a/stepmania/Themes/default/Fonts/_sf square head 26px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 26px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..ba0c087ac8
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head 26px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 26px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 26px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..ef6fba7400
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head 26px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 26px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 26px [main-stroke] 15x15 (doubleres).png
index ee6fac24a4..3bff8747b8 100644
Binary files a/stepmania/Themes/default/Fonts/_sf square head 26px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf square head 26px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 26px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head 26px [main] 15x15 (doubleres).png
index db587253ad..8439af012f 100644
Binary files a/stepmania/Themes/default/Fonts/_sf square head 26px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf square head 26px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head 26px.ini b/stepmania/Themes/default/Fonts/_sf square head 26px.ini
index eca57efdcc..f8a696138e 100644
--- a/stepmania/Themes/default/Fonts/_sf square head 26px.ini	
+++ b/stepmania/Themes/default/Fonts/_sf square head 26px.ini	
@@ -88,7 +88,7 @@ Line 14=øùúûüýþÿ
 61=7
 62=20
 63=18
-64=2
+64=20
 65=20
 66=20
 67=20
@@ -118,130 +118,130 @@ Line 14=øùúûüýþÿ
 91=7
 92=4
 93=7
-94=5
-95=2
+94=20
+95=12
 96=4
-97=2
+97=9
 98=8
-99=2
-100=2
-101=2
-102=2
-103=2
-104=2
-105=2
-106=2
-107=2
+99=9
+100=11
+101=9
+102=9
+103=9
+104=14
+105=9
+106=23
+107=14
 108=4
 109=4
 110=8
 111=8
-112=2
-113=2
-114=2
-115=2
-116=2
-117=2
-118=2
-119=2
-120=2
-121=2
-122=2
+112=9
+113=14
+114=14
+115=9
+116=12
+117=14
+118=9
+119=23
+120=14
+121=14
+122=12
 123=4
 124=20
-125=4
-126=3
-127=5
-128=2
-129=3
-130=4
-131=3
-132=3
-133=4
-134=4
-135=4
-136=3
-137=4
-138=4
-139=4
-140=4
-141=4
-142=4
-143=4
-144=4
+125=0
+126=9
+127=20
+128=12
+129=9
+130=9
+131=20
+132=10
+133=9
+134=12
+135=14
+136=20
+137=18
+138=10
+139=14
+140=10
+141=10
+142=20
+143=20
+144=9
 145=4
-146=4
-147=4
-148=3
-149=4
-150=4
-151=4
-152=4
+146=20
+147=10
+148=10
+149=9
+150=26
+151=26
+152=25
 153=20
-154=4
-155=4
-156=4
-157=4
-158=4
-159=4
-160=6
-161=4
-162=4
-163=4
-164=4
-165=4
-166=3
-167=3
-168=3
-169=3
-170=5
-171=5
-172=4
-173=4
-174=4
-175=4
-176=4
-177=3
-178=4
-179=5
-180=5
-181=5
-182=5
-183=5
-184=4
-185=4
-186=3
-187=3
-188=3
-189=3
-190=3
-191=3
-192=4
-193=2
-194=2
-195=2
-196=2
-197=2
-198=1
-199=1
-200=1
-201=1
-202=3
-203=4
-204=3
-205=3
-206=3
-207=3
-208=3
-209=4
-210=3
-211=3
-212=3
-213=3
-214=3
-215=3
-216=4
-217=3
+154=20
+155=20
+156=20
+157=20
+158=20
+159=20
+160=35
+161=20
+162=20
+163=20
+164=20
+165=20
+166=20
+167=20
+168=20
+169=20
+170=22
+171=20
+172=20
+173=20
+174=20
+175=20
+176=20
+177=14
+178=20
+179=20
+180=20
+181=20
+182=20
+183=20
+184=20
+185=20
+186=20
+187=20
+188=20
+189=20
+190=20
+191=20
+192=35
+193=20
+194=20
+195=20
+196=20
+197=20
+198=4
+199=4
+200=4
+201=4
+202=20
+203=20
+204=20
+205=20
+206=20
+207=20
+208=20
+209=14
+210=20
+211=20
+212=20
+213=20
+214=20
+215=20
+216=20
+217=20
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -255,99 +255,99 @@ Line 7=ćçčéęëěíîď
 Line 8=đńňóôőö÷řů
 Line 9=úűüýţ˙
 
-0=2
-1=2
-2=2
-3=2
-4=3
-5=2
-6=2
-7=3
-8=4
-9=2
-10=2
-11=2
-12=2
-13=4
-14=2
-15=2
-16=4
-17=2
-18=2
-19=2
-20=4
-21=2
-22=2
-23=2
-24=4
-25=2
-26=2
-27=2
-28=2
-29=2
-30=2
-31=2
-32=2
-33=4
-34=4
-35=2
-36=4
-37=2
-38=2
-39=4
-40=2
-41=4
-42=2
-43=4
-44=2
-45=3
-46=3
-47=2
-48=2
-49=2
-50=2
-51=4
-52=4
-53=2
-54=4
-55=3
-56=2
-57=2
-58=5
-59=2
-60=5
-61=5
-62=2
-63=4
-64=2
-65=3
-66=3
-67=2
-68=3
-69=2
-70=2
-71=2
-72=2
-73=2
-74=2
-75=2
-76=2
-77=1
-78=1
-79=2
-80=2
-81=2
-82=2
-83=3
-84=3
-85=2
-86=3
-87=4
-88=2
-89=2
-90=3
-91=2
-92=3
-93=3
-94=2
-95=2
+0=12
+1=12
+2=9
+3=12
+4=9
+5=12
+6=12
+7=9
+8=9
+9=14
+10=12
+11=12
+12=12
+13=14
+14=14
+15=12
+16=10
+17=12
+18=9
+19=12
+20=20
+21=12
+22=12
+23=9
+24=20
+25=14
+26=12
+27=12
+28=12
+29=0
+30=14
+31=12
+32=12
+33=20
+34=20
+35=12
+36=20
+37=12
+38=12
+39=20
+40=12
+41=20
+42=12
+43=20
+44=12
+45=20
+46=20
+47=12
+48=12
+49=12
+50=12
+51=20
+52=20
+53=12
+54=20
+55=14
+56=12
+57=12
+58=20
+59=12
+60=20
+61=20
+62=12
+63=20
+64=12
+65=20
+66=20
+67=12
+68=20
+69=12
+70=12
+71=20
+72=12
+73=20
+74=12
+75=20
+76=12
+77=4
+78=4
+79=12
+80=12
+81=12
+82=12
+83=20
+84=20
+85=12
+86=20
+87=14
+88=12
+89=12
+90=20
+91=12
+92=20
+93=20
+94=12
+95=9
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [alt-stroke] 10x10 (doubleres).png
new file mode 100644
index 0000000000..93d31e488b
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [alt] 10x10 (doubleres).png
new file mode 100644
index 0000000000..4806695492
Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png
index 0fd42f0877..ae7e3fd76c 100644
Binary files a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png
index de38705f05..0cd13efd90 100644
Binary files a/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_sf square head Bold 26px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini b/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini
index 5a278ceae8..807eb39669 100644
--- a/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini	
+++ b/stepmania/Themes/default/Fonts/_sf square head Bold 26px.ini	
@@ -2,7 +2,7 @@
 Baseline=21
 Top=2
 LineSpacing=25
-DrawExtraPixelsLeft=1
+DrawExtraPixelsLeft=4
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 
@@ -87,7 +87,7 @@ Line 14=øùúûüýþÿ
 61=7
 62=20
 63=18
-64=7
+64=20
 65=20
 66=20
 67=20
@@ -117,130 +117,130 @@ Line 14=øùúûüýþÿ
 91=7
 92=4
 93=7
-94=15
-95=6
+94=20
+95=12
 96=4
-97=6
+97=9
 98=8
-99=6
-100=6
-101=6
-102=6
-103=6
-104=6
-105=6
-106=6
-107=6
+99=9
+100=11
+101=9
+102=9
+103=9
+104=14
+105=9
+106=23
+107=14
 108=4
 109=4
 110=8
 111=8
-112=6
-113=6
-114=6
-115=6
-116=6
-117=6
-118=6
-119=6
-120=6
-121=6
-122=6
+112=9
+113=14
+114=14
+115=9
+116=12
+117=14
+118=9
+119=23
+120=14
+121=14
+122=12
 123=4
 124=20
-125=12
+125=0
 126=9
-127=14
-128=5
+127=20
+128=12
 129=9
-130=12
-131=9
+130=20
+131=20
 132=10
-133=12
+133=9
 134=12
-135=12
-136=9
-137=12
-138=12
-139=12
-140=12
-141=12
-142=12
-143=12
-144=13
-145=12
-146=12
-147=12
-148=9
-149=12
-150=12
-151=12
-152=12
+135=14
+136=20
+137=18
+138=11
+139=14
+140=11
+141=11
+142=20
+143=20
+144=9
+145=4
+146=20
+147=10
+148=11
+149=9
+150=25
+151=26
+152=25
 153=20
-154=12
-155=12
-156=12
-157=12
-158=12
-159=12
-160=17
-161=12
-162=12
-163=12
-164=12
-165=12
-166=10
-167=10
-168=10
-169=10
-170=14
-171=15
-172=13
-173=13
-174=13
-175=13
-176=13
-177=10
-178=12
-179=15
-180=15
-181=15
-182=15
-183=14
-184=13
-185=13
-186=10
-187=10
-188=10
-189=10
-190=10
-191=10
-192=12
-193=7
-194=6
-195=6
-196=6
-197=6
+154=20
+155=20
+156=20
+157=20
+158=20
+159=20
+160=35
+161=20
+162=20
+163=20
+164=20
+165=20
+166=20
+167=20
+168=20
+169=20
+170=22
+171=20
+172=20
+173=20
+174=20
+175=20
+176=20
+177=15
+178=20
+179=20
+180=20
+181=20
+182=20
+183=20
+184=20
+185=20
+186=20
+187=20
+188=20
+189=20
+190=20
+191=20
+192=35
+193=20
+194=20
+195=20
+196=20
+197=20
 198=4
 199=4
 200=4
 201=4
-202=9
-203=11
-204=9
-205=9
-206=9
-207=9
-208=9
-209=12
-210=9
-211=9
-212=9
-213=9
-214=9
-215=9
-216=12
-217=9
+202=20
+203=20
+204=20
+205=20
+206=20
+207=20
+208=20
+209=14
+210=20
+211=20
+212=20
+213=20
+214=20
+215=20
+216=20
+217=20
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -254,99 +254,99 @@ Line 7=ćçčéęëěíîď
 Line 8=đńňóôőö÷řů
 Line 9=úűüýţ˙
 
-0=6
-1=6
-2=6
-3=6
+0=12
+1=12
+2=9
+3=12
 4=9
-5=6
-6=6
+5=12
+6=12
 7=9
-8=12
-9=6
-10=6
-11=6
-12=6
-13=12
-14=6
-15=6
-16=12
-17=6
-18=6
-19=6
-20=12
-21=6
-22=6
-23=6
-24=12
-25=6
-26=6
-27=6
-28=6
-29=6
-30=6
-31=6
-32=6
-33=12
-34=12
-35=6
-36=12
-37=6
-38=6
-39=12
-40=6
-41=12
-42=6
-43=12
-44=6
-45=10
-46=10
-47=6
-48=6
-49=6
-50=6
-51=13
-52=13
-53=6
-54=13
-55=10
-56=6
-57=6
-58=15
-59=6
-60=15
-61=14
-62=6
-63=13
-64=6
-65=10
-66=10
-67=6
-68=10
-69=6
-70=6
-71=7
-72=6
-73=6
-74=6
-75=6
-76=6
+8=20
+9=14
+10=12
+11=12
+12=12
+13=14
+14=14
+15=12
+16=11
+17=12
+18=9
+19=12
+20=20
+21=12
+22=12
+23=9
+24=20
+25=14
+26=12
+27=12
+28=12
+29=0
+30=14
+31=12
+32=12
+33=20
+34=20
+35=12
+36=20
+37=12
+38=12
+39=20
+40=12
+41=20
+42=12
+43=20
+44=12
+45=20
+46=20
+47=12
+48=12
+49=12
+50=12
+51=20
+52=20
+53=12
+54=20
+55=15
+56=12
+57=12
+58=20
+59=12
+60=20
+61=20
+62=12
+63=20
+64=12
+65=20
+66=20
+67=12
+68=20
+69=12
+70=12
+71=20
+72=12
+73=20
+74=12
+75=20
+76=12
 77=4
 78=4
-79=6
-80=6
-81=6
-82=6
-83=9
-84=9
-85=6
-86=9
-87=12
-88=6
-89=6
-90=9
-91=6
-92=9
-93=9
-94=6
-95=6
+79=12
+80=12
+81=12
+82=12
+83=20
+84=20
+85=12
+86=20
+87=14
+88=12
+89=12
+90=20
+91=12
+92=20
+93=20
+94=12
+95=9
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png
index 2c2b0a0c11..db827ce2eb 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 13px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png
index 18c9c01913..5d5a678974 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 13px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png
index 888cc3cdda..79ea4861fd 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 13px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png
index db29d98444..f855b1d888 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 13px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 13px.ini b/stepmania/Themes/default/Fonts/_terminator two 13px.ini
index 07707344ab..86a9cc7a37 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 13px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 13px.ini	
@@ -1,9 +1,9 @@
-[common]
-Baseline=13
-Top=2
+[common]
+Baseline=14
+Top=3
 LineSpacing=13
 DrawExtraPixelsLeft=1
-DrawExtraPixelsRight=1
+DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
 
@@ -86,9 +86,9 @@ Line 14=øùúûüýþÿ
 59=4
 60=6
 61=4
-62=7
-63=7
-64=7
+62=10
+63=9
+64=10
 65=12
 66=10
 67=8
@@ -118,20 +118,20 @@ Line 14=øùúûüýþÿ
 91=5
 92=3
 93=5
-94=7
-95=9
+94=8
+95=12
 96=9
 97=7
 98=7
 99=7
-100=7
+100=8
 101=7
 102=7
 103=7
-104=9
+104=10
 105=7
-106=8
-107=9
+106=17
+107=10
 108=3
 109=3
 110=5
@@ -140,61 +140,61 @@ Line 14=øùúûüýþÿ
 113=10
 114=10
 115=7
-116=7
-117=9
+116=9
+117=10
 118=7
-119=7
-120=9
-121=7
+119=17
+120=10
+121=10
 122=9
-123=7
-124=7
+123=3
+124=8
 125=7
 126=7
-127=7
+127=10
 128=9
 129=7
-130=7
-131=7
-132=7
+130=8
+131=9
+132=5
 133=7
 134=9
 135=9
-136=7
+136=9
 137=9
 138=9
-139=7
-140=9
-141=9
-142=7
+139=9
+140=4
+141=4
+142=8
 143=7
 144=7
 145=9
 146=7
-147=9
-148=7
+147=2
+148=5
 149=7
-150=9
-151=9
-152=9
-153=7
-154=12
-155=12
-156=12
-157=12
-158=12
-159=12
+150=7
+151=7
+152=8
+153=8
+154=10
+155=10
+156=10
+157=10
+158=10
+159=10
 160=18
 161=8
 162=8
 163=8
-164=7
+164=8
 165=8
 166=3
 167=3
 168=3
 169=3
-170=9
+170=11
 171=10
 172=10
 173=10
@@ -202,46 +202,46 @@ Line 14=øùúûüýþÿ
 175=10
 176=10
 177=9
-178=7
+178=10
 179=10
 180=10
 181=10
 182=10
-183=9
-184=9
-185=7
-186=7
-187=7
-188=7
-189=7
-190=7
-191=7
-192=7
-193=7
-194=7
-195=7
-196=7
-197=7
-198=7
-199=7
-200=7
-201=7
-202=9
-203=7
-204=7
-205=7
-206=7
-207=7
-208=7
+183=10
+184=10
+185=10
+186=12
+187=12
+188=12
+189=12
+190=12
+191=12
+192=18
+193=8
+194=8
+195=8
+196=8
+197=8
+198=3
+199=3
+200=3
+201=3
+202=10
+203=10
+204=10
+205=10
+206=10
+207=10
+208=10
 209=9
-210=7
-211=7
-212=7
-213=7
-214=7
-215=9
-216=9
-217=7
+210=10
+211=10
+212=10
+213=10
+214=10
+215=10
+216=10
+217=10
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -263,35 +263,35 @@ Line 9=úűüýţ˙
 5=9
 6=9
 7=7
-8=7
-9=9
+8=8
+9=10
 10=9
 11=9
 12=9
 13=9
-14=9
+14=10
 15=9
 16=9
 17=9
 18=7
 19=9
-20=7
+20=8
 21=9
 22=9
 23=7
 24=7
-25=9
+25=10
 26=9
 27=9
 28=9
-29=7
-30=9
+29=0
+30=10
 31=9
 32=9
-33=12
-34=12
+33=10
+34=10
 35=9
-36=12
+36=10
 37=9
 38=9
 39=8
@@ -316,38 +316,38 @@ Line 9=úűüýţ˙
 58=10
 59=9
 60=10
-61=9
+61=10
 62=9
-63=7
+63=10
 64=9
-65=7
-66=7
+65=12
+66=12
 67=9
-68=7
+68=12
 69=9
 70=9
-71=7
+71=8
 72=9
-73=7
+73=8
 74=9
-75=7
+75=8
 76=9
-77=7
-78=7
+77=3
+78=3
 79=9
 80=9
 81=9
 82=9
-83=7
-84=7
+83=10
+84=10
 85=9
-86=7
+86=10
 87=9
 88=9
 89=9
-90=7
+90=10
 91=9
-92=7
-93=9
+92=10
+93=10
 94=9
 95=7
diff --git a/stepmania/Themes/default/Fonts/_terminator two 18px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 18px [alt-stroke] 10x10 (doubleres).png
index 287c3496f1..c5843ecaa9 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 18px [alt-stroke] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 18px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 18px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 18px [alt] 10x10 (doubleres).png
index 392c8d1b10..5400c4c1df 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 18px [alt] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 18px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 18px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 18px [main-stroke] 15x15 (doubleres).png
index bc9b2e3a76..342a87a085 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 18px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 18px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 18px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 18px [main] 15x15 (doubleres).png
index c36869e324..e3d7627436 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 18px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 18px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 18px.ini b/stepmania/Themes/default/Fonts/_terminator two 18px.ini
index b9d50e80ba..66ed4a1159 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 18px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 18px.ini	
@@ -1,9 +1,9 @@
 [common]
-Baseline=17
-Top=2
+Baseline=18
+Top=3
 LineSpacing=18
-DrawExtraPixelsLeft=3
-DrawExtraPixelsRight=2
+DrawExtraPixelsLeft=2
+DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 DefaultStrokeColor=#FFFFFF00
 
@@ -86,9 +86,9 @@ Line 14=øùúûüýþÿ
 59=5
 60=8
 61=5
-62=9
-63=9
-64=9
+62=14
+63=13
+64=14
 65=16
 66=14
 67=12
@@ -118,20 +118,20 @@ Line 14=øùúûüýþÿ
 91=6
 92=4
 93=6
-94=9
-95=9
+94=11
+95=12
 96=12
 97=9
 98=9
 99=9
-100=9
+100=11
 101=9
 102=9
 103=9
-104=12
+104=14
 105=9
-106=12
-107=12
+106=23
+107=14
 108=4
 109=4
 110=7
@@ -140,61 +140,61 @@ Line 14=øùúûüýþÿ
 113=14
 114=14
 115=9
-116=9
-117=12
+116=12
+117=14
 118=9
-119=9
-120=12
-121=9
+119=23
+120=14
+121=14
 122=12
-123=9
-124=9
+123=4
+124=12
 125=9
 126=9
-127=9
+127=14
 128=12
 129=9
-130=9
-131=9
-132=9
+130=12
+131=12
+132=7
 133=9
 134=12
 135=12
-136=9
+136=12
 137=12
 138=12
-139=9
-140=12
-141=12
-142=9
+139=13
+140=5
+141=5
+142=12
 143=9
 144=9
 145=12
 146=9
-147=12
-148=9
+147=3
+148=6
 149=9
-150=12
-151=12
-152=12
-153=9
-154=16
-155=16
-156=16
-157=16
-158=16
-159=16
+150=9
+151=10
+152=11
+153=11
+154=14
+155=14
+156=14
+157=14
+158=14
+159=14
 160=25
 161=12
 162=12
 163=12
-164=9
+164=12
 165=12
 166=4
 167=4
 168=4
 169=4
-170=12
+170=15
 171=14
 172=14
 173=14
@@ -202,46 +202,46 @@ Line 14=øùúûüýþÿ
 175=14
 176=14
 177=12
-178=9
+178=14
 179=14
 180=14
 181=14
 182=14
-183=12
-184=12
-185=9
-186=9
-187=9
-188=9
-189=9
-190=9
-191=9
-192=9
-193=9
-194=9
-195=9
-196=9
-197=9
-198=9
-199=9
-200=9
-201=9
-202=12
-203=9
-204=9
-205=9
-206=9
-207=9
-208=9
-209=12
-210=9
-211=9
-212=9
-213=9
-214=9
-215=12
-216=12
-217=9
+183=14
+184=14
+185=14
+186=16
+187=16
+188=16
+189=16
+190=16
+191=16
+192=25
+193=12
+194=12
+195=12
+196=12
+197=12
+198=4
+199=4
+200=4
+201=4
+202=14
+203=14
+204=14
+205=14
+206=14
+207=14
+208=14
+209=13
+210=14
+211=14
+212=14
+213=14
+214=14
+215=14
+216=14
+217=14
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -263,35 +263,35 @@ Line 9=úűüýţ˙
 5=12
 6=12
 7=9
-8=9
-9=12
+8=12
+9=14
 10=12
 11=12
 12=12
 13=12
-14=12
+14=14
 15=12
 16=12
 17=12
 18=9
 19=12
-20=9
+20=12
 21=12
 22=12
 23=9
 24=9
-25=12
+25=14
 26=12
 27=12
 28=12
-29=6
-30=12
+29=0
+30=14
 31=12
 32=12
-33=16
-34=16
+33=14
+34=14
 35=12
-36=16
+36=14
 37=12
 38=12
 39=12
@@ -316,38 +316,38 @@ Line 9=úűüýţ˙
 58=14
 59=12
 60=14
-61=12
+61=14
 62=12
-63=9
+63=14
 64=12
-65=9
-66=9
+65=16
+66=16
 67=12
-68=9
+68=16
 69=12
 70=12
-71=9
+71=12
 72=12
-73=9
+73=12
 74=12
-75=9
+75=12
 76=12
-77=9
-78=9
+77=4
+78=4
 79=12
 80=12
 81=12
 82=12
-83=9
-84=9
+83=14
+84=14
 85=12
-86=9
-87=12
+86=14
+87=13
 88=12
 89=12
-90=9
+90=14
 91=12
-92=9
-93=12
+92=14
+93=14
 94=12
 95=9
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png
index e77e48bc0b..6b86b572f8 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 24px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png
index 9d3f532bef..4f4b863a57 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 24px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png
index a2afc1e544..a687fc66d1 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 24px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png
index d78ab33e9f..35ea75cc45 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 24px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 24px.ini b/stepmania/Themes/default/Fonts/_terminator two 24px.ini
index f2966c41da..ad55b5176e 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 24px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 24px.ini	
@@ -1,8 +1,8 @@
 [common]
-Baseline=22
-Top=2
+Baseline=23
+Top=3
 LineSpacing=24
-DrawExtraPixelsLeft=1
+DrawExtraPixelsLeft=2
 DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 
@@ -85,9 +85,9 @@ Line 14=øùúûüýþÿ
 59=7
 60=11
 61=7
-62=12
-63=12
-64=12
+62=19
+63=17
+64=18
 65=22
 66=18
 67=16
@@ -117,20 +117,20 @@ Line 14=øùúûüýþÿ
 91=8
 92=5
 93=8
-94=12
+94=14
 95=12
 96=16
 97=12
 98=12
 99=12
-100=12
+100=14
 101=12
 102=12
 103=12
-104=16
+104=19
 105=12
-106=16
-107=16
+106=31
+107=19
 108=5
 109=5
 110=10
@@ -139,61 +139,61 @@ Line 14=øùúûüýþÿ
 113=18
 114=19
 115=12
-116=12
-117=16
+116=16
+117=19
 118=12
-119=12
-120=16
-121=12
+119=31
+120=19
+121=19
 122=16
-123=12
-124=12
+123=5
+124=16
 125=12
 126=12
-127=12
+127=19
 128=16
 129=12
-130=12
-131=12
-132=12
+130=16
+131=17
+132=10
 133=12
 134=16
 135=16
-136=12
+136=17
 137=16
 138=16
-139=12
-140=16
-141=16
-142=12
+139=17
+140=7
+141=7
+142=16
 143=12
 144=12
 145=16
 146=12
-147=16
-148=12
+147=4
+148=9
 149=12
-150=16
-151=16
-152=16
-153=12
-154=22
-155=22
-156=22
-157=22
-158=22
-159=22
+150=12
+151=14
+152=15
+153=14
+154=19
+155=19
+156=19
+157=19
+158=19
+159=19
 160=33
 161=16
 162=16
 163=16
-164=12
+164=16
 165=16
 166=5
 167=5
 168=5
 169=5
-170=16
+170=20
 171=18
 172=19
 173=19
@@ -201,46 +201,46 @@ Line 14=øùúûüýþÿ
 175=19
 176=19
 177=16
-178=12
+178=19
 179=18
 180=18
 181=18
 182=18
-183=16
-184=16
-185=12
-186=12
-187=12
-188=12
-189=12
-190=12
-191=12
-192=12
-193=12
-194=12
-195=12
-196=12
-197=12
-198=12
-199=12
-200=12
-201=12
-202=16
-203=12
-204=12
-205=12
-206=12
-207=12
-208=12
-209=16
-210=12
-211=12
-212=12
-213=12
-214=12
-215=16
-216=16
-217=12
+183=19
+184=18
+185=18
+186=22
+187=22
+188=22
+189=22
+190=22
+191=22
+192=33
+193=16
+194=16
+195=16
+196=16
+197=16
+198=5
+199=5
+200=5
+201=5
+202=18
+203=18
+204=19
+205=19
+206=19
+207=19
+208=19
+209=17
+210=19
+211=18
+212=18
+213=18
+214=18
+215=19
+216=18
+217=19
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -262,35 +262,35 @@ Line 9=úűüýţ˙
 5=16
 6=16
 7=12
-8=12
-9=16
+8=16
+9=19
 10=16
 11=16
 12=16
 13=16
-14=16
+14=19
 15=16
 16=16
 17=16
 18=12
 19=16
-20=12
+20=16
 21=16
 22=16
 23=12
 24=12
-25=16
+25=19
 26=16
 27=16
 28=16
-29=9
-30=16
+29=0
+30=19
 31=16
 32=16
-33=22
-34=22
+33=19
+34=19
 35=16
-36=22
+36=19
 37=16
 38=16
 39=16
@@ -315,38 +315,38 @@ Line 9=úűüýţ˙
 58=18
 59=16
 60=18
-61=16
+61=19
 62=16
-63=12
+63=18
 64=16
-65=12
-66=12
+65=22
+66=22
 67=16
-68=12
+68=22
 69=16
 70=16
-71=12
+71=16
 72=16
-73=12
+73=16
 74=16
-75=12
+75=16
 76=16
-77=12
-78=12
+77=5
+78=5
 79=16
 80=16
 81=16
 82=16
-83=12
-84=12
+83=19
+84=19
 85=16
-86=12
-87=16
+86=19
+87=17
 88=16
 89=16
-90=12
+90=18
 91=16
-92=12
-93=16
+92=18
+93=19
 94=16
 95=12
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 30px [alt-stroke] 10x10 (doubleres).png
index d4750ef1c0..d12b15f83b 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 30px [alt-stroke] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 30px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 30px [alt] 10x10 (doubleres).png
index 80d197f866..0dfc038e2e 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 30px [alt] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 30px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 30px [main-stroke] 15x15 (doubleres).png
index d6d73a6a5c..74b4c0d14b 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 30px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 30px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 30px [main] 15x15 (doubleres).png
index c64b05f4ba..e8ddad4e21 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 30px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 30px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 30px.ini b/stepmania/Themes/default/Fonts/_terminator two 30px.ini
index 6c9e139850..3648221196 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 30px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 30px.ini	
@@ -1,6 +1,6 @@
-[common]
-Baseline=27
-Top=2
+[common]
+Baseline=28
+Top=3
 LineSpacing=29
 DrawExtraPixelsLeft=3
 DrawExtraPixelsRight=0
@@ -85,9 +85,9 @@ Line 14=øùúûüýþÿ
 59=9
 60=13
 61=9
-62=15
-63=15
-64=15
+62=24
+63=21
+64=23
 65=27
 66=22
 67=19
@@ -117,20 +117,20 @@ Line 14=øùúûüýþÿ
 91=10
 92=6
 93=10
-94=15
-95=22
+94=18
+95=12
 96=20
 97=15
 98=15
 99=15
-100=15
+100=18
 101=15
 102=15
 103=15
-104=20
+104=24
 105=15
-106=19
-107=20
+106=38
+107=24
 108=6
 109=6
 110=12
@@ -139,61 +139,61 @@ Line 14=øùúûüýþÿ
 113=22
 114=24
 115=15
-116=15
-117=20
+116=20
+117=24
 118=15
-119=15
-120=20
-121=15
+119=38
+120=24
+121=24
 122=20
-123=15
-124=15
+123=6
+124=19
 125=15
 126=15
-127=15
+127=24
 128=20
 129=15
-130=15
-131=15
-132=15
+130=19
+131=21
+132=12
 133=15
 134=20
 135=20
-136=15
+136=21
 137=20
 138=20
-139=15
-140=20
-141=20
-142=15
+139=21
+140=9
+141=9
+142=19
 143=15
 144=15
 145=20
 146=15
-147=20
-148=15
+147=5
+148=11
 149=15
-150=20
-151=20
-152=20
-153=15
-154=27
-155=27
-156=27
-157=27
-158=27
-159=27
+150=15
+151=17
+152=19
+153=18
+154=24
+155=24
+156=24
+157=24
+158=24
+159=24
 160=41
 161=19
 162=19
 163=19
-164=15
+164=19
 165=19
 166=6
 167=6
 168=6
 169=6
-170=20
+170=26
 171=23
 172=24
 173=24
@@ -201,46 +201,46 @@ Line 14=øùúûüýþÿ
 175=24
 176=24
 177=20
-178=15
-179=23
-180=23
-181=23
-182=23
-183=20
-184=20
-185=15
-186=15
-187=15
-188=15
-189=15
-190=15
-191=15
-192=15
-193=15
-194=15
-195=15
-196=15
-197=15
-198=15
-199=15
-200=15
-201=15
-202=20
-203=15
-204=15
-205=15
-206=15
-207=15
-208=15
-209=20
-210=15
-211=15
-212=15
-213=15
-214=15
-215=20
-216=20
-217=15
+178=24
+179=22
+180=22
+181=22
+182=22
+183=24
+184=22
+185=22
+186=27
+187=27
+188=27
+189=27
+190=27
+191=27
+192=41
+193=19
+194=19
+195=19
+196=19
+197=19
+198=6
+199=6
+200=6
+201=6
+202=22
+203=23
+204=24
+205=24
+206=24
+207=24
+208=24
+209=21
+210=24
+211=23
+212=23
+213=23
+214=23
+215=24
+216=22
+217=24
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -262,35 +262,35 @@ Line 9=úűüýţ˙
 5=20
 6=20
 7=15
-8=15
-9=20
+8=19
+9=24
 10=20
 11=20
 12=20
 13=20
-14=20
+14=24
 15=20
 16=20
 17=20
 18=15
 19=20
-20=15
+20=19
 21=20
 22=20
 23=15
 24=15
-25=20
+25=24
 26=20
 27=20
 28=20
-29=11
-30=20
+29=0
+30=24
 31=20
 32=20
-33=27
-34=27
+33=24
+34=24
 35=20
-36=27
+36=24
 37=20
 38=20
 39=19
@@ -312,41 +312,41 @@ Line 9=úűüýţ˙
 55=20
 56=20
 57=20
-58=23
+58=22
 59=20
-60=23
-61=20
+60=22
+61=24
 62=20
-63=15
+63=22
 64=20
-65=15
-66=15
+65=27
+66=27
 67=20
-68=15
+68=27
 69=20
 70=20
-71=15
+71=19
 72=20
-73=15
+73=19
 74=20
-75=15
+75=19
 76=20
-77=15
-78=15
+77=6
+78=6
 79=20
 80=20
 81=20
 82=20
-83=15
-84=15
+83=24
+84=24
 85=20
-86=15
-87=20
+86=24
+87=21
 88=20
 89=20
-90=15
+90=23
 91=20
-92=15
-93=20
+92=23
+93=24
 94=20
 95=15
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png
index 718f60e8fc..14cdb34836 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 40px [alt-stroke] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png
index 1491bdec51..33c786da30 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 40px [alt] 10x10 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png
index 3fc2bc27c9..f2b6a1bcbd 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 40px [main-stroke] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png
index 5c3d5c34cf..b681d9346a 100644
Binary files a/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two 40px [main] 15x15 (doubleres).png differ
diff --git a/stepmania/Themes/default/Fonts/_terminator two 40px.ini b/stepmania/Themes/default/Fonts/_terminator two 40px.ini
index 6946f2a650..9a62bdc971 100644
--- a/stepmania/Themes/default/Fonts/_terminator two 40px.ini	
+++ b/stepmania/Themes/default/Fonts/_terminator two 40px.ini	
@@ -1,9 +1,9 @@
 [common]
-Baseline=36
-Top=2
+Baseline=37
+Top=3
 LineSpacing=40
-DrawExtraPixelsLeft=7
-DrawExtraPixelsRight=6
+DrawExtraPixelsLeft=4
+DrawExtraPixelsRight=0
 AdvanceExtraPixels=0
 
 [main]
@@ -85,9 +85,9 @@ Line 14=øùúûüýþÿ
 59=12
 60=18
 61=12
-62=20
-63=20
-64=20
+62=32
+63=28
+64=30
 65=37
 66=30
 67=26
@@ -117,20 +117,20 @@ Line 14=øùúûüýþÿ
 91=14
 92=8
 93=14
-94=20
-95=11
+94=24
+95=12
 96=27
 97=20
 98=20
 99=20
-100=20
+100=24
 101=20
 102=20
 103=20
-104=27
+104=32
 105=20
-106=26
-107=27
+106=51
+107=32
 108=8
 109=8
 110=16
@@ -139,61 +139,61 @@ Line 14=øùúûüýþÿ
 113=30
 114=32
 115=20
-116=20
-117=27
+116=26
+117=32
 118=20
-119=20
-120=27
-121=20
+119=51
+120=32
+121=32
 122=27
-123=20
-124=20
+123=8
+124=26
 125=20
 126=20
-127=20
+127=32
 128=27
 129=20
-130=20
-131=20
-132=20
+130=26
+131=28
+132=16
 133=20
 134=27
 135=27
-136=20
+136=28
 137=27
 138=27
-139=20
-140=27
-141=27
-142=20
+139=28
+140=12
+141=12
+142=26
 143=20
 144=20
 145=27
 146=20
-147=27
-148=20
+147=7
+148=14
 149=20
-150=27
-151=27
-152=27
-153=20
-154=37
-155=37
-156=37
-157=37
-158=37
-159=37
+150=21
+151=23
+152=25
+153=24
+154=32
+155=32
+156=32
+157=32
+158=32
+159=32
 160=55
 161=26
 162=26
 163=26
-164=20
+164=26
 165=26
 166=8
 167=8
 168=8
 169=8
-170=27
+170=34
 171=30
 172=32
 173=32
@@ -201,46 +201,46 @@ Line 14=øùúûüýþÿ
 175=32
 176=32
 177=27
-178=20
+178=32
 179=30
 180=30
 181=30
 182=30
-183=27
-184=27
-185=20
-186=20
-187=20
-188=20
-189=20
-190=20
-191=20
-192=20
-193=20
-194=20
-195=20
-196=20
-197=20
-198=20
-199=20
-200=20
-201=20
-202=27
-203=20
-204=20
-205=20
-206=20
-207=20
-208=20
-209=27
-210=20
-211=20
-212=20
-213=20
-214=20
-215=27
-216=27
-217=20
+183=32
+184=30
+185=30
+186=37
+187=37
+188=37
+189=37
+190=37
+191=37
+192=55
+193=26
+194=26
+195=26
+196=26
+197=26
+198=8
+199=8
+200=8
+201=8
+202=30
+203=30
+204=32
+205=32
+206=32
+207=32
+208=32
+209=28
+210=32
+211=30
+212=30
+213=30
+214=30
+215=32
+216=30
+217=32
 
 [alt]
 Line 0= Ą˘Ł¤ĽŚ§¨Š
@@ -262,35 +262,35 @@ Line 9=úűüýţ˙
 5=27
 6=27
 7=20
-8=20
-9=27
+8=26
+9=32
 10=27
 11=27
 12=27
 13=27
-14=27
+14=32
 15=27
 16=27
 17=27
 18=20
 19=27
-20=20
+20=26
 21=27
 22=27
 23=20
 24=20
-25=27
+25=32
 26=27
 27=27
 28=27
-29=9
-30=27
+29=0
+30=32
 31=27
 32=27
-33=37
-34=37
+33=32
+34=32
 35=27
-36=37
+36=32
 37=27
 38=27
 39=26
@@ -315,38 +315,38 @@ Line 9=úűüýţ˙
 58=30
 59=27
 60=30
-61=27
+61=32
 62=27
-63=20
+63=30
 64=27
-65=20
-66=20
+65=37
+66=37
 67=27
-68=20
+68=37
 69=27
 70=27
-71=20
+71=26
 72=27
-73=20
+73=26
 74=27
-75=20
+75=26
 76=27
-77=20
-78=20
+77=8
+78=8
 79=27
 80=27
 81=27
 82=27
-83=20
-84=20
+83=32
+84=32
 85=27
-86=20
-87=27
+86=32
+87=28
 88=27
 89=27
-90=20
+90=30
 91=27
-92=20
-93=27
+92=30
+93=32
 94=27
 95=20