diff --git a/source/common/fonts/hexfont.cpp b/source/common/fonts/hexfont.cpp
index 82bac7354..2119a7ba9 100644
--- a/source/common/fonts/hexfont.cpp
+++ b/source/common/fonts/hexfont.cpp
@@ -39,6 +39,7 @@
 #include "sc_man.h"
 #include "imagehelpers.h"
 #include "v_draw.h"
+#include "glbackend/glbackend.h"
 
 #include "fontinternals.h"
 
@@ -405,6 +406,7 @@ public:
 			}
 		}
 		forceremap = true;
+		Ranges[CR_UNTRANSLATED] = GLInterface.GetPaletteIndex(remap.Palette);
 
 	}
 
diff --git a/source/common/fonts/v_font.cpp b/source/common/fonts/v_font.cpp
index a0d910573..0b14c0348 100644
--- a/source/common/fonts/v_font.cpp
+++ b/source/common/fonts/v_font.cpp
@@ -403,9 +403,9 @@ void V_InitFontColors ()
 	TranslationLookup.Clear();
 	TranslationColors.Clear();
 
-	FScanner sc;
 	while ((lump = fileSystem.Iterate("textcolors.txt", &lastlump)) != -1)
 	{
+		FScanner sc(lump);
 		while (sc.GetString())
 		{
 			names.Clear();
@@ -708,6 +708,7 @@ EColorRange V_ParseFontColor (const uint8_t *&color_value, int normalcolor, int
 
 void V_InitFonts()
 {
+	V_InitFontColors();
 	V_InitCustomFonts();
 
 	FFont *CreateHexLumpFont(const char *fontname, const char* lump);
diff --git a/wadsrc/static/textcolors.txt b/wadsrc/static/textcolors.txt
new file mode 100644
index 000000000..d8e40182e
--- /dev/null
+++ b/wadsrc/static/textcolors.txt
@@ -0,0 +1,264 @@
+Brick
+{
+	#470000  #FFB8B8
+Console:
+	#470000  #A35C5C    0 127
+	#800000  #FFFEFE  128 256
+Flat:
+	#CC3333
+}
+
+Tan
+{
+	#332B13  #FFEBDF
+Console:
+	#332B13  #998B79    0 127
+	#998B79  #FFFFFF  128 256
+Flat:
+	#D2B48C
+}
+
+Gray Grey
+{
+	#272727  #EFEFEF
+Console:
+	#272727  #8B8B8B    0 127
+	#505050  #FFFFFF  128 256
+Flat:
+	#CCCCCC
+}
+
+Green
+{
+	#0B1707  #77FF6F
+Console:
+	#000000  #007F00    0 127
+	#00FF00  #FEFFFE  128 256
+Flat:
+	#00CC00
+}
+
+Brown
+{
+	#533F2F  #BFA78F
+Console:
+	#000000  #7F4000    0 127
+	#432F1F  #FFE7CF  128 256
+Flat:
+	#996633
+}
+
+Gold
+{
+	#732B00  #FFFF73
+Console:
+	#000000  #7FC040    0 127
+	#DFBF00  #DFFFFE  128 256
+Flat:
+	#FFCC00
+}
+
+Red
+{
+	#3F0000  #FF0000
+Console:
+	#000000  #7F0000    0 127
+	#FF0000  #FFFEFE  128 256
+Flat:
+	#FF5566
+}
+
+Blue
+{
+	#000027  #0000FF
+Console:
+	#000000  #00007F    0 127
+	#4040FF  #DEDEFF  128 256
+Flat:
+	#9999FF
+}
+
+Orange
+{
+	#200000  #FF8000
+Console:
+	#200000  #904000    0 127
+	#FF7F00  #FFFEFE  128 256
+Flat:
+	#FFAA00
+}
+
+// This is designed to match the white Heretic/Hexen font.
+// It is close to the gray BOOM font, but not quite the same.
+White
+{
+	#242424  #FFFFFF
+Console:
+	#000000  #7F7F7F    0 127
+	#808080  #FFFFFF  128 256
+Flat:
+	#DFDFDF
+}
+
+// This is designed to match the yellow Hexen font, which has a
+// gray outline filled with shades of yellow.
+Yellow
+{
+	#272727  #515151    0  64
+	#784918  #F3A718   65 207
+	#F3A82A  #FCD043  208 256
+Console:
+	#000000  #7F7F00    0 127
+	#FFFF00  #FFFFFF  128 256
+Flat:
+	#EEEE33
+}
+
+Untranslated
+{
+}
+
+Black
+{
+	#131313  #505050
+Console:
+	#000000  #323232    0 127
+	#0A0A0A  #505050  128 256
+Flat:
+	#000000
+}
+
+LightBlue "Light Blue"
+{
+	#000073  #B4B4FF
+Console:
+	#00003C  #5050FF    0 127
+	#8080FF  #FFFFFF  128 256
+Flat:
+	#33EEFF
+}
+
+Cream
+{
+	#6B4727  #BF7B4B    0 94
+	#BF7B4B  #FFBF9B   95 256
+Console:
+	#2B230F  #BF7B4B    0 127
+	#FFB383  #FFFFFF  128 256
+Flat:
+	#FFCC99
+}
+
+Olive
+{
+	#171F07  #7B7F50
+Console:
+	#373F27  #7B7F63    0 127
+	#676B4F  #D1D8A8  128 256
+Flat:
+	#D1D8A8
+}
+
+DarkGreen "Dark Green"
+{
+	#0B1707  #439337
+Console:
+	#000000  #005800    0 127
+	#008C00  #DCFFDC  128 256
+Flat:
+	#008C00
+}
+
+DarkRed "Dark Red"
+{
+	#2B0000  #AF2B2B
+Console:
+	#000000  #730000    0 127
+	#800000  #FFDCDC  128 255
+Flat:
+	#800000
+}
+
+DarkBrown "Dark Brown"
+{
+	#1F170B  #A36B3F
+Console:
+	#2B230F  #773000    0 127
+	#735743  #F7BD58  128 256
+Flat:
+	#663333
+}
+
+Purple
+{
+	#230023  #CF00CF
+Console:
+	#000000  #9F009B    0 127
+	#FF00FF  #FFFFFF  128 256
+Flat:
+	#9966CC
+}
+
+DarkGray DarkGrey "Dark Gray" "Dark Grey"
+{
+	#232323  #8B8B8B
+Console:
+	#000000  #646464    0 127
+	#404040  #B4B4B4  128 256
+Flat:
+	#808080
+}
+
+Cyan
+{
+	#001F1F #00F0F0
+Console:
+	#000000 #007F7F     0 127
+	#00FFFF #FEFFFF   128 256
+Flat:
+	#00DDDD
+}
+
+Ice
+{
+	#343450  #7C7C98    0 94
+	#7C7C98  #E0E0E0   95 256
+Console:
+	#343450  #7C7C98    0 127
+	#7C7C98  #E0E0E0  128 256
+Flat:
+	#7C7C98
+}
+
+Fire
+{
+	#660000  #D57604   0 104
+	#D57604  #FFFF00   105 256
+Console:
+	#6F0000  #D57604    0 127
+	#D57604  #FFFF00  128 256
+Flat:
+	#D57604
+}
+
+Sapphire
+{
+	#000468  #506CFC    0 94
+	#506CFC  #50ECFC   95 256
+Console:
+	#000468  #506CFC    0 127
+	#506CFC  #50ECFC  128 256
+Flat:
+	#506CFC
+}
+
+Teal
+{
+	#001F1F  #236773    0 90
+	#236773  #7BB3C3   91 256
+Console:
+	#001F1F  #236773    0 127
+	#236773  #7BB3C3  128 256
+Flat:
+	#236773
+}