diff --git a/docs/en/OPTIONS.txt b/docs/en/OPTIONS.txt
index d2e618b01..d1f89f4b8 100644
--- a/docs/en/OPTIONS.txt
+++ b/docs/en/OPTIONS.txt
@@ -812,6 +812,15 @@ Languages
            "alllocalefonts=no" or "currentlocalefont=yes". In both cases, may
            be overridden by the command-line option "--currentlocalefont".
 
+   uifont=FONT NAME
+
+           This option causes Tux Paint to attempt to load fonts (for use in
+           the Text tool) from your operating system. Normally, Tux Paint
+           will only load the ones that came bundled with Tux Paint.
+
+           Specify "default" to let Tux Paint use its default font, "DejaVu
+           Sans" (its standard behavior).
+
 Printing
 
   Print Permissions
@@ -1445,8 +1454,10 @@ Joystick
      --nostampcontrols
      --nostamprotation
      --nomagiccontrols
+     --nomagicsizes
      --noshapecontrols
      --nolabel
+     --nobrushspacing
      --newcolorslast
      --mouse-accessibility
      --onscreen-keyboard
@@ -1476,6 +1487,7 @@ Joystick
      --joystick-btn-print
      --joystick-buttons-ignore
      --sysfonts
+     --uifont=FONT NAME
      --alllocalefonts
      --mirrorstamps
      --stampsize=SIZE
@@ -1520,11 +1532,14 @@ Joystick
      --stampcontrols
      --stamprotation
      --magiccontrols
+     --magicsizes
      --shapecontrols
      --label
+     --brushspacing
      --newcolorsfirst
      --nosysfonts
      --currentlocalefont
+     --uifont=default
      --dontmirrorstamps
      --stampsize=default
      --mouse
diff --git a/docs/en/README.txt b/docs/en/README.txt
index c645c548d..de2ee8d4b 100644
--- a/docs/en/README.txt
+++ b/docs/en/README.txt
@@ -102,7 +102,14 @@ What's New in Tux Paint version 0.9.31?
 
    Create templates from Open dialog
            Saved drawings can be turned into templates (used to make new
-           drawings) via a new option in the Open dialog
+           drawings) via a new option in the Open dialog. (This feature may
+           be deactivated using the "notemplateexport" simplification
+           option.)
+
+   User interface font may be overridden
+           The font used for the user interface (button labels, dialog
+           pop-ups, and instructions) can be overridden from its default
+           ("DejaVu Sans"). (See the "uifont" configuration option.)
 
    See CHANGES.txt for the complete list of changes.
 
diff --git a/docs/en/html/OPTIONS.html b/docs/en/html/OPTIONS.html
index 6fcbcc64b..d9250b937 100644
--- a/docs/en/html/OPTIONS.html
+++ b/docs/en/html/OPTIONS.html
@@ -1420,7 +1420,7 @@
 
 <section>
   <header>
-    <h3>Fonts</h3>
+    <h3 id="fonts">Fonts</h3>
   </header>
 
   <dl>
@@ -1448,6 +1448,18 @@
       <p class="note">
         <span title="Configuration option">&#9881;</span>        <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>alllocalefonts=no</code>" or "<code>currentlocalefont=yes</code>". In both cases, may be overridden by the command-line option "<code>--currentlocalefont</code>".      </p>
     </dd>
+
+    <dt>
+      <code><b>uifont=FONT NAME</b></code>
+    </dt>
+
+    <dd>
+      <p>
+        This option causes Tux Paint to attempt to load fonts (for use in the <b>Text</b> tool) from your operating system. Normally, Tux Paint will only load the ones that came bundled with Tux Paint.      </p>
+
+      <p>
+        Specify "<code>default</code>" to let Tux Paint use its default font, "DejaVu Sans" (its standard behavior).      </p>
+    </dd>
   </dl>
 </section>
   </section>
@@ -2365,8 +2377,10 @@
           --nostampcontrols<br>
           --nostamprotation<br>
           --nomagiccontrols<br>
+          --nomagicsizes<br>
           --noshapecontrols<br>
           --nolabel<br>
+          --nobrushspacing<br>
           --newcolorslast<br>
           --mouse-accessibility<br>
           --onscreen-keyboard<br>
@@ -2396,6 +2410,7 @@
           --joystick-btn-print<br>
           --joystick-buttons-ignore<br>
           --sysfonts<br>
+          --uifont=<i>FONT NAME</i><br>
           --alllocalefonts<br>
           --mirrorstamps<br>
           --stampsize=<i>SIZE</i><br>
@@ -2444,11 +2459,14 @@
           --stampcontrols<br>
           --stamprotation<br>
           --magiccontrols<br>
+          --magicsizes<br>
           --shapecontrols<br>
           --label<br>
+          --brushspacing<br>
           --newcolorsfirst<br>
           --nosysfonts<br>
           --currentlocalefont<br>
+          --uifont=default<br>
           --dontmirrorstamps<br>
           --stampsize=default<br>
           --mouse<br>
diff --git a/docs/en/html/README.html b/docs/en/html/README.html
index c875ef8c1..9be7f6b43 100644
--- a/docs/en/html/README.html
+++ b/docs/en/html/README.html
@@ -226,7 +226,10 @@
   <dd>Loops, Ribbon, Smooth, and Squiggles</dd>
 
   <dt>Create templates from Open dialog</dt>
-  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog</dd>
+  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog. (This feature may be deactivated using the <a href="OPTIONS.html#simplification">"<code>notemplateexport</code>" simplification option</a>.)</dd>
+
+  <dt>User interface font may be overridden</dt>
+  <dd>The font used for the user interface (button labels, dialog pop-ups, and instructions) can be overridden from its default ("DejaVu Sans"). (See the <a href="OPTIONS.html#fonts">"<code>uifont</code>" configuration option</a>.)</dd>
 </dl>
 
     <p>
diff --git a/docs/es_ES.UTF-8/OPTIONS.txt b/docs/es_ES.UTF-8/OPTIONS.txt
index 79c7fc37a..c6650fcd7 100644
--- a/docs/es_ES.UTF-8/OPTIONS.txt
+++ b/docs/es_ES.UTF-8/OPTIONS.txt
@@ -812,6 +812,15 @@ Languages
            "alllocalefonts=no" or "currentlocalefont=yes". In both cases, may
            be overridden by the command-line option "--currentlocalefont".
 
+   uifont=FONT NAME
+
+           This option causes Tux Paint to attempt to load fonts (for use in
+           the Text tool) from your operating system. Normally, Tux Paint
+           will only load the ones that came bundled with Tux Paint.
+
+           Specify "default" to let Tux Paint use its default font, "DejaVu
+           Sans" (its standard behavior).
+
 Printing
 
   Print Permissions
@@ -1445,8 +1454,10 @@ Joystick
      --nostampcontrols
      --nostamprotation
      --nomagiccontrols
+     --nomagicsizes
      --noshapecontrols
      --nolabel
+     --nobrushspacing
      --newcolorslast
      --mouse-accessibility
      --onscreen-keyboard
@@ -1476,6 +1487,7 @@ Joystick
      --joystick-btn-print
      --joystick-buttons-ignore
      --sysfonts
+     --uifont=FONT NAME
      --alllocalefonts
      --mirrorstamps
      --stampsize=SIZE
@@ -1520,11 +1532,14 @@ Joystick
      --stampcontrols
      --stamprotation
      --magiccontrols
+     --magicsizes
      --shapecontrols
      --label
+     --brushspacing
      --newcolorsfirst
      --nosysfonts
      --currentlocalefont
+     --uifont=default
      --dontmirrorstamps
      --stampsize=default
      --mouse
diff --git a/docs/es_ES.UTF-8/README.txt b/docs/es_ES.UTF-8/README.txt
index f66d5c3a4..0a16491f3 100644
--- a/docs/es_ES.UTF-8/README.txt
+++ b/docs/es_ES.UTF-8/README.txt
@@ -102,7 +102,14 @@ What's New in Tux Paint version 0.9.31?
 
    Create templates from Open dialog
            Saved drawings can be turned into templates (used to make new
-           drawings) via a new option in the Open dialog
+           drawings) via a new option in the Open dialog. (This feature may
+           be deactivated using the "notemplateexport" simplification
+           option.)
+
+   User interface font may be overridden
+           The font used for the user interface (button labels, dialog
+           pop-ups, and instructions) can be overridden from its default
+           ("DejaVu Sans"). (See the "uifont" configuration option.)
 
    See CHANGES.txt for the complete list of changes.
 
diff --git a/docs/es_ES.UTF-8/html/OPTIONS.html b/docs/es_ES.UTF-8/html/OPTIONS.html
index fe4dfaf48..cb5588c0d 100644
--- a/docs/es_ES.UTF-8/html/OPTIONS.html
+++ b/docs/es_ES.UTF-8/html/OPTIONS.html
@@ -1420,7 +1420,7 @@
 
 <section>
   <header>
-    <h3>Fonts</h3>
+    <h3 id="fonts">Fonts</h3>
   </header>
 
   <dl>
@@ -1448,6 +1448,18 @@
       <p class="note">
         <span title="Configuration option">&#9881;</span>        <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>alllocalefonts=no</code>" or "<code>currentlocalefont=yes</code>". In both cases, may be overridden by the command-line option "<code>--currentlocalefont</code>".      </p>
     </dd>
+
+    <dt>
+      <code><b>uifont=FONT NAME</b></code>
+    </dt>
+
+    <dd>
+      <p>
+        This option causes Tux Paint to attempt to load fonts (for use in the <b>Text</b> tool) from your operating system. Normally, Tux Paint will only load the ones that came bundled with Tux Paint.      </p>
+
+      <p>
+        Specify "<code>default</code>" to let Tux Paint use its default font, "DejaVu Sans" (its standard behavior).      </p>
+    </dd>
   </dl>
 </section>
   </section>
@@ -2365,8 +2377,10 @@
           --nostampcontrols<br>
           --nostamprotation<br>
           --nomagiccontrols<br>
+          --nomagicsizes<br>
           --noshapecontrols<br>
           --nolabel<br>
+          --nobrushspacing<br>
           --newcolorslast<br>
           --mouse-accessibility<br>
           --onscreen-keyboard<br>
@@ -2396,6 +2410,7 @@
           --joystick-btn-print<br>
           --joystick-buttons-ignore<br>
           --sysfonts<br>
+          --uifont=<i>FONT NAME</i><br>
           --alllocalefonts<br>
           --mirrorstamps<br>
           --stampsize=<i>SIZE</i><br>
@@ -2444,11 +2459,14 @@
           --stampcontrols<br>
           --stamprotation<br>
           --magiccontrols<br>
+          --magicsizes<br>
           --shapecontrols<br>
           --label<br>
+          --brushspacing<br>
           --newcolorsfirst<br>
           --nosysfonts<br>
           --currentlocalefont<br>
+          --uifont=default<br>
           --dontmirrorstamps<br>
           --stampsize=default<br>
           --mouse<br>
diff --git a/docs/es_ES.UTF-8/html/README.html b/docs/es_ES.UTF-8/html/README.html
index 89edc0ae7..6ceb532e1 100644
--- a/docs/es_ES.UTF-8/html/README.html
+++ b/docs/es_ES.UTF-8/html/README.html
@@ -226,7 +226,10 @@
   <dd>Loops, Ribbon, Smooth, and Squiggles</dd>
 
   <dt>Create templates from Open dialog</dt>
-  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog</dd>
+  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog. (This feature may be deactivated using the <a href="OPTIONS.html#simplification">"<code>notemplateexport</code>" simplification option</a>.)</dd>
+
+  <dt>User interface font may be overridden</dt>
+  <dd>The font used for the user interface (button labels, dialog pop-ups, and instructions) can be overridden from its default ("DejaVu Sans"). (See the <a href="OPTIONS.html#fonts">"<code>uifont</code>" configuration option</a>.)</dd>
 </dl>
 
     <p>
diff --git a/docs/fr_FR.UTF-8/OPTIONS.txt b/docs/fr_FR.UTF-8/OPTIONS.txt
index 4f8a763de..729defb15 100644
--- a/docs/fr_FR.UTF-8/OPTIONS.txt
+++ b/docs/fr_FR.UTF-8/OPTIONS.txt
@@ -837,6 +837,16 @@ Langues
            "alllocalefonts=no" or "currentlocalefont=yes". In both cases, may
            be overridden by the command-line option "--currentlocalefont".
 
+   uifont=FONT NAME
+
+           Cette option oblige Tux Paint à essayer de charger des polices (à
+           utiliser dans l'outil Texte ) à partir de votre système
+           d'exploitation. Normalement, Tux Paint ne chargera que ceux
+           fournis avec Tux Paint.
+
+           Specify "default" to let Tux Paint use its default font, "DejaVu
+           Sans" (its standard behavior).
+
 Impression
 
   Permissions pour l'impression
@@ -1516,8 +1526,10 @@ Joystick
      --nostampcontrols
      --nostamprotation
      --nomagiccontrols
+     --nomagicsizes
      --noshapecontrols
      --nolabel
+     --nobrushspacing
      --newcolorslast
      --mouse-accessibility
      --onscreen-keyboard
@@ -1547,6 +1559,7 @@ Joystick
      --joystick-btn-print
      --joystick-buttons-ignore
      --sysfonts
+     --uifont=FONT NAME
      --alllocalefonts
      --mirrorstamps
      --stampsize=SIZE
@@ -1591,11 +1604,14 @@ Joystick
      --stampcontrols
      --stamprotation
      --magiccontrols
+     --magicsizes
      --shapecontrols
      --label
+     --brushspacing
      --newcolorsfirst
      --nosysfonts
      --currentlocalefont
+     --uifont=default
      --dontmirrorstamps
      --stampsize=default
      --mouse
diff --git a/docs/fr_FR.UTF-8/README.txt b/docs/fr_FR.UTF-8/README.txt
index 62b5ed502..6ab17d6c5 100644
--- a/docs/fr_FR.UTF-8/README.txt
+++ b/docs/fr_FR.UTF-8/README.txt
@@ -107,7 +107,14 @@ What's New in Tux Paint version 0.9.31?
 
    Create templates from Open dialog
            Saved drawings can be turned into templates (used to make new
-           drawings) via a new option in the Open dialog
+           drawings) via a new option in the Open dialog. (This feature may
+           be deactivated using the "notemplateexport" simplification
+           option.)
+
+   User interface font may be overridden
+           The font used for the user interface (button labels, dialog
+           pop-ups, and instructions) can be overridden from its default
+           ("DejaVu Sans"). (See the "uifont" configuration option.)
 
    See CHANGES.txt for the complete list of changes.
 
diff --git a/docs/fr_FR.UTF-8/html/OPTIONS.html b/docs/fr_FR.UTF-8/html/OPTIONS.html
index 5636c56a6..77b2d3ebb 100644
--- a/docs/fr_FR.UTF-8/html/OPTIONS.html
+++ b/docs/fr_FR.UTF-8/html/OPTIONS.html
@@ -1420,7 +1420,7 @@
 
 <section>
   <header>
-    <h3>Polices</h3>
+    <h3 id="fonts">Polices</h3>
   </header>
 
   <dl>
@@ -1448,6 +1448,18 @@
       <p class="note">
         <span title="Configuration option">&#9881;</span>        <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>alllocalefonts=no</code>" or "<code>currentlocalefont=yes</code>". In both cases, may be overridden by the command-line option "<code>--currentlocalefont</code>".      </p>
     </dd>
+
+    <dt>
+      <code><b>uifont=FONT NAME</b></code>
+    </dt>
+
+    <dd>
+      <p>
+        Cette option oblige Tux Paint à essayer de charger des polices (à utiliser dans l'outil Texte ) à partir de votre système d'exploitation. Normalement, Tux Paint ne chargera que ceux fournis avec Tux Paint.      </p>
+
+      <p>
+        Specify "<code>default</code>" to let Tux Paint use its default font, "DejaVu Sans" (its standard behavior).      </p>
+    </dd>
   </dl>
 </section>
   </section>
@@ -2365,8 +2377,10 @@
           --nostampcontrols<br>
           --nostamprotation<br>
           --nomagiccontrols<br>
+          --nomagicsizes<br>
           --noshapecontrols<br>
           --nolabel<br>
+          --nobrushspacing<br>
           --newcolorslast<br>
           --mouse-accessibility<br>
           --onscreen-keyboard<br>
@@ -2396,6 +2410,7 @@
           --joystick-btn-print<br>
           --joystick-buttons-ignore<br>
           --sysfonts<br>
+          --uifont=<i>FONT NAME</i><br>
           --alllocalefonts<br>
           --mirrorstamps<br>
           --stampsize=<i>SIZE</i><br>
@@ -2444,11 +2459,14 @@
           --stampcontrols<br>
           --stamprotation<br>
           --magiccontrols<br>
+          --magicsizes<br>
           --shapecontrols<br>
           --label<br>
+          --brushspacing<br>
           --newcolorsfirst<br>
           --nosysfonts<br>
           --currentlocalefont<br>
+          --uifont=default<br>
           --dontmirrorstamps<br>
           --stampsize=default<br>
           --mouse<br>
diff --git a/docs/fr_FR.UTF-8/html/README.html b/docs/fr_FR.UTF-8/html/README.html
index d1e16f204..d4a706570 100644
--- a/docs/fr_FR.UTF-8/html/README.html
+++ b/docs/fr_FR.UTF-8/html/README.html
@@ -226,7 +226,10 @@
   <dd>Loops, Ribbon, Smooth, and Squiggles</dd>
 
   <dt>Create templates from Open dialog</dt>
-  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog</dd>
+  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog. (This feature may be deactivated using the <a href="OPTIONS.html#simplification">"<code>notemplateexport</code>" simplification option</a>.)</dd>
+
+  <dt>User interface font may be overridden</dt>
+  <dd>The font used for the user interface (button labels, dialog pop-ups, and instructions) can be overridden from its default ("DejaVu Sans"). (See the <a href="OPTIONS.html#fonts">"<code>uifont</code>" configuration option</a>.)</dd>
 </dl>
 
     <p>
diff --git a/docs/gl_ES.UTF-8/OPTIONS.txt b/docs/gl_ES.UTF-8/OPTIONS.txt
index 43bc86f7f..4544a44ce 100644
--- a/docs/gl_ES.UTF-8/OPTIONS.txt
+++ b/docs/gl_ES.UTF-8/OPTIONS.txt
@@ -830,6 +830,16 @@ Languages
            "alllocalefonts=no" or "currentlocalefont=yes". In both cases, may
            be overridden by the command-line option "--currentlocalefont".
 
+   uifont=FONT NAME
+
+           Esta opción fai que Tux Paint tente cargar tipos de letra (para
+           usalos na ferramenta Texto) dende o seu sistema operativo.
+           Normalmente, Tux Paint só cargará os que foron incluídos con Tux
+           Paint.
+
+           Specify "default" to let Tux Paint use its default font, "DejaVu
+           Sans" (its standard behavior).
+
 Impresión
 
   Print Permissions
@@ -1490,8 +1500,10 @@ Joystick
      --nostampcontrols
      --nostamprotation
      --nomagiccontrols
+     --nomagicsizes
      --noshapecontrols
      --nolabel
+     --nobrushspacing
      --newcolorslast
      --mouse-accessibility
      --onscreen-keyboard
@@ -1521,6 +1533,7 @@ Joystick
      --joystick-btn-print
      --joystick-buttons-ignore
      --sysfonts
+     --uifont=FONT NAME
      --alllocalefonts
      --mirrorstamps
      --stampsize=TAMAÑO
@@ -1565,11 +1578,14 @@ Joystick
      --stampcontrols
      --stamprotation
      --magiccontrols
+     --magicsizes
      --shapecontrols
      --label
+     --brushspacing
      --newcolorsfirst
      --nosysfonts
      --currentlocalefont
+     --uifont=default
      --dontmirrorstamps
      --stampsize=default
      --mouse
diff --git a/docs/gl_ES.UTF-8/README.txt b/docs/gl_ES.UTF-8/README.txt
index 446abb6ad..1942d34ba 100644
--- a/docs/gl_ES.UTF-8/README.txt
+++ b/docs/gl_ES.UTF-8/README.txt
@@ -102,7 +102,14 @@ What's New in Tux Paint version 0.9.31?
 
    Create templates from Open dialog
            Saved drawings can be turned into templates (used to make new
-           drawings) via a new option in the Open dialog
+           drawings) via a new option in the Open dialog. (This feature may
+           be deactivated using the "notemplateexport" simplification
+           option.)
+
+   User interface font may be overridden
+           The font used for the user interface (button labels, dialog
+           pop-ups, and instructions) can be overridden from its default
+           ("DejaVu Sans"). (See the "uifont" configuration option.)
 
    See CHANGES.txt for the complete list of changes.
 
diff --git a/docs/gl_ES.UTF-8/html/OPTIONS.html b/docs/gl_ES.UTF-8/html/OPTIONS.html
index 5ffd9890d..62ee59e93 100644
--- a/docs/gl_ES.UTF-8/html/OPTIONS.html
+++ b/docs/gl_ES.UTF-8/html/OPTIONS.html
@@ -1420,7 +1420,7 @@
 
 <section>
   <header>
-    <h3>Tipos de letra</h3>
+    <h3 id="fonts">Tipos de letra</h3>
   </header>
 
   <dl>
@@ -1448,6 +1448,18 @@
       <p class="note">
         <span title="Configuration option">&#9881;</span>        <strong>Note:</strong> If used in a system-wide configuration file, may be overridden by the user's configuration file using "<code>alllocalefonts=no</code>" or "<code>currentlocalefont=yes</code>". In both cases, may be overridden by the command-line option "<code>--currentlocalefont</code>".      </p>
     </dd>
+
+    <dt>
+      <code><b>uifont=FONT NAME</b></code>
+    </dt>
+
+    <dd>
+      <p>
+        Esta opción fai que Tux Paint tente cargar tipos de letra (para usalos na ferramenta <b>Texto</b>) dende o seu sistema operativo. Normalmente, Tux Paint só cargará os que foron incluídos con Tux Paint.      </p>
+
+      <p>
+        Specify "<code>default</code>" to let Tux Paint use its default font, "DejaVu Sans" (its standard behavior).      </p>
+    </dd>
   </dl>
 </section>
   </section>
@@ -2365,8 +2377,10 @@
           --nostampcontrols<br>
           --nostamprotation<br>
           --nomagiccontrols<br>
+          --nomagicsizes<br>
           --noshapecontrols<br>
           --nolabel<br>
+          --nobrushspacing<br>
           --newcolorslast<br>
           --mouse-accessibility<br>
           --onscreen-keyboard<br>
@@ -2396,6 +2410,7 @@
           --joystick-btn-print<br>
           --joystick-buttons-ignore<br>
           --sysfonts<br>
+          --uifont=<i>FONT NAME</i><br>
           --alllocalefonts<br>
           --mirrorstamps<br>
           --stampsize=<i>TAMAÑO</i><br>
@@ -2444,11 +2459,14 @@
           --stampcontrols<br>
           --stamprotation<br>
           --magiccontrols<br>
+          --magicsizes<br>
           --shapecontrols<br>
           --label<br>
+          --brushspacing<br>
           --newcolorsfirst<br>
           --nosysfonts<br>
           --currentlocalefont<br>
+          --uifont=default<br>
           --dontmirrorstamps<br>
           --stampsize=default<br>
           --mouse<br>
diff --git a/docs/gl_ES.UTF-8/html/README.html b/docs/gl_ES.UTF-8/html/README.html
index 5afc802a2..47fe90eec 100644
--- a/docs/gl_ES.UTF-8/html/README.html
+++ b/docs/gl_ES.UTF-8/html/README.html
@@ -226,7 +226,10 @@
   <dd>Loops, Ribbon, Smooth, and Squiggles</dd>
 
   <dt>Create templates from Open dialog</dt>
-  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog</dd>
+  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog. (This feature may be deactivated using the <a href="OPTIONS.html#simplification">"<code>notemplateexport</code>" simplification option</a>.)</dd>
+
+  <dt>User interface font may be overridden</dt>
+  <dd>The font used for the user interface (button labels, dialog pop-ups, and instructions) can be overridden from its default ("DejaVu Sans"). (See the <a href="OPTIONS.html#fonts">"<code>uifont</code>" configuration option</a>.)</dd>
 </dl>
 
     <p>
diff --git a/docs/ja_JP.UTF-8/OPTIONS.txt b/docs/ja_JP.UTF-8/OPTIONS.txt
index b3555857c..6442e53d2 100644
--- a/docs/ja_JP.UTF-8/OPTIONS.txt
+++ b/docs/ja_JP.UTF-8/OPTIONS.txt
@@ -710,6 +710,14 @@ Windows のユーザー
            を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "--currentlocalefont"
            で変更できます。
 
+   uifont=FONT NAME
+
+           もじツールで、オペレーティングシステムのフォントを使用します。通常では、Tux Paint
+           はパッケージに付属するフォントだけを使用します。
+
+           Specify "default" to let Tux Paint use its default font, "DejaVu
+           Sans" (its standard behavior).
+
 印刷
 
   印刷の制御
@@ -1227,8 +1235,10 @@ Windows のユーザー
      --nostampcontrols
      --nostamprotation
      --nomagiccontrols
+     --nomagicsizes
      --noshapecontrols
      --nolabel
+     --nobrushspacing
      --newcolorslast
      --mouse-accessibility
      --onscreen-keyboard
@@ -1258,6 +1268,7 @@ Windows のユーザー
      --joystick-btn-print
      --joystick-buttons-ignore
      --sysfonts
+     --uifont=FONT NAME
      --alllocalefonts
      --mirrorstamps
      --stampsize=SIZE
@@ -1301,11 +1312,14 @@ Windows のユーザー
      --stampcontrols
      --stamprotation
      --magiccontrols
+     --magicsizes
      --shapecontrols
      --label
+     --brushspacing
      --newcolorsfirst
      --nosysfonts
      --currentlocalefont
+     --uifont=default
      --dontmirrorstamps
      --stampsize=default
      --mouse
diff --git a/docs/ja_JP.UTF-8/README.txt b/docs/ja_JP.UTF-8/README.txt
index 3b24d6722..358dd9265 100644
--- a/docs/ja_JP.UTF-8/README.txt
+++ b/docs/ja_JP.UTF-8/README.txt
@@ -83,7 +83,14 @@ Tux Paint バージョン 0.9.31 での変更点
 
    Create templates from Open dialog
            Saved drawings can be turned into templates (used to make new
-           drawings) via a new option in the Open dialog
+           drawings) via a new option in the Open dialog. (This feature may
+           be deactivated using the "notemplateexport" simplification
+           option.)
+
+   User interface font may be overridden
+           The font used for the user interface (button labels, dialog
+           pop-ups, and instructions) can be overridden from its default
+           ("DejaVu Sans"). (See the "uifont" configuration option.)
 
    全ての変更点については、CHANGES.txt をお読みください。
 
diff --git a/docs/ja_JP.UTF-8/html/OPTIONS.html b/docs/ja_JP.UTF-8/html/OPTIONS.html
index f77600bc7..8136a72a7 100644
--- a/docs/ja_JP.UTF-8/html/OPTIONS.html
+++ b/docs/ja_JP.UTF-8/html/OPTIONS.html
@@ -1420,7 +1420,7 @@
 
 <section>
   <header>
-    <h3>フォント</h3>
+    <h3 id="fonts">フォント</h3>
   </header>
 
   <dl>
@@ -1448,6 +1448,18 @@
       <p class="note">
         <span title="Configuration option">&#9881;</span>        <strong>注:</strong> システム全体の設定ファイルで設定されている場合は、ユーザーの設定ファイルで "<code>alllocalefonts=no</code>" または "<code>currentlocalefont=yes</code>" を設定すると上書きされることがあります。また、どちらの設定も、コマンドラインオプションの "<code>--currentlocalefont</code>" で変更できます。      </p>
     </dd>
+
+    <dt>
+      <code><b>uifont=FONT NAME</b></code>
+    </dt>
+
+    <dd>
+      <p>
+        <b>もじ</b>ツールで、オペレーティングシステムのフォントを使用します。通常では、Tux Paint はパッケージに付属するフォントだけを使用します。      </p>
+
+      <p>
+        Specify "<code>default</code>" to let Tux Paint use its default font, "DejaVu Sans" (its standard behavior).      </p>
+    </dd>
   </dl>
 </section>
   </section>
@@ -2365,8 +2377,10 @@
           --nostampcontrols<br>
           --nostamprotation<br>
           --nomagiccontrols<br>
+          --nomagicsizes<br>
           --noshapecontrols<br>
           --nolabel<br>
+          --nobrushspacing<br>
           --newcolorslast<br>
           --mouse-accessibility<br>
           --onscreen-keyboard<br>
@@ -2396,6 +2410,7 @@
           --joystick-btn-print<br>
           --joystick-buttons-ignore<br>
           --sysfonts<br>
+          --uifont=<i>FONT NAME</i><br>
           --alllocalefonts<br>
           --mirrorstamps<br>
           --stampsize=<i>SIZE</i><br>
@@ -2444,11 +2459,14 @@
           --stampcontrols<br>
           --stamprotation<br>
           --magiccontrols<br>
+          --magicsizes<br>
           --shapecontrols<br>
           --label<br>
+          --brushspacing<br>
           --newcolorsfirst<br>
           --nosysfonts<br>
           --currentlocalefont<br>
+          --uifont=default<br>
           --dontmirrorstamps<br>
           --stampsize=default<br>
           --mouse<br>
diff --git a/docs/ja_JP.UTF-8/html/README.html b/docs/ja_JP.UTF-8/html/README.html
index 2d562ddae..d5d0e5c9a 100644
--- a/docs/ja_JP.UTF-8/html/README.html
+++ b/docs/ja_JP.UTF-8/html/README.html
@@ -226,7 +226,10 @@
   <dd>Loops, Ribbon, Smooth, and Squiggles</dd>
 
   <dt>Create templates from Open dialog</dt>
-  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog</dd>
+  <dd>Saved drawings can be turned into templates (used to make new drawings) via a new option in the Open dialog. (This feature may be deactivated using the <a href="OPTIONS.html#simplification">"<code>notemplateexport</code>" simplification option</a>.)</dd>
+
+  <dt>User interface font may be overridden</dt>
+  <dd>The font used for the user interface (button labels, dialog pop-ups, and instructions) can be overridden from its default ("DejaVu Sans"). (See the <a href="OPTIONS.html#fonts">"<code>uifont</code>" configuration option</a>.)</dd>
 </dl>
 
     <p>
diff --git a/man/en/tuxpaint.1 b/man/en/tuxpaint.1
index 86c560a0e..84806f02b 100644
--- a/man/en/tuxpaint.1
+++ b/man/en/tuxpaint.1
@@ -149,6 +149,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-alllocalefonts]
 .br
+[\-\-uifont \fIFONT NAME\fP]
+.br
 [\-\-savedir \fIDIR\fP]
 .br
 [\-\-exportdir \fIDIR\fP]
@@ -243,6 +245,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
+[\-\-uifont=default\fP]
+.br
 [\-\-saveoverask]
 .br
 [\-\-save]
@@ -1202,6 +1206,13 @@ except any that match the current locale Tux Paint is running under. Use
 the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
+.TP 8
+.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+Specify the name of a font for Tux Paint to attempt to use for its user
+interface (UI) -- button labels, dialog pop-up text, instructional text at
+the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
+will be used. (This was the default behavior, prior to version 0.9.31.)
+
 .SH OPTIONS - MISCELLANEOUS
 .l
 \fItuxpaint\fP accepts the following options to alter its behavior. They
diff --git a/man/es_ES.UTF-8/tuxpaint.1 b/man/es_ES.UTF-8/tuxpaint.1
index d9b115566..0b085fc93 100644
--- a/man/es_ES.UTF-8/tuxpaint.1
+++ b/man/es_ES.UTF-8/tuxpaint.1
@@ -149,6 +149,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-alllocalefonts]
 .br
+[\-\-uifont \fIFONT NAME\fP]
+.br
 [\-\-savedir \fIDIR\fP]
 .br
 [\-\-exportdir \fIDIR\fP]
@@ -243,6 +245,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
+[\-\-uifont=default\fP]
+.br
 [\-\-saveoverask]
 .br
 [\-\-save]
@@ -1202,6 +1206,13 @@ except any that match the current locale Tux Paint is running under. Use
 the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
+.TP 8
+.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+Specify the name of a font for Tux Paint to attempt to use for its user
+interface (UI) -- button labels, dialog pop-up text, instructional text at
+the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
+will be used. (This was the default behavior, prior to version 0.9.31.)
+
 .SH OPTIONS - MISCELLANEOUS
 .l
 \fItuxpaint\fP accepts the following options to alter its behavior. They
diff --git a/man/fr_FR.UTF-8/tuxpaint.1 b/man/fr_FR.UTF-8/tuxpaint.1
index 9a17aacda..922d644a6 100644
--- a/man/fr_FR.UTF-8/tuxpaint.1
+++ b/man/fr_FR.UTF-8/tuxpaint.1
@@ -149,6 +149,8 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants.
 .br
 [\-\-alllocalefonts]
 .br
+[\-\-uifont \fIFONT NAME\fP]
+.br
 [\-\-savedir \fIRÉPERTOIRE\fP]
 .br
 [\-\-exportdir \fIRÉPERTOIRE\fP]
@@ -243,6 +245,8 @@ tuxpaint -- "Tux Paint", un programme simple pour les jeunes enfants.
 .br
 [\-\-currentlocalefont]
 .br
+[\-\-uifont=default\fP]
+.br
 [\-\-saveoverask]
 .br
 [\-\-save]
@@ -1236,6 +1240,13 @@ fonctionne Tux Paint. Utilisez l'option "--alllocalefonts" pour charger de
 telles fontes, pour les outils Texte et Étiquette. (C'était le
 comportement par défaut pour les versions antérieures à la 0.9.21).
 
+.TP 8
+.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+Specify the name of a font for Tux Paint to attempt to use for its user
+interface (UI) -- button labels, dialog pop-up text, instructional text at
+the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
+will be used. (This was the default behavior, prior to version 0.9.31.)
+
 .SH OPTIONS - MISCELLANEOUS
 .l
 \fItuxpaint\fP accepte les options suivantes pour modifier son
diff --git a/man/gl_ES.UTF-8/tuxpaint.1 b/man/gl_ES.UTF-8/tuxpaint.1
index 0b5497b8e..aac97e80b 100644
--- a/man/gl_ES.UTF-8/tuxpaint.1
+++ b/man/gl_ES.UTF-8/tuxpaint.1
@@ -149,6 +149,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-alllocalefonts]
 .br
+[\-\-uifont \fIFONT NAME\fP]
+.br
 [\-\-savedir \fIDIR\fP]
 .br
 [\-\-exportdir \fIDIR\fP]
@@ -243,6 +245,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
+[\-\-uifont=default\fP]
+.br
 [\-\-saveoverask]
 .br
 [\-\-save]
@@ -1206,6 +1210,13 @@ except any that match the current locale Tux Paint is running under. Use
 the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
+.TP 8
+.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+Specify the name of a font for Tux Paint to attempt to use for its user
+interface (UI) -- button labels, dialog pop-up text, instructional text at
+the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
+will be used. (This was the default behavior, prior to version 0.9.31.)
+
 .SH OPTIONS - MISCELLANEOUS
 .l
 \fItuxpaint\fP accepts the following options to alter its behavior. They
diff --git a/man/ja_JP.UTF-8/tuxpaint.1 b/man/ja_JP.UTF-8/tuxpaint.1
index d19427dea..430370959 100644
--- a/man/ja_JP.UTF-8/tuxpaint.1
+++ b/man/ja_JP.UTF-8/tuxpaint.1
@@ -149,6 +149,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-alllocalefonts]
 .br
+[\-\-uifont \fIFONT NAME\fP]
+.br
 [\-\-savedir \fIDIR\fP]
 .br
 [\-\-exportdir \fIDIR\fP]
@@ -243,6 +245,8 @@ tuxpaint -- "Tux Paint", a drawing program for young children.
 .br
 [\-\-currentlocalefont]
 .br
+[\-\-uifont=default\fP]
+.br
 [\-\-saveoverask]
 .br
 [\-\-save]
@@ -1205,6 +1209,13 @@ except any that match the current locale Tux Paint is running under. Use
 the "--alllocalefonts" option to load all such fonts, for use in the Text
 and Label tools. (This was the default behavior, prior to version 0.9.21.)
 
+.TP 8
+.B \-\-uifont=\fIFONT NAME\fP \-\-uifont=default
+Specify the name of a font for Tux Paint to attempt to use for its user
+interface (UI) -- button labels, dialog pop-up text, instructional text at
+the bottom. If left unspecified, or "default" is given, then "DejaVu Sans"
+will be used. (This was the default behavior, prior to version 0.9.31.)
+
 .SH OPTIONS - MISCELLANEOUS
 .l
 \fItuxpaint\fP accepts the following options to alter its behavior. They