diff --git a/buildcfg.txt b/buildcfg.txt
index f2de0abf..f45f7963 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -805,8 +805,8 @@ M_THERML	-2	0
 M_ENDGAM	0	1
 M_PAUSE	0	0
 M_MESSG	0	1
-M_MSGON	0	-3
-M_MSGOFF	0	-3
+M_MSGON	5	1
+M_MSGOFF	5	1
 M_HURT	0	0
 M_JKILL	0	0
 M_ROUGH	0	0
@@ -820,8 +820,8 @@ M_SAVEG	0	0
 M_LOADG	0	0
 M_DISP	0	0
 M_MSENS	0	1
-M_GDHIGH	-20	-3
-M_GDLOW	-20	-3
+M_GDHIGH	0	1
+M_GDLOW	0	1
 M_DETAIL	0	1
 M_DISOPT	0	0
 M_SCRNSZ	0	1
diff --git a/graphics/text/config.py b/graphics/text/config.py
index 923a684a..4534ccd0 100644
--- a/graphics/text/config.py
+++ b/graphics/text/config.py
@@ -41,33 +41,35 @@ import re
 # and if the font is changed this probably needs to be redone.
 
 FONT_KERNING_RULES = {
-	# Right character fits under left character:
-	r'p[aj\.]': -3,
-	r'P[a\.]': -4,
-	r'[PVW][AJj\.]': -4,
-	r't[ajJ\.]': -4,
-	r'f[aj\.]': -2,
+# TODO: Devise some new rules for the new font.
 
-	# Some capital letters have overhangs that the 'lower case'
-	# characters can fit under:
-	r'C[Ja-z\.]': -2,
-	r'F[Ja-z\.]': -3,
-	r'T[Ja-z\.]': -5,
-	r'W[Ja-z\.]': -2,
-	r'S[Ja-z\.]': -1,
-	r'V[a-z\.]': -3,
-
-	# Left character fits under right character:
-	r'[alAL][ty479]': -3,
-	r'a[vwVW]': -2,
-	r'A[VW]': -3,
-	r'A[vw]': -2,
-	r'r[ty479]': -2,
-	r'[vwVW][Aa]': -2,
-	r'[Yypv][jJ]': -2,
-
-	# Extra space needed:
-	r'[OUu][Pp]': +1,
+#	# Right character fits under left character:
+#	r'p[aj\.]': -3,
+#	r'P[a\.]': -4,
+#	r'[PVW][AJj\.]': -4,
+#	r't[ajJ\.]': -4,
+#	r'f[aj\.]': -2,
+#	
+#	# Some capital letters have overhangs that the 'lower case'
+#	# characters can fit under:
+#	r'C[Ja-z\.]': -2,
+#	r'F[Ja-z\.]': -3,
+#	r'T[Ja-z\.]': -5,
+#	r'W[Ja-z\.]': -2,
+#	r'S[Ja-z\.]': -1,
+#	r'V[a-z\.]': -3,
+#	
+#	# Left character fits under right character:
+#	r'[alAL][ty479]': -3,
+#	r'a[vwVW]': -2,
+#	r'A[VW]': -3,
+#	r'A[vw]': -2,
+#	r'r[ty479]': -2,
+#	r'[vwVW][Aa]': -2,
+#	r'[Yypv][jJ]': -2,
+#	
+#	# Extra space needed:
+#	r'[OUu][Pp]': +1,
 }
 
 white_graphics = {
diff --git a/graphics/text/font/README b/graphics/text/font/README
new file mode 100644
index 00000000..ffed3078
--- /dev/null
+++ b/graphics/text/font/README
@@ -0,0 +1,6 @@
+This font is by Brett Harrell (Mechadon) and is named "Denex". It is
+based on an earlier font named Deneb. Some information can be found
+in this thread:
+
+http://www.doomworld.com/vb/freedoom/69080-new-font-candidate/
+
diff --git a/graphics/text/font/denex_bigfont_imagetool.pcx b/graphics/text/font/denex_bigfont_imagetool.pcx
new file mode 100644
index 00000000..485b7d47
Binary files /dev/null and b/graphics/text/font/denex_bigfont_imagetool.pcx differ
diff --git a/graphics/text/font/font_RAW_12.png b/graphics/text/font/font_RAW_12.png
deleted file mode 100644
index fe3f215e..00000000
Binary files a/graphics/text/font/font_RAW_12.png and /dev/null differ
diff --git a/graphics/text/font/font_RAW_15.png b/graphics/text/font/font_RAW_15.png
deleted file mode 100644
index ecacc0c4..00000000
Binary files a/graphics/text/font/font_RAW_15.png and /dev/null differ
diff --git a/graphics/text/font/font_RAW_30.png b/graphics/text/font/font_RAW_30.png
deleted file mode 100644
index e7e584f9..00000000
Binary files a/graphics/text/font/font_RAW_30.png and /dev/null differ
diff --git a/graphics/text/font/font_blue_12.png b/graphics/text/font/font_blue_12.png
deleted file mode 100644
index 5e2fe775..00000000
Binary files a/graphics/text/font/font_blue_12.png and /dev/null differ
diff --git a/graphics/text/font/font_blue_15.png b/graphics/text/font/font_blue_15.png
deleted file mode 100644
index ae24bdb5..00000000
Binary files a/graphics/text/font/font_blue_15.png and /dev/null differ
diff --git a/graphics/text/font/font_brown_12.png b/graphics/text/font/font_brown_12.png
deleted file mode 100644
index 4d6af6f1..00000000
Binary files a/graphics/text/font/font_brown_12.png and /dev/null differ
diff --git a/graphics/text/font/font_brown_15.png b/graphics/text/font/font_brown_15.png
deleted file mode 100644
index 86bbba3f..00000000
Binary files a/graphics/text/font/font_brown_15.png and /dev/null differ
diff --git a/graphics/text/font/font_fire_12.png b/graphics/text/font/font_fire_12.png
deleted file mode 100644
index 770c0684..00000000
Binary files a/graphics/text/font/font_fire_12.png and /dev/null differ
diff --git a/graphics/text/font/font_fire_15.png b/graphics/text/font/font_fire_15.png
deleted file mode 100644
index e422b809..00000000
Binary files a/graphics/text/font/font_fire_15.png and /dev/null differ
diff --git a/graphics/text/font/font_gold_12.png b/graphics/text/font/font_gold_12.png
deleted file mode 100644
index 2d36326c..00000000
Binary files a/graphics/text/font/font_gold_12.png and /dev/null differ
diff --git a/graphics/text/font/font_gold_15.png b/graphics/text/font/font_gold_15.png
deleted file mode 100644
index 2a8a4923..00000000
Binary files a/graphics/text/font/font_gold_15.png and /dev/null differ
diff --git a/graphics/text/font/font_green_12.png b/graphics/text/font/font_green_12.png
deleted file mode 100644
index 3a4b1530..00000000
Binary files a/graphics/text/font/font_green_12.png and /dev/null differ
diff --git a/graphics/text/font/font_green_15.png b/graphics/text/font/font_green_15.png
deleted file mode 100644
index 129049e8..00000000
Binary files a/graphics/text/font/font_green_15.png and /dev/null differ
diff --git a/graphics/text/font/font_opal_12.png b/graphics/text/font/font_opal_12.png
deleted file mode 100644
index c07302a3..00000000
Binary files a/graphics/text/font/font_opal_12.png and /dev/null differ
diff --git a/graphics/text/font/font_opal_15.png b/graphics/text/font/font_opal_15.png
deleted file mode 100644
index e909f69e..00000000
Binary files a/graphics/text/font/font_opal_15.png and /dev/null differ
diff --git a/graphics/text/font/font_readme.txt b/graphics/text/font/font_readme.txt
deleted file mode 100644
index 88ec2379..00000000
--- a/graphics/text/font/font_readme.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-========================================================================
-
-Contributed by Andrew Apted <ajapted@users.sourceforge.net>
-
-FreeDOOM font images (for art directory).
-
-Font was drawn from scratch, scanned, edited, shaded, scaled to 12 
-and 15 pixels high, then colored (except for the "RAW" versions).
-
-The original 30 pixel high (RAW) version is included.
-
-Note that the `Q' character is an exception, and extends a few pixels
-below the normal height.  There's also a few missing characters,
-mainly the exclamation mark `!', comma, and apostrophe, which I fudged
-up when they were needed.
-
-========================================================================
diff --git a/graphics/text/font/font_red_12.png b/graphics/text/font/font_red_12.png
deleted file mode 100644
index b1affd92..00000000
Binary files a/graphics/text/font/font_red_12.png and /dev/null differ
diff --git a/graphics/text/font/font_red_15.png b/graphics/text/font/font_red_15.png
deleted file mode 100644
index 28502dc3..00000000
Binary files a/graphics/text/font/font_red_15.png and /dev/null differ
diff --git a/graphics/text/font/font_ruby_12.png b/graphics/text/font/font_ruby_12.png
deleted file mode 100644
index a718f41d..00000000
Binary files a/graphics/text/font/font_ruby_12.png and /dev/null differ
diff --git a/graphics/text/font/font_ruby_15.png b/graphics/text/font/font_ruby_15.png
deleted file mode 100644
index bdf49213..00000000
Binary files a/graphics/text/font/font_ruby_15.png and /dev/null differ
diff --git a/graphics/text/font/font_topaz_12.png b/graphics/text/font/font_topaz_12.png
deleted file mode 100644
index dce497cd..00000000
Binary files a/graphics/text/font/font_topaz_12.png and /dev/null differ
diff --git a/graphics/text/font/font_topaz_15.png b/graphics/text/font/font_topaz_15.png
deleted file mode 100644
index 983d036d..00000000
Binary files a/graphics/text/font/font_topaz_15.png and /dev/null differ
diff --git a/graphics/text/font/font_white_12.png b/graphics/text/font/font_white_12.png
deleted file mode 100644
index 0d708776..00000000
Binary files a/graphics/text/font/font_white_12.png and /dev/null differ
diff --git a/graphics/text/fontchars/font033.gif b/graphics/text/fontchars/font033.gif
index 1021655d..ffb7761a 100644
Binary files a/graphics/text/fontchars/font033.gif and b/graphics/text/fontchars/font033.gif differ
diff --git a/graphics/text/fontchars/font034.gif b/graphics/text/fontchars/font034.gif
new file mode 100644
index 00000000..fbe900b9
Binary files /dev/null and b/graphics/text/fontchars/font034.gif differ
diff --git a/graphics/text/fontchars/font035.gif b/graphics/text/fontchars/font035.gif
new file mode 100644
index 00000000..8f87aa8b
Binary files /dev/null and b/graphics/text/fontchars/font035.gif differ
diff --git a/graphics/text/fontchars/font036.gif b/graphics/text/fontchars/font036.gif
new file mode 100644
index 00000000..cfd559ab
Binary files /dev/null and b/graphics/text/fontchars/font036.gif differ
diff --git a/graphics/text/fontchars/font037.gif b/graphics/text/fontchars/font037.gif
index 13476931..d7167aff 100644
Binary files a/graphics/text/fontchars/font037.gif and b/graphics/text/fontchars/font037.gif differ
diff --git a/graphics/text/fontchars/font038.gif b/graphics/text/fontchars/font038.gif
new file mode 100644
index 00000000..2002436c
Binary files /dev/null and b/graphics/text/fontchars/font038.gif differ
diff --git a/graphics/text/fontchars/font039.gif b/graphics/text/fontchars/font039.gif
new file mode 100644
index 00000000..1baa21cc
Binary files /dev/null and b/graphics/text/fontchars/font039.gif differ
diff --git a/graphics/text/fontchars/font040.gif b/graphics/text/fontchars/font040.gif
new file mode 100644
index 00000000..635a800f
Binary files /dev/null and b/graphics/text/fontchars/font040.gif differ
diff --git a/graphics/text/fontchars/font041.gif b/graphics/text/fontchars/font041.gif
new file mode 100644
index 00000000..fec47243
Binary files /dev/null and b/graphics/text/fontchars/font041.gif differ
diff --git a/graphics/text/fontchars/font042.gif b/graphics/text/fontchars/font042.gif
new file mode 100644
index 00000000..24699406
Binary files /dev/null and b/graphics/text/fontchars/font042.gif differ
diff --git a/graphics/text/fontchars/font043.gif b/graphics/text/fontchars/font043.gif
new file mode 100644
index 00000000..35def588
Binary files /dev/null and b/graphics/text/fontchars/font043.gif differ
diff --git a/graphics/text/fontchars/font044.gif b/graphics/text/fontchars/font044.gif
new file mode 100644
index 00000000..81c891a7
Binary files /dev/null and b/graphics/text/fontchars/font044.gif differ
diff --git a/graphics/text/fontchars/font045.gif b/graphics/text/fontchars/font045.gif
index cf82d7bb..d98454eb 100644
Binary files a/graphics/text/fontchars/font045.gif and b/graphics/text/fontchars/font045.gif differ
diff --git a/graphics/text/fontchars/font046.gif b/graphics/text/fontchars/font046.gif
index f22fd716..84a721f4 100644
Binary files a/graphics/text/fontchars/font046.gif and b/graphics/text/fontchars/font046.gif differ
diff --git a/graphics/text/fontchars/font047.gif b/graphics/text/fontchars/font047.gif
index ad76f4fa..ccc7c806 100644
Binary files a/graphics/text/fontchars/font047.gif and b/graphics/text/fontchars/font047.gif differ
diff --git a/graphics/text/fontchars/font048.gif b/graphics/text/fontchars/font048.gif
index 46c2056c..4c2f0a53 100644
Binary files a/graphics/text/fontchars/font048.gif and b/graphics/text/fontchars/font048.gif differ
diff --git a/graphics/text/fontchars/font049.gif b/graphics/text/fontchars/font049.gif
index 7b60c3e3..d04f1033 100644
Binary files a/graphics/text/fontchars/font049.gif and b/graphics/text/fontchars/font049.gif differ
diff --git a/graphics/text/fontchars/font050.gif b/graphics/text/fontchars/font050.gif
index 33e32dfa..f59fffa8 100644
Binary files a/graphics/text/fontchars/font050.gif and b/graphics/text/fontchars/font050.gif differ
diff --git a/graphics/text/fontchars/font051.gif b/graphics/text/fontchars/font051.gif
index 9a2d9bbf..2397e77c 100644
Binary files a/graphics/text/fontchars/font051.gif and b/graphics/text/fontchars/font051.gif differ
diff --git a/graphics/text/fontchars/font052.gif b/graphics/text/fontchars/font052.gif
index 25b1932a..d0f8d92b 100644
Binary files a/graphics/text/fontchars/font052.gif and b/graphics/text/fontchars/font052.gif differ
diff --git a/graphics/text/fontchars/font053.gif b/graphics/text/fontchars/font053.gif
index 026940c2..b776ffd5 100644
Binary files a/graphics/text/fontchars/font053.gif and b/graphics/text/fontchars/font053.gif differ
diff --git a/graphics/text/fontchars/font054.gif b/graphics/text/fontchars/font054.gif
index 51010f08..a20fed0c 100644
Binary files a/graphics/text/fontchars/font054.gif and b/graphics/text/fontchars/font054.gif differ
diff --git a/graphics/text/fontchars/font055.gif b/graphics/text/fontchars/font055.gif
index bedeb1a1..1ecd7694 100644
Binary files a/graphics/text/fontchars/font055.gif and b/graphics/text/fontchars/font055.gif differ
diff --git a/graphics/text/fontchars/font056.gif b/graphics/text/fontchars/font056.gif
index 143d422d..56068db1 100644
Binary files a/graphics/text/fontchars/font056.gif and b/graphics/text/fontchars/font056.gif differ
diff --git a/graphics/text/fontchars/font057.gif b/graphics/text/fontchars/font057.gif
index a3b32d72..c927497d 100644
Binary files a/graphics/text/fontchars/font057.gif and b/graphics/text/fontchars/font057.gif differ
diff --git a/graphics/text/fontchars/font058.gif b/graphics/text/fontchars/font058.gif
index 1bb25879..a26acf5d 100644
Binary files a/graphics/text/fontchars/font058.gif and b/graphics/text/fontchars/font058.gif differ
diff --git a/graphics/text/fontchars/font059.gif b/graphics/text/fontchars/font059.gif
new file mode 100644
index 00000000..de1b4d23
Binary files /dev/null and b/graphics/text/fontchars/font059.gif differ
diff --git a/graphics/text/fontchars/font060.gif b/graphics/text/fontchars/font060.gif
new file mode 100644
index 00000000..eee045a0
Binary files /dev/null and b/graphics/text/fontchars/font060.gif differ
diff --git a/graphics/text/fontchars/font061.gif b/graphics/text/fontchars/font061.gif
new file mode 100644
index 00000000..fcf6172e
Binary files /dev/null and b/graphics/text/fontchars/font061.gif differ
diff --git a/graphics/text/fontchars/font062.gif b/graphics/text/fontchars/font062.gif
new file mode 100644
index 00000000..592f15be
Binary files /dev/null and b/graphics/text/fontchars/font062.gif differ
diff --git a/graphics/text/fontchars/font063.gif b/graphics/text/fontchars/font063.gif
index 5d57411a..731e0d84 100644
Binary files a/graphics/text/fontchars/font063.gif and b/graphics/text/fontchars/font063.gif differ
diff --git a/graphics/text/fontchars/font064.gif b/graphics/text/fontchars/font064.gif
new file mode 100644
index 00000000..9036f1d1
Binary files /dev/null and b/graphics/text/fontchars/font064.gif differ
diff --git a/graphics/text/fontchars/font065.gif b/graphics/text/fontchars/font065.gif
index 728fd2eb..9a205d51 100644
Binary files a/graphics/text/fontchars/font065.gif and b/graphics/text/fontchars/font065.gif differ
diff --git a/graphics/text/fontchars/font066.gif b/graphics/text/fontchars/font066.gif
index 79159e06..55de7f9e 100644
Binary files a/graphics/text/fontchars/font066.gif and b/graphics/text/fontchars/font066.gif differ
diff --git a/graphics/text/fontchars/font067.gif b/graphics/text/fontchars/font067.gif
index c3338e39..80df9cb7 100644
Binary files a/graphics/text/fontchars/font067.gif and b/graphics/text/fontchars/font067.gif differ
diff --git a/graphics/text/fontchars/font068.gif b/graphics/text/fontchars/font068.gif
index 5196868e..d6ce4a84 100644
Binary files a/graphics/text/fontchars/font068.gif and b/graphics/text/fontchars/font068.gif differ
diff --git a/graphics/text/fontchars/font069.gif b/graphics/text/fontchars/font069.gif
index db971b41..4b1bf11a 100644
Binary files a/graphics/text/fontchars/font069.gif and b/graphics/text/fontchars/font069.gif differ
diff --git a/graphics/text/fontchars/font070.gif b/graphics/text/fontchars/font070.gif
index 1806e969..bdc37379 100644
Binary files a/graphics/text/fontchars/font070.gif and b/graphics/text/fontchars/font070.gif differ
diff --git a/graphics/text/fontchars/font071.gif b/graphics/text/fontchars/font071.gif
index 9443ff76..c68016d8 100644
Binary files a/graphics/text/fontchars/font071.gif and b/graphics/text/fontchars/font071.gif differ
diff --git a/graphics/text/fontchars/font072.gif b/graphics/text/fontchars/font072.gif
index 4c30404a..0775e5a8 100644
Binary files a/graphics/text/fontchars/font072.gif and b/graphics/text/fontchars/font072.gif differ
diff --git a/graphics/text/fontchars/font073.gif b/graphics/text/fontchars/font073.gif
index 459b19ee..34a519c9 100644
Binary files a/graphics/text/fontchars/font073.gif and b/graphics/text/fontchars/font073.gif differ
diff --git a/graphics/text/fontchars/font074.gif b/graphics/text/fontchars/font074.gif
index 93633c0b..e9be2a85 100644
Binary files a/graphics/text/fontchars/font074.gif and b/graphics/text/fontchars/font074.gif differ
diff --git a/graphics/text/fontchars/font075.gif b/graphics/text/fontchars/font075.gif
index 0a092c1b..eb1cea36 100644
Binary files a/graphics/text/fontchars/font075.gif and b/graphics/text/fontchars/font075.gif differ
diff --git a/graphics/text/fontchars/font076.gif b/graphics/text/fontchars/font076.gif
index 96581660..bfd0d581 100644
Binary files a/graphics/text/fontchars/font076.gif and b/graphics/text/fontchars/font076.gif differ
diff --git a/graphics/text/fontchars/font077.gif b/graphics/text/fontchars/font077.gif
index 50fa6751..50c3b98a 100644
Binary files a/graphics/text/fontchars/font077.gif and b/graphics/text/fontchars/font077.gif differ
diff --git a/graphics/text/fontchars/font078.gif b/graphics/text/fontchars/font078.gif
index e02f648b..1dc63e38 100644
Binary files a/graphics/text/fontchars/font078.gif and b/graphics/text/fontchars/font078.gif differ
diff --git a/graphics/text/fontchars/font079.gif b/graphics/text/fontchars/font079.gif
index bf7c01b1..45491097 100644
Binary files a/graphics/text/fontchars/font079.gif and b/graphics/text/fontchars/font079.gif differ
diff --git a/graphics/text/fontchars/font080.gif b/graphics/text/fontchars/font080.gif
index ed40a6ad..aabd75e1 100644
Binary files a/graphics/text/fontchars/font080.gif and b/graphics/text/fontchars/font080.gif differ
diff --git a/graphics/text/fontchars/font081.gif b/graphics/text/fontchars/font081.gif
index 31a7b754..1e8a4a69 100644
Binary files a/graphics/text/fontchars/font081.gif and b/graphics/text/fontchars/font081.gif differ
diff --git a/graphics/text/fontchars/font082.gif b/graphics/text/fontchars/font082.gif
index 6e3e4b22..04a85dc3 100644
Binary files a/graphics/text/fontchars/font082.gif and b/graphics/text/fontchars/font082.gif differ
diff --git a/graphics/text/fontchars/font083.gif b/graphics/text/fontchars/font083.gif
index 69631e75..e2d74b8d 100644
Binary files a/graphics/text/fontchars/font083.gif and b/graphics/text/fontchars/font083.gif differ
diff --git a/graphics/text/fontchars/font084.gif b/graphics/text/fontchars/font084.gif
index 3aeb91a7..36390066 100644
Binary files a/graphics/text/fontchars/font084.gif and b/graphics/text/fontchars/font084.gif differ
diff --git a/graphics/text/fontchars/font085.gif b/graphics/text/fontchars/font085.gif
index 1654c85d..5781bb5d 100644
Binary files a/graphics/text/fontchars/font085.gif and b/graphics/text/fontchars/font085.gif differ
diff --git a/graphics/text/fontchars/font086.gif b/graphics/text/fontchars/font086.gif
index 00ad7e73..6b439ce3 100644
Binary files a/graphics/text/fontchars/font086.gif and b/graphics/text/fontchars/font086.gif differ
diff --git a/graphics/text/fontchars/font087.gif b/graphics/text/fontchars/font087.gif
index 942954ef..256b55a1 100644
Binary files a/graphics/text/fontchars/font087.gif and b/graphics/text/fontchars/font087.gif differ
diff --git a/graphics/text/fontchars/font088.gif b/graphics/text/fontchars/font088.gif
index 9be1954a..87cb2454 100644
Binary files a/graphics/text/fontchars/font088.gif and b/graphics/text/fontchars/font088.gif differ
diff --git a/graphics/text/fontchars/font089.gif b/graphics/text/fontchars/font089.gif
index 3b04c6b6..d0c19b52 100644
Binary files a/graphics/text/fontchars/font089.gif and b/graphics/text/fontchars/font089.gif differ
diff --git a/graphics/text/fontchars/font090.gif b/graphics/text/fontchars/font090.gif
index 42f10e9f..9e04565c 100644
Binary files a/graphics/text/fontchars/font090.gif and b/graphics/text/fontchars/font090.gif differ
diff --git a/graphics/text/fontchars/font091.gif b/graphics/text/fontchars/font091.gif
new file mode 100644
index 00000000..79d542e8
Binary files /dev/null and b/graphics/text/fontchars/font091.gif differ
diff --git a/graphics/text/fontchars/font092.gif b/graphics/text/fontchars/font092.gif
new file mode 100644
index 00000000..d430a326
Binary files /dev/null and b/graphics/text/fontchars/font092.gif differ
diff --git a/graphics/text/fontchars/font093.gif b/graphics/text/fontchars/font093.gif
new file mode 100644
index 00000000..02afc6bd
Binary files /dev/null and b/graphics/text/fontchars/font093.gif differ
diff --git a/graphics/text/fontchars/font094.gif b/graphics/text/fontchars/font094.gif
new file mode 100644
index 00000000..8c7aff6e
Binary files /dev/null and b/graphics/text/fontchars/font094.gif differ
diff --git a/graphics/text/fontchars/font095.gif b/graphics/text/fontchars/font095.gif
new file mode 100644
index 00000000..84013e07
Binary files /dev/null and b/graphics/text/fontchars/font095.gif differ
diff --git a/graphics/text/fontchars/font096.gif b/graphics/text/fontchars/font096.gif
new file mode 100644
index 00000000..aa56a527
Binary files /dev/null and b/graphics/text/fontchars/font096.gif differ
diff --git a/graphics/text/fontchars/font097.gif b/graphics/text/fontchars/font097.gif
deleted file mode 100644
index fbcaaa4c..00000000
Binary files a/graphics/text/fontchars/font097.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font098.gif b/graphics/text/fontchars/font098.gif
deleted file mode 100644
index d657d4b3..00000000
Binary files a/graphics/text/fontchars/font098.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font099.gif b/graphics/text/fontchars/font099.gif
deleted file mode 100644
index bac87619..00000000
Binary files a/graphics/text/fontchars/font099.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font100.gif b/graphics/text/fontchars/font100.gif
deleted file mode 100644
index 4f5a20fb..00000000
Binary files a/graphics/text/fontchars/font100.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font101.gif b/graphics/text/fontchars/font101.gif
deleted file mode 100644
index cb5527c7..00000000
Binary files a/graphics/text/fontchars/font101.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font102.gif b/graphics/text/fontchars/font102.gif
deleted file mode 100644
index 13eabaff..00000000
Binary files a/graphics/text/fontchars/font102.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font103.gif b/graphics/text/fontchars/font103.gif
deleted file mode 100644
index 462e05d5..00000000
Binary files a/graphics/text/fontchars/font103.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font104.gif b/graphics/text/fontchars/font104.gif
deleted file mode 100644
index 7f60ee8b..00000000
Binary files a/graphics/text/fontchars/font104.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font105.gif b/graphics/text/fontchars/font105.gif
deleted file mode 100644
index 557448a1..00000000
Binary files a/graphics/text/fontchars/font105.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font106.gif b/graphics/text/fontchars/font106.gif
deleted file mode 100644
index 30a01cb6..00000000
Binary files a/graphics/text/fontchars/font106.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font107.gif b/graphics/text/fontchars/font107.gif
deleted file mode 100644
index e1b99d91..00000000
Binary files a/graphics/text/fontchars/font107.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font108.gif b/graphics/text/fontchars/font108.gif
deleted file mode 100644
index 555a49bf..00000000
Binary files a/graphics/text/fontchars/font108.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font109.gif b/graphics/text/fontchars/font109.gif
deleted file mode 100644
index 4ce99621..00000000
Binary files a/graphics/text/fontchars/font109.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font110.gif b/graphics/text/fontchars/font110.gif
deleted file mode 100644
index a4800693..00000000
Binary files a/graphics/text/fontchars/font110.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font111.gif b/graphics/text/fontchars/font111.gif
deleted file mode 100644
index e5ab616c..00000000
Binary files a/graphics/text/fontchars/font111.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font112.gif b/graphics/text/fontchars/font112.gif
deleted file mode 100644
index 22c5a070..00000000
Binary files a/graphics/text/fontchars/font112.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font113.gif b/graphics/text/fontchars/font113.gif
deleted file mode 100644
index a06bfcf2..00000000
Binary files a/graphics/text/fontchars/font113.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font114.gif b/graphics/text/fontchars/font114.gif
deleted file mode 100644
index a60ebe25..00000000
Binary files a/graphics/text/fontchars/font114.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font115.gif b/graphics/text/fontchars/font115.gif
deleted file mode 100644
index dd6009a9..00000000
Binary files a/graphics/text/fontchars/font115.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font116.gif b/graphics/text/fontchars/font116.gif
deleted file mode 100644
index f31cb7a0..00000000
Binary files a/graphics/text/fontchars/font116.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font117.gif b/graphics/text/fontchars/font117.gif
deleted file mode 100644
index e338cfa1..00000000
Binary files a/graphics/text/fontchars/font117.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font118.gif b/graphics/text/fontchars/font118.gif
deleted file mode 100644
index 04c7fd0c..00000000
Binary files a/graphics/text/fontchars/font118.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font119.gif b/graphics/text/fontchars/font119.gif
deleted file mode 100644
index 06e29367..00000000
Binary files a/graphics/text/fontchars/font119.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font120.gif b/graphics/text/fontchars/font120.gif
deleted file mode 100644
index 7ee21e76..00000000
Binary files a/graphics/text/fontchars/font120.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font121.gif b/graphics/text/fontchars/font121.gif
deleted file mode 100644
index 9b15a0be..00000000
Binary files a/graphics/text/fontchars/font121.gif and /dev/null differ
diff --git a/graphics/text/fontchars/font122.gif b/graphics/text/fontchars/font122.gif
deleted file mode 100644
index d04a464e..00000000
Binary files a/graphics/text/fontchars/font122.gif and /dev/null differ
diff --git a/graphics/text/textgen b/graphics/text/textgen
index 30243d7d..f4f1bafc 100755
--- a/graphics/text/textgen
+++ b/graphics/text/textgen
@@ -54,11 +54,14 @@ COLOR_WHITE = (0, 0, 0)
 BACKGROUND_COLOR = '#00ffff'
 
 # Height of font in pixels.
-FONT_HEIGHT = 16
+FONT_HEIGHT = 15
 FONT_LC_HEIGHT = 12
 
+# If true, the font only has uppercase characters.
+UPPERCASE_FONT = True
+
 # Width of a space character in pixels.
-SPACE_WIDTH = 10
+SPACE_WIDTH = 7
 
 # Output from 'identify' looks like this:
 #  fontchars/font033.gif GIF 9x16 9x16+0+0 8-bit sRGB 32c 194B 0.000u 0:00.000
@@ -211,6 +214,8 @@ class Font(object):
 		The rendered text is generated with a transparent background.
 		"""
 
+		if UPPERCASE_FONT:
+			text = text.upper()
 		command_line = self._make_command_line(text, color)
 
 		command_line.append(output_filename)
@@ -221,6 +226,8 @@ class Font(object):
 	                color=COLOR_WHITE, bgcolor=BACKGROUND_COLOR):
 		"""Render text to a file with the given background color."""
 
+		if UPPERCASE_FONT:
+			text = text.upper()
 		command_line = self._make_command_line(text, color)
 
 		command_line.extend([