diff --git a/config/docs.cfg b/config/docs.cfg
index 20972537..6a8300d9 100644
--- a/config/docs.cfg
+++ b/config/docs.cfg
@@ -2896,6 +2896,12 @@ docargument [H] [height] [] [0];
 
 
 
+docident [setfont] [Changes the current font.];
+
+docargument [N] [Font name] [name of the font] [0];
+
+
+
 docident [shadowcasters] [];
 
 docargument [V] [] [min 1/max 0/default 0];
diff --git a/docs/reference.xml b/docs/reference.xml
index 6a36e02e..b0216668 100644
--- a/docs/reference.xml
+++ b/docs/reference.xml
@@ -3205,6 +3205,12 @@ Output:
             <argument token="A" description="" valueNotes="value"/>
           </arguments>
         </command>
+        <command name="setfont">
+          <description>Changes the current font.</description>
+          <arguments>
+            <argument token="N" description="Font name" valueNotes="name of the font"/>
+          </arguments>
+        </command>
         <variable name="fov">
           <description>Sets the field of view (fov).</description>
           <value token="N" description="the FOV value" minValue="75" maxValue="120" defaultValue="90"/>
diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp
index 9a7c9ba2..6d1ab86b 100644
--- a/source/src/rendertext.cpp
+++ b/source/src/rendertext.cpp
@@ -63,6 +63,7 @@ bool setfont(const char *name)
     curfont = f;
     return true;
 }
+COMMAND(setfont, ARG_1STR);
 
 font *getfont(const char *name)
 {
@@ -308,7 +309,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
         else stack[sp] = c;
         switch(abs(stack[sp]))
         {
-            case '0': color = bvec( 64,  255, 128 ); break;   // green: player talk
+            case '0': color = bvec( 2,  255, 128 ); break;   // green: player talk
             case '1': color = bvec( 96,  160, 255 ); break;   // blue: team chat
             case '2': color = bvec( 255, 192,  64 ); break;   // yellow: gameplay action messages, only actions done by players
             case '3': color = bvec( 255,  64,  64 ); break;   // red: important errors and notes
@@ -318,6 +319,8 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
             case '7': color = bvec( 128,  48,  48 ); break;   // dark red: dead admin
             case '8': color = bvec( 192,  64, 192 ); break;   // magenta
             case '9': color = bvec( 255, 128,   0 ); break;   // orange
+            case 'a': case 'A':color = bvec( 10, 10,   10 ); break;   // black
+            case 'z': case 'Z':color = bvec( 0x30, 0x67,   0x54); break;   // sea green
             // white (provided color): everything else
             //default: color = bvec( 255, 255, 255 ); break;
         }