diff --git a/stella/src/cheat/CheatCodeDialog.cxx b/stella/src/cheat/CheatCodeDialog.cxx
index 0a62caf03..50d6923f1 100644
--- a/stella/src/cheat/CheatCodeDialog.cxx
+++ b/stella/src/cheat/CheatCodeDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: CheatCodeDialog.cxx,v 1.24 2009-01-04 02:28:12 stephena Exp $
+// $Id: CheatCodeDialog.cxx,v 1.25 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -37,21 +37,26 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 CheatCodeDialog::CheatCodeDialog(OSystem* osystem, DialogContainer* parent,
-                                 const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h)
+                                 const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0)
 {
   const int lineHeight   = font.getLineHeight(),
+            fontWidth    = font.getMaxCharWidth(),
             buttonWidth  = font.getStringWidth("Defaults") + 20,
             buttonHeight = font.getLineHeight() + 4;
   int xpos, ypos;
   WidgetArray wid;
   ButtonWidget* b;
 
+  // Set real dimensions
+  _w = 46 * fontWidth + 10;
+  _h = 11 * (lineHeight + 4) + 10;
+
   // List of cheats, with checkboxes to enable/disable
   xpos = 10;  ypos = 10;
   myCheatList =
     new CheckListWidget(this, font, xpos, ypos, _w - buttonWidth - 25,
-                        _h - 3*lineHeight);
+                        _h - 2*buttonHeight - 10);
   myCheatList->setStyle(kXFill);
   myCheatList->setEditable(false);
   wid.push_back(myCheatList);
diff --git a/stella/src/cheat/CheatCodeDialog.hxx b/stella/src/cheat/CheatCodeDialog.hxx
index ab8a13bb3..089180710 100644
--- a/stella/src/cheat/CheatCodeDialog.hxx
+++ b/stella/src/cheat/CheatCodeDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: CheatCodeDialog.hxx,v 1.11 2009-01-01 18:13:34 stephena Exp $
+// $Id: CheatCodeDialog.hxx,v 1.12 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -42,7 +42,7 @@ class CheatCodeDialog : public Dialog
 {
   public:
     CheatCodeDialog(OSystem* osystem, DialogContainer* parent,
-                   const GUI::Font& font, int x, int y, int w, int h);
+                   const GUI::Font& font);
     ~CheatCodeDialog();
 
   protected:
diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx
index 34622d868..9cc4171fb 100644
--- a/stella/src/emucore/OSystem.cxx
+++ b/stella/src/emucore/OSystem.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystem.cxx,v 1.141 2009-01-03 22:57:12 stephena Exp $
+// $Id: OSystem.cxx,v 1.142 2009-01-04 22:27:43 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -53,6 +53,7 @@
 #include "Launcher.hxx"
 #include "Font.hxx"
 #include "StellaFont.hxx"
+#include "StellaMediumFont.hxx"
 #include "StellaLargeFont.hxx"
 #include "ConsoleFont.hxx"
 #include "Widget.hxx"
@@ -179,17 +180,44 @@ bool OSystem::create()
   // it may be needed to initialize the size of graphical objects
   queryVideoHardware();
 
+  ////////////////////////////////////////////////////////////////////
   // Create fonts to draw text
-  // TODO - this should be configurable, and also depend on the minimum
-  //        size of the launcher and maximum size of the TIA window
-  //        The logic must be taken care of here, so the GUI classes
-  //        can just create the interface and not worry about checking
-  myFont         = new GUI::Font(GUI::stellaDesc);
+  // NOTE: the logic determining appropriate font sizes is done here,
+  //       so that the UI classes can just use the font they expect,
+  //       and not worry about it
+  //       This logic should also take into account the size of the
+  //       framebuffer, and try to be intelligent about font sizes
+  //       We can probably add ifdefs to take care of corner cases,
+  //       but the means we've failed to abstract it enough ...
+  ////////////////////////////////////////////////////////////////////
+  bool smallScreen = myDesktopWidth <= 320 || myDesktopHeight <= 240;
+
+  // This font is used in a variety of situations when a really small
+  // font is needed; we let the specific widget/dialog decide when to
+  // use it
+  mySmallFont = new GUI::Font(GUI::stellaDesc);
+
+  // The console font is always the same size (for now at least)
   myConsoleFont  = new GUI::Font(GUI::consoleDesc);
-  if(mySettings->getString("launcherfont") == "small")
-    myLauncherFont = new GUI::Font(GUI::stellaDesc);
+
+  // The general font used in all UI elements
+  // This is determined by the size of the framebuffer
+  myFont = new GUI::Font(smallScreen ? GUI::stellaDesc : GUI::stellaMediumDesc);
+
+  // The font used by the ROM launcher
+  // Normally, this is configurable by the user, except in the case of
+  // very small screens
+  if(!smallScreen)
+  {    
+    if(mySettings->getString("launcherfont") == "small")
+      myLauncherFont = new GUI::Font(GUI::consoleDesc);
+    else if(mySettings->getString("launcherfont") == "medium")
+      myLauncherFont = new GUI::Font(GUI::stellaMediumDesc);
+    else
+      myLauncherFont = new GUI::Font(GUI::stellaLargeDesc);
+  }
   else
-    myLauncherFont = new GUI::Font(GUI::stellaLargeDesc);
+    myLauncherFont = new GUI::Font(GUI::stellaDesc);
 
   // Create the event handler for the system
   myEventHandler = new EventHandler(this);
diff --git a/stella/src/emucore/OSystem.hxx b/stella/src/emucore/OSystem.hxx
index 72faf3cb5..6de8e1aac 100644
--- a/stella/src/emucore/OSystem.hxx
+++ b/stella/src/emucore/OSystem.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystem.hxx,v 1.72 2009-01-03 22:57:12 stephena Exp $
+// $Id: OSystem.hxx,v 1.73 2009-01-04 22:27:43 stephena Exp $
 //============================================================================
 
 #ifndef OSYSTEM_HXX
@@ -56,7 +56,7 @@ typedef Common::Array<Resolution> ResolutionList;
   other objects belong.
 
   @author  Stephen Anthony
-  @version $Id: OSystem.hxx,v 1.72 2009-01-03 22:57:12 stephena Exp $
+  @version $Id: OSystem.hxx,v 1.73 2009-01-04 22:27:43 stephena Exp $
 */
 class OSystem
 {
@@ -182,6 +182,13 @@ class OSystem
     inline CheatManager& cheat() const { return *myCheatManager; }
 #endif
 
+    /**
+      Get the small font object of the system
+
+      @return The font reference
+    */
+    inline const GUI::Font& smallFont() const { return *mySmallFont; }
+
     /**
       Get the font object of the system
 
@@ -501,6 +508,9 @@ class OSystem
 
     string myFeatures;
 
+    // The font object to use when space is very limited
+    GUI::Font* mySmallFont;
+
     // The font object to use for the normal in-game GUI
     GUI::Font* myFont;
 
diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx
index 216dcf1e9..372798644 100644
--- a/stella/src/emucore/Settings.cxx
+++ b/stella/src/emucore/Settings.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Settings.cxx,v 1.153 2009-01-03 22:57:12 stephena Exp $
+// $Id: Settings.cxx,v 1.154 2009-01-04 22:27:43 stephena Exp $
 //============================================================================
 
 #include <cassert>
@@ -88,7 +88,7 @@ Settings::Settings(OSystem* osystem)
 
   // ROM browser options
   setInternal("launcherres", "640x480");
-  setInternal("launcherfont", "small");
+  setInternal("launcherfont", "medium");
   setInternal("romviewer", "0");
   setInternal("lastrom", "");
 
@@ -258,8 +258,8 @@ void Settings::validate()
     setInternal("palette", "standard");
 
   s = getString("launcherfont");
-  if(s != "small" && s != "large")
-    setInternal("launcherfont", "small");
+  if(s != "small" && s != "medium" && s != "large")
+    setInternal("launcherfont", "medium");
 
   i = getInt("romviewer");
   if(i < 0)
@@ -332,7 +332,8 @@ void Settings::usage()
     << "  -listrominfo                 Display contents of stella.pro, one line per ROM entry\n"
     << "  -rominfo      <rom>          Display detailed information for the given ROM\n"
     << "  -launcherres  <WxH>          The resolution to use in ROM launcher mode\n"
-    << "  -launcherfont <small|large>  Use small or large font in the ROM launcher\n"
+    << "  -launcherfont <small|medium| Use the specified font in the ROM launcher\n"
+    << "                 large>\n"
     << "  -uipalette    <1|2>          Used the specified palette for UI elements\n"
     << "  -mwheel       <lines>        Number of lines the mouse wheel will scroll in UI\n"
     << "  -statedir     <dir>          Directory in which to save state files\n"
diff --git a/stella/src/gui/AboutDialog.cxx b/stella/src/gui/AboutDialog.cxx
index 40683830f..69ca71bd9 100644
--- a/stella/src/gui/AboutDialog.cxx
+++ b/stella/src/gui/AboutDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: AboutDialog.cxx,v 1.29 2009-01-03 22:57:12 stephena Exp $
+// $Id: AboutDialog.cxx,v 1.30 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -31,18 +31,23 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 AboutDialog::AboutDialog(OSystem* osystem, DialogContainer* parent,
-                         const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h),
+                         const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0),
     myPage(1),
     myNumPages(6)
 {
   const int lineHeight   = font.getLineHeight(),
+            fontWidth    = font.getMaxCharWidth(),
             fontHeight   = font.getFontHeight(),
             buttonWidth  = font.getStringWidth("Defaults") + 20,
             buttonHeight = font.getLineHeight() + 4;
   int xpos, ypos;
   WidgetArray wid;
 
+  // Set real dimensions
+  _w = 52 * fontWidth + 10;
+  _h = 12 * lineHeight + 20;
+
   // Add Previous, Next and Close buttons
   xpos = 10;  ypos = _h - buttonHeight - 10;
   myPrevButton =
diff --git a/stella/src/gui/AboutDialog.hxx b/stella/src/gui/AboutDialog.hxx
index 678ab6d13..d8be8701a 100644
--- a/stella/src/gui/AboutDialog.hxx
+++ b/stella/src/gui/AboutDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: AboutDialog.hxx,v 1.9 2009-01-01 18:13:38 stephena Exp $
+// $Id: AboutDialog.hxx,v 1.10 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -35,7 +35,7 @@ class AboutDialog : public Dialog
 {
   public:
     AboutDialog(OSystem* osystem, DialogContainer* parent,
-                const GUI::Font& font, int x, int y, int w, int h);
+                const GUI::Font& font);
     ~AboutDialog();
 
   protected:
diff --git a/stella/src/gui/AudioDialog.cxx b/stella/src/gui/AudioDialog.cxx
index 345afa994..ad079b58c 100644
--- a/stella/src/gui/AudioDialog.cxx
+++ b/stella/src/gui/AudioDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: AudioDialog.cxx,v 1.30 2009-01-01 18:13:38 stephena Exp $
+// $Id: AudioDialog.cxx,v 1.31 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -38,8 +38,8 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 AudioDialog::AudioDialog(OSystem* osystem, DialogContainer* parent,
-                         const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h)
+                         const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0)
 {
   const int lineHeight   = font.getLineHeight(),
             fontWidth    = font.getMaxCharWidth(),
@@ -53,8 +53,8 @@ AudioDialog::AudioDialog(OSystem* osystem, DialogContainer* parent,
   StringMap items;
 
   // Set real dimensions
-//  _w = 35 * fontWidth + 10;
-//  _h = 8 * (lineHeight + 4) + 10;
+  _w = 35 * fontWidth + 10;
+  _h = 8 * (lineHeight + 4) + 10;
 
   // Volume
   xpos = 3 * fontWidth;  ypos = 10;
diff --git a/stella/src/gui/AudioDialog.hxx b/stella/src/gui/AudioDialog.hxx
index bb4acc107..16ed59157 100644
--- a/stella/src/gui/AudioDialog.hxx
+++ b/stella/src/gui/AudioDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: AudioDialog.hxx,v 1.13 2009-01-01 18:13:38 stephena Exp $
+// $Id: AudioDialog.hxx,v 1.14 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -36,8 +36,7 @@ class CheckboxWidget;
 class AudioDialog : public Dialog
 {
   public:
-    AudioDialog(OSystem* osystem, DialogContainer* parent,
-                const GUI::Font& font, int x, int y, int w, int h);
+    AudioDialog(OSystem* osystem, DialogContainer* parent, const GUI::Font& font);
     ~AudioDialog();
 
   protected:
diff --git a/stella/src/gui/BrowserDialog.cxx b/stella/src/gui/BrowserDialog.cxx
index 2a0e0ad13..370f4bb77 100644
--- a/stella/src/gui/BrowserDialog.cxx
+++ b/stella/src/gui/BrowserDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: BrowserDialog.cxx,v 1.34 2009-01-02 01:50:03 stephena Exp $
+// $Id: BrowserDialog.cxx,v 1.35 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -22,6 +22,7 @@
 #include "bspf.hxx"
 
 #include "Dialog.hxx"
+#include "DialogContainer.hxx"
 #include "FSNode.hxx"
 #include "GameList.hxx"
 #include "GuiObject.hxx"
@@ -38,9 +39,8 @@
  */
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
-                             int x, int y, int w, int h)
-  : Dialog(&boss->instance(), &boss->parent(), x, y, w, h),
+BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font)
+  : Dialog(&boss->instance(), &boss->parent(), 0, 0, 0, 0),
     CommandSender(boss),
     _fileList(NULL),
     _currentPath(NULL),
@@ -55,8 +55,8 @@ BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
 
   // Set real dimensions
   // This is one dialog that can take as much space as is available
-//  _w = _DLG_MIN_SWIDTH - 30;
-//  _h = _DLG_MIN_SHEIGHT - 30;
+  _w = BSPF_min(instance().desktopWidth(), 480u);
+  _h = BSPF_min(instance().desktopHeight(), 380u);
 
   xpos = 10;  ypos = 4;
   _title = new StaticTextWidget(this, font, xpos, ypos,
@@ -114,9 +114,23 @@ BrowserDialog::~BrowserDialog()
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void BrowserDialog::setStartPath(const string& startpath,
-                                 FilesystemNode::ListMode mode)
+void BrowserDialog::show(const string& title, const string& startpath,
+                         FilesystemNode::ListMode mode, int cmd)
 {
+  // TODO - dialog has to be added before any settings are changed,
+  //        since (for example) changing the title triggers a redraw,
+  //        and the dialog must be added (so it exists) for that to happen
+  // Fixing this requires changes to the underlying widget classes
+  // (ie, changing a widgets contents should signal its dialog that a
+  // redraw is necessary; it shouldn't be responsible for redraw itself)
+  //
+  // Doing it this way has the unfortunate side effect that a previous
+  // title is temporarily visible when re-using the browser for different
+  // purposes
+  parent().addDialog(this);
+
+  _title->setLabel(title);
+  _cmd = cmd;
   _mode = mode;
 
   // If no node has been set, or the last used one is now invalid,
diff --git a/stella/src/gui/BrowserDialog.hxx b/stella/src/gui/BrowserDialog.hxx
index 8d914849b..610d9899b 100644
--- a/stella/src/gui/BrowserDialog.hxx
+++ b/stella/src/gui/BrowserDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: BrowserDialog.hxx,v 1.14 2009-01-01 18:13:38 stephena Exp $
+// $Id: BrowserDialog.hxx,v 1.15 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -36,16 +36,14 @@ class GameList;
 class BrowserDialog : public Dialog, public CommandSender
 {
   public:
-    BrowserDialog(GuiObject* boss, const GUI::Font& font,
-                  int x, int y, int w, int h);
-
+    BrowserDialog(GuiObject* boss, const GUI::Font& font);
     virtual ~BrowserDialog();
 
     const FilesystemNode& getResult() { return _node; }
 
-    void setTitle(const string& title) { _title->setLabel(title); }
-    void setEmitSignal(int cmd) { _cmd = cmd; }
-    void setStartPath(const string& startpath, FilesystemNode::ListMode mode);
+    /** Place the browser window onscreen, using the given attributes */
+    void show(const string& title, const string& startpath,
+              FilesystemNode::ListMode mode, int cmd);
 
   protected:
     virtual void handleCommand(CommandSender* sender, int cmd, int data, int id);
diff --git a/stella/src/gui/FileSnapDialog.cxx b/stella/src/gui/FileSnapDialog.cxx
index ef67c82f9..013775962 100644
--- a/stella/src/gui/FileSnapDialog.cxx
+++ b/stella/src/gui/FileSnapDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FileSnapDialog.cxx,v 1.24 2009-01-03 22:57:12 stephena Exp $
+// $Id: FileSnapDialog.cxx,v 1.25 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -22,7 +22,6 @@
 #include "bspf.hxx"
 
 #include "BrowserDialog.hxx"
-#include "DialogContainer.hxx"
 #include "EditTextWidget.hxx"
 #include "FSNode.hxx"
 #include "LauncherDialog.hxx"
@@ -33,14 +32,14 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 FileSnapDialog::FileSnapDialog(
       OSystem* osystem, DialogContainer* parent,
-      const GUI::Font& font, GuiObject* boss,
-      int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h),
+      const GUI::Font& font, GuiObject* boss)
+  : Dialog(osystem, parent, 0, 0, 0, 0),
     CommandSender(boss),
     myBrowser(NULL),
     myIsGlobal(boss != 0)
 {
   const int lineHeight   = font.getLineHeight(),
+            fontWidth    = font.getMaxCharWidth(),
             buttonWidth  = font.getStringWidth("Properties file:") + 20,
             buttonHeight = font.getLineHeight() + 4;
   const int vBorder = 8;
@@ -49,8 +48,8 @@ FileSnapDialog::FileSnapDialog(
   ButtonWidget* b;
 
   // Set real dimensions
-//  _w = 50 * fontWidth + 10;
-//  _h = 11 * (lineHeight + 4) + 10;
+  _w = 52 * fontWidth + 10;
+  _h = 10 * (lineHeight + 4) + 10;
 
   xpos = vBorder;  ypos = vBorder;
 
@@ -143,7 +142,7 @@ FileSnapDialog::FileSnapDialog(
   }
 
   // Create file browser dialog
-  myBrowser = new BrowserDialog(this, font, 0, 0, 400, 320);
+  myBrowser = new BrowserDialog(this, font);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -204,17 +203,6 @@ void FileSnapDialog::setDefaults()
   mySnap1x->setState(false);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void FileSnapDialog::openBrowser(const string& title, const string& startpath,
-                                 FilesystemNode::ListMode mode, int cmd)
-{
-  parent().addDialog(myBrowser);
-
-  myBrowser->setTitle(title);
-  myBrowser->setEmitSignal(cmd);
-  myBrowser->setStartPath(startpath, mode);
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FileSnapDialog::handleCommand(CommandSender* sender, int cmd,
                                    int data, int id)
@@ -233,33 +221,33 @@ void FileSnapDialog::handleCommand(CommandSender* sender, int cmd,
       break;
 
     case kChooseRomDirCmd:
-      openBrowser("Select ROM directory:", myRomPath->getEditString(),
-                  FilesystemNode::kListDirectoriesOnly, kRomDirChosenCmd);
+      myBrowser->show("Select ROM directory:", myRomPath->getEditString(),
+                      FilesystemNode::kListDirectoriesOnly, kRomDirChosenCmd);
       break;
 
     case kChooseStateDirCmd:
-      openBrowser("Select state directory:", myStatePath->getEditString(),
-                  FilesystemNode::kListDirectoriesOnly, kStateDirChosenCmd);
+      myBrowser->show("Select state directory:", myStatePath->getEditString(),
+                      FilesystemNode::kListDirectoriesOnly, kStateDirChosenCmd);
       break;
 
     case kChooseCheatFileCmd:
-      openBrowser("Select cheat file:", myCheatFile->getEditString(),
-                  FilesystemNode::kListAll, kCheatFileChosenCmd);
+      myBrowser->show("Select cheat file:", myCheatFile->getEditString(),
+                      FilesystemNode::kListAll, kCheatFileChosenCmd);
       break;
 
     case kChoosePaletteFileCmd:
-      openBrowser("Select palette file:", myPaletteFile->getEditString(),
-                  FilesystemNode::kListAll, kPaletteFileChosenCmd);
+      myBrowser->show("Select palette file:", myPaletteFile->getEditString(),
+                      FilesystemNode::kListAll, kPaletteFileChosenCmd);
       break;
 
     case kChoosePropsFileCmd:
-      openBrowser("Select properties file:", myPropsFile->getEditString(),
-                  FilesystemNode::kListAll, kPropsFileChosenCmd);
+      myBrowser->show("Select properties file:", myPropsFile->getEditString(),
+                      FilesystemNode::kListAll, kPropsFileChosenCmd);
       break;
 
     case kChooseSnapDirCmd:
-      openBrowser("Select snapshot directory:", mySnapPath->getEditString(),
-                  FilesystemNode::kListDirectoriesOnly, kSnapDirChosenCmd);
+      myBrowser->show("Select snapshot directory:", mySnapPath->getEditString(),
+                      FilesystemNode::kListDirectoriesOnly, kSnapDirChosenCmd);
       break;
 
     case kRomDirChosenCmd:
diff --git a/stella/src/gui/FileSnapDialog.hxx b/stella/src/gui/FileSnapDialog.hxx
index 05e9ccad5..cf84cc697 100644
--- a/stella/src/gui/FileSnapDialog.hxx
+++ b/stella/src/gui/FileSnapDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FileSnapDialog.hxx,v 1.12 2009-01-03 22:57:12 stephena Exp $
+// $Id: FileSnapDialog.hxx,v 1.13 2009-01-04 22:27:43 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -38,8 +38,7 @@ class FileSnapDialog : public Dialog, public CommandSender
 {
   public:
     FileSnapDialog(OSystem* osystem, DialogContainer* parent,
-                   const GUI::Font& font, GuiObject* boss,
-                   int x, int y, int w, int h);
+                   const GUI::Font& font, GuiObject* boss);
     ~FileSnapDialog();
 
     void handleCommand(CommandSender* sender, int cmd, int data, int id);
@@ -49,9 +48,6 @@ class FileSnapDialog : public Dialog, public CommandSender
     void saveConfig();
     void setDefaults();
 
-    void openBrowser(const string& title, const string& startpath,
-                     FilesystemNode::ListMode mode, int cmd);
-
   private:
     enum {
       kChooseRomDirCmd      = 'LOrm', // rom select
diff --git a/stella/src/gui/GameInfoDialog.cxx b/stella/src/gui/GameInfoDialog.cxx
index 99c9e36dd..e4dac6239 100644
--- a/stella/src/gui/GameInfoDialog.cxx
+++ b/stella/src/gui/GameInfoDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: GameInfoDialog.cxx,v 1.62 2009-01-02 01:50:03 stephena Exp $
+// $Id: GameInfoDialog.cxx,v 1.63 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -36,8 +36,8 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 GameInfoDialog::GameInfoDialog(
       OSystem* osystem, DialogContainer* parent, const GUI::Font& font,
-      GuiObject* boss, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h),
+      GuiObject* boss)
+  : Dialog(osystem, parent, 0, 0, 0, 0),
     CommandSender(boss),
     myPropertiesLoaded(false),
     myDefaultsSelected(false)
@@ -52,6 +52,10 @@ GameInfoDialog::GameInfoDialog(
   WidgetArray wid;
   StringMap items, ports, ctrls;
 
+  // Set real dimensions
+  _w = 54 * fontWidth + 10;
+  _h = 12 * (lineHeight + 4) + 10;
+
   ////////////////////////////////////////////////////////////////////
   // Some of the following items are also present in GlobalPropsDialog
   // If any changes are ever made here, GlobalPropsDialog should also
diff --git a/stella/src/gui/GameInfoDialog.hxx b/stella/src/gui/GameInfoDialog.hxx
index d74fa0bc6..4255925fe 100644
--- a/stella/src/gui/GameInfoDialog.hxx
+++ b/stella/src/gui/GameInfoDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: GameInfoDialog.hxx,v 1.36 2009-01-02 01:50:03 stephena Exp $
+// $Id: GameInfoDialog.hxx,v 1.37 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -40,8 +40,7 @@ class GameInfoDialog : public Dialog, public CommandSender
 {
   public:
     GameInfoDialog(OSystem* osystem, DialogContainer* parent,
-                   const GUI::Font& font, GuiObject* boss,
-                   int x, int y, int w, int h);
+                   const GUI::Font& font, GuiObject* boss);
     virtual ~GameInfoDialog();
 
   protected:
diff --git a/stella/src/gui/GlobalPropsDialog.cxx b/stella/src/gui/GlobalPropsDialog.cxx
index b9e96d790..10e552e04 100644
--- a/stella/src/gui/GlobalPropsDialog.cxx
+++ b/stella/src/gui/GlobalPropsDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: GlobalPropsDialog.cxx,v 1.1 2009-01-02 01:50:03 stephena Exp $
+// $Id: GlobalPropsDialog.cxx,v 1.2 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -33,12 +33,12 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 GlobalPropsDialog::
-  GlobalPropsDialog(GuiObject* boss, const GUI::Font& font, Settings& settings,
-                    int x, int y, int w, int h)
-  : Dialog(&boss->instance(), &boss->parent(), x, y, w, h),
+  GlobalPropsDialog(GuiObject* boss, const GUI::Font& font, Settings& settings)
+  : Dialog(&boss->instance(), &boss->parent(), 0, 0, 0, 0),
     mySettings(settings)
 {
   const int lineHeight   = font.getLineHeight(),
+            fontWidth    = font.getMaxCharWidth(),
             fontHeight   = font.getFontHeight(),
             buttonWidth  = font.getStringWidth("Defaults") + 20,
             buttonHeight = font.getLineHeight() + 4;
@@ -48,6 +48,10 @@ GlobalPropsDialog::
   WidgetArray wid;
   StringMap items;
 
+  // Set real dimensions
+  _w = lwidth + pwidth + fontWidth*3 + 15;
+  _h = 10 * (lineHeight + 4) + buttonHeight + 10;
+
   xpos = 10;  ypos = 10;
 
   ////////////////////////////////////////////////////////////////////
diff --git a/stella/src/gui/GlobalPropsDialog.hxx b/stella/src/gui/GlobalPropsDialog.hxx
index 2d255f058..b59d6228d 100644
--- a/stella/src/gui/GlobalPropsDialog.hxx
+++ b/stella/src/gui/GlobalPropsDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: GlobalPropsDialog.hxx,v 1.1 2009-01-02 01:50:03 stephena Exp $
+// $Id: GlobalPropsDialog.hxx,v 1.2 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -35,9 +35,8 @@ class PopUpWidget;
 class GlobalPropsDialog : public Dialog
 {
   public:
-    GlobalPropsDialog(GuiObject* boss, const GUI::Font& font, Settings& settings,
-                      int x, int y, int w, int h);
-    ~GlobalPropsDialog();
+    GlobalPropsDialog(GuiObject* boss, const GUI::Font& font, Settings& settings);
+    virtual ~GlobalPropsDialog();
 
   private:
     void loadConfig();
diff --git a/stella/src/gui/HelpDialog.cxx b/stella/src/gui/HelpDialog.cxx
index 3906bf22e..56dd71d13 100644
--- a/stella/src/gui/HelpDialog.cxx
+++ b/stella/src/gui/HelpDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: HelpDialog.cxx,v 1.27 2009-01-01 18:13:38 stephena Exp $
+// $Id: HelpDialog.cxx,v 1.28 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -29,8 +29,8 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 HelpDialog::HelpDialog(OSystem* osystem, DialogContainer* parent,
-                       const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h),
+                       const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0),
     myPage(1),
     myNumPages(4)
 {
@@ -42,6 +42,10 @@ HelpDialog::HelpDialog(OSystem* osystem, DialogContainer* parent,
   int xpos, ypos;
   WidgetArray wid;
 
+  // Set real dimensions
+  _w = 46 * fontWidth + 10;
+  _h = 12 * lineHeight + 20;
+
   // Add Previous, Next and Close buttons
   xpos = 10;  ypos = _h - buttonHeight - 10;
   myPrevButton =
diff --git a/stella/src/gui/HelpDialog.hxx b/stella/src/gui/HelpDialog.hxx
index c29160c48..809c06186 100644
--- a/stella/src/gui/HelpDialog.hxx
+++ b/stella/src/gui/HelpDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: HelpDialog.hxx,v 1.11 2009-01-01 18:13:38 stephena Exp $
+// $Id: HelpDialog.hxx,v 1.12 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -40,8 +40,7 @@ class StaticTextWidget;
 class HelpDialog : public Dialog
 {
   public:
-    HelpDialog(OSystem* osystem, DialogContainer* parent,
-               const GUI::Font& font, int x, int y, int w, int h);
+    HelpDialog(OSystem* osystem, DialogContainer* parent, const GUI::Font& font);
     ~HelpDialog();
 
   protected:
diff --git a/stella/src/gui/InputDialog.cxx b/stella/src/gui/InputDialog.cxx
index e2bfcb0a9..ce36126d7 100644
--- a/stella/src/gui/InputDialog.cxx
+++ b/stella/src/gui/InputDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: InputDialog.cxx,v 1.35 2009-01-01 18:13:38 stephena Exp $
+// $Id: InputDialog.cxx,v 1.36 2009-01-04 22:27:44 stephena Exp $
 //============================================================================
 
 #include "bspf.hxx"
@@ -35,17 +35,19 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 InputDialog::InputDialog(OSystem* osystem, DialogContainer* parent,
-                         const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h)
+                         const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0)
 {
-  const int buttonHeight = font.getLineHeight() + 4;
+  const int lineHeight   = font.getLineHeight(),
+            fontWidth    = font.getMaxCharWidth(),
+            buttonHeight = font.getLineHeight() + 4;
   const int vBorder = 4;
   int xpos, ypos, tabID;
   WidgetArray wid;
 
   // Set real dimensions
-//  _w = 42 * fontWidth + 10;
-//  _h = 12 * (lineHeight + 4) + 10;
+  _w = 42 * fontWidth + 10;
+  _h = 12 * (lineHeight + 4) + 10;
 
   // The tab widget
   xpos = 2; ypos = vBorder;
@@ -123,7 +125,7 @@ void InputDialog::addVDeviceTab(const GUI::Font& font)
   wid.push_back(myRightPort);
 
   lwidth = font.getStringWidth("Paddle threshold: ");
-  pwidth = font.getMaxCharWidth() * 5;
+  pwidth = font.getMaxCharWidth() * 8;
 
   // Add joystick deadzone setting
   ypos += 2*lineHeight;
diff --git a/stella/src/gui/InputDialog.hxx b/stella/src/gui/InputDialog.hxx
index 13caf0399..54390672a 100644
--- a/stella/src/gui/InputDialog.hxx
+++ b/stella/src/gui/InputDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: InputDialog.hxx,v 1.19 2009-01-01 18:13:38 stephena Exp $
+// $Id: InputDialog.hxx,v 1.20 2009-01-04 22:27:44 stephena Exp $
 //============================================================================
 
 #ifndef INPUT_DIALOG_HXX
@@ -36,7 +36,7 @@ class InputDialog : public Dialog
 {
   public:
     InputDialog(OSystem* osystem, DialogContainer* parent,
-                const GUI::Font& font, int x, int y, int w, int h);
+                const GUI::Font& font);
     ~InputDialog();
 
   protected:
diff --git a/stella/src/gui/LauncherDialog.cxx b/stella/src/gui/LauncherDialog.cxx
index 654b5fb25..837afab3c 100644
--- a/stella/src/gui/LauncherDialog.cxx
+++ b/stella/src/gui/LauncherDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: LauncherDialog.cxx,v 1.96 2009-01-04 02:28:12 stephena Exp $
+// $Id: LauncherDialog.cxx,v 1.97 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -100,8 +100,9 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
   if(romWidth > 0)
   {
     xpos += myList->getWidth() + 5;
-    myRomInfoWidget = new RomInfoWidget(this, instance().consoleFont(), xpos, ypos,
-                                        romWidth, myList->getHeight());
+    myRomInfoWidget =
+      new RomInfoWidget(this, romWidth < 660 ? instance().smallFont() : instance().consoleFont(),
+                        xpos, ypos, romWidth, myList->getHeight());
   }
 
   // Add note textwidget to show any notes for the currently selected ROM
@@ -168,13 +169,12 @@ LauncherDialog::LauncherDialog(OSystem* osystem, DialogContainer* parent,
   l.push_back("Override properties", "override");
   l.push_back("Filter listing", "filter");
   l.push_back("Reload listing", "reload");
-  myMenu = new ContextMenu(this, font, l);
+  myMenu = new ContextMenu(this, osystem->font(), l);
 
   // Create global props dialog, which is uses to to temporarily overrride
   // ROM properties
   myGlobalProps =
-    new GlobalPropsDialog(this, osystem->font(), osystem->settings(),
-                          0, 0, 440, 270);
+    new GlobalPropsDialog(this, osystem->font(), osystem->settings());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/stella/src/gui/OptionsDialog.cxx b/stella/src/gui/OptionsDialog.cxx
index 6d60b67bf..fb16c1697 100644
--- a/stella/src/gui/OptionsDialog.cxx
+++ b/stella/src/gui/OptionsDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OptionsDialog.cxx,v 1.76 2009-01-01 18:13:38 stephena Exp $
+// $Id: OptionsDialog.cxx,v 1.77 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -115,16 +115,11 @@ OptionsDialog::OptionsDialog(OSystem* osystem, DialogContainer* parent,
   wid.push_back(b);
   addCancelWidget(b);
 
-  // Set some sane values for the dialog boxes
-  int x = 0, y = 0, w, h;
-
   // Now create all the dialogs attached to each menu button
-  w = 410; h = 275;
-  myVideoDialog = new VideoDialog(osystem, parent, font, x, y, w, h);
-
-  w = 285; h = 200;
-  myAudioDialog = new AudioDialog(osystem, parent, font, x, y, w, h);
+  myVideoDialog = new VideoDialog(osystem, parent, font);
+  myAudioDialog = new AudioDialog(osystem, parent, font);
 
+/*  FIXME - may not be needed with small-font functionality
 #ifdef _WIN32_WCE
   // FIXME - adjust size for WINCE using a smaller font
   // we scale the input dialog down a bit in low res devices.
@@ -134,31 +129,17 @@ OptionsDialog::OptionsDialog(OSystem* osystem, DialogContainer* parent,
 #else
   w = 380; h = 310;
 #endif
-  myInputDialog = new InputDialog(osystem, parent, font, x, y, w, h);
-
-  w = 380; h = 220;
-  myUIDialog = new UIDialog(osystem, parent, font, x, y, w, h);
-
-  w = 480; h = 250;
-  myFileSnapDialog = new FileSnapDialog(osystem, parent, font,
-                                        boss, x, y, w, h);
-
-  w = 440; h = 160;
-  myRomAuditDialog = new RomAuditDialog(osystem, parent, font, x, y, w, h);
-
-  w = 470; h = 300;
-  myGameInfoDialog = new GameInfoDialog(osystem, parent, font, this, x, y, w, h);
-
+*/
+  myInputDialog = new InputDialog(osystem, parent, font);
+  myUIDialog = new UIDialog(osystem, parent, font);
+  myFileSnapDialog = new FileSnapDialog(osystem, parent, font, boss);
+  myRomAuditDialog = new RomAuditDialog(osystem, parent, font);
+  myGameInfoDialog = new GameInfoDialog(osystem, parent, font, this);
 #ifdef CHEATCODE_SUPPORT
-  w = 380; h = 240;
-  myCheatCodeDialog = new CheatCodeDialog(osystem, parent, font, x, y, w, h);
+  myCheatCodeDialog = new CheatCodeDialog(osystem, parent, font);
 #endif
-
-  w = 420; h = 270;
-  myHelpDialog = new HelpDialog(osystem, parent, font, x, y, w, h);
-
-  w = 480; h = 270;
-  myAboutDialog = new AboutDialog(osystem, parent, font, x, y, w, h);
+  myHelpDialog = new HelpDialog(osystem, parent, font);
+  myAboutDialog = new AboutDialog(osystem, parent, font);
 
   addToFocusList(wid);
 
@@ -174,6 +155,7 @@ OptionsDialog::OptionsDialog(OSystem* osystem, DialogContainer* parent,
 #ifdef _WIN32_WCE
   myAudioSettingsButton->clearFlags(WIDGET_ENABLED);  // not honored in wince port
 #endif
+//FIXME - this may no longer be true (with the new small font functionality)
   if(instance().desktopWidth() < 320)
   {
     // These cannot be displayed in low res devices
diff --git a/stella/src/gui/RomAuditDialog.cxx b/stella/src/gui/RomAuditDialog.cxx
index fbbab9e4d..d04d5d0b3 100644
--- a/stella/src/gui/RomAuditDialog.cxx
+++ b/stella/src/gui/RomAuditDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: RomAuditDialog.cxx,v 1.8 2009-01-01 18:13:39 stephena Exp $
+// $Id: RomAuditDialog.cxx,v 1.9 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -34,38 +34,44 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 RomAuditDialog::RomAuditDialog(OSystem* osystem, DialogContainer* parent,
-                               const GUI::Font& font,
-                               int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h),
+                               const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0),
     myBrowser(NULL)
 {
   const int vBorder = 8;
-  const int bwidth  = font.getStringWidth("Audit path:") + 20,
-            bheight = font.getLineHeight() + 4,
-            fontHeight = font.getLineHeight(),
+
+  const int lineHeight   = font.getLineHeight(),
+            fontWidth    = font.getMaxCharWidth(),
+            fontHeight   = font.getFontHeight(),
+            buttonWidth  = font.getStringWidth("Audit path:") + 20,
+            buttonHeight = font.getLineHeight() + 4,
             lwidth = font.getStringWidth("ROMs with properties (renamed): ");
   int xpos = vBorder, ypos = vBorder;
   WidgetArray wid;
 
+  // Set real dimensions
+  _w = 44 * fontWidth + 10;
+  _h = 7 * (lineHeight + 4) + 10;
+
   // Audit path
   ButtonWidget* romButton = 
-    new ButtonWidget(this, font, xpos, ypos, bwidth, bheight, "Audit path:",
-                     kChooseAuditDirCmd);
+    new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight,
+                     "Audit path:", kChooseAuditDirCmd);
   wid.push_back(romButton);
-  xpos += bwidth + 10;
+  xpos += buttonWidth + 10;
   myRomPath = new EditTextWidget(this, font, xpos, ypos + 2,
-                                 _w - xpos - 10, font.getLineHeight(), "");
+                                 _w - xpos - 10, lineHeight, "");
   wid.push_back(myRomPath);
 
   // Show results of ROM audit
-  xpos = vBorder + 10;  ypos += bheight + 10;
+  xpos = vBorder + 10;  ypos += buttonHeight + 10;
   new StaticTextWidget(this, font, xpos, ypos, lwidth, fontHeight,
                        "ROMs with properties (renamed): ", kTextAlignLeft);
   myResults1 = new StaticTextWidget(this, font, xpos + lwidth, ypos,
                                     _w - lwidth - 20, fontHeight, "",
                                     kTextAlignLeft);
   myResults1->setFlags(WIDGET_CLEARBG);
-  ypos += bheight;
+  ypos += buttonHeight;
   new StaticTextWidget(this, font, xpos, ypos, lwidth, fontHeight,
                        "ROMs without properties: ", kTextAlignLeft);
   myResults2 = new StaticTextWidget(this, font, xpos + lwidth, ypos,
@@ -73,9 +79,9 @@ RomAuditDialog::RomAuditDialog(OSystem* osystem, DialogContainer* parent,
                                     kTextAlignLeft);
   myResults2->setFlags(WIDGET_CLEARBG);
 
-  ypos += bheight + 8;
+  ypos += buttonHeight + 8;
   new StaticTextWidget(this, font, xpos, ypos, _w - 20, fontHeight,
-                       "(*) Warning: this operation cannot be undone",
+                       "(*) WARNING: operation cannot be undone",
                        kTextAlignLeft);
 
   // Add OK and Cancel buttons
@@ -84,7 +90,7 @@ RomAuditDialog::RomAuditDialog(OSystem* osystem, DialogContainer* parent,
   addBGroupToFocusList(wid);
 
   // Create file browser dialog
-  myBrowser = new BrowserDialog(this, font, 0, 0, 400, 320);
+  myBrowser = new BrowserDialog(this, font);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -158,17 +164,6 @@ void RomAuditDialog::auditRoms()
   myResults2->setValue(notfound);
 }
 
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void RomAuditDialog::openBrowser(const string& title, const string& startpath,
-                                 FilesystemNode::ListMode mode, int cmd)
-{
-  parent().addDialog(myBrowser);
-
-  myBrowser->setTitle(title);
-  myBrowser->setEmitSignal(cmd);
-  myBrowser->setStartPath(startpath, mode);
-}
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void RomAuditDialog::handleCommand(CommandSender* sender, int cmd,
                                    int data, int id)
@@ -180,8 +175,8 @@ void RomAuditDialog::handleCommand(CommandSender* sender, int cmd,
       break;
 
     case kChooseAuditDirCmd:
-      openBrowser("Select ROM directory to audit:", myRomPath->getEditString(),
-                  FilesystemNode::kListDirectoriesOnly, kAuditDirChosenCmd);
+      myBrowser->show("Select ROM directory to audit:", myRomPath->getEditString(),
+                      FilesystemNode::kListDirectoriesOnly, kAuditDirChosenCmd);
       break;
 
     case kAuditDirChosenCmd:
diff --git a/stella/src/gui/RomAuditDialog.hxx b/stella/src/gui/RomAuditDialog.hxx
index b75153d78..2adc0412c 100644
--- a/stella/src/gui/RomAuditDialog.hxx
+++ b/stella/src/gui/RomAuditDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: RomAuditDialog.hxx,v 1.2 2009-01-01 18:13:39 stephena Exp $
+// $Id: RomAuditDialog.hxx,v 1.3 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -37,7 +37,7 @@ class RomAuditDialog : public Dialog
 {
   public:
     RomAuditDialog(OSystem* osystem, DialogContainer* parent,
-                   const GUI::Font& font, int x, int y, int w, int h);
+                   const GUI::Font& font);
     ~RomAuditDialog();
 
     void handleCommand(CommandSender* sender, int cmd, int data, int id);
diff --git a/stella/src/gui/RomInfoWidget.cxx b/stella/src/gui/RomInfoWidget.cxx
index a5af01925..b90b1a08f 100644
--- a/stella/src/gui/RomInfoWidget.cxx
+++ b/stella/src/gui/RomInfoWidget.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: RomInfoWidget.cxx,v 1.14 2009-01-03 22:57:12 stephena Exp $
+// $Id: RomInfoWidget.cxx,v 1.15 2009-01-04 22:27:44 stephena Exp $
 //============================================================================
 
 #include <cstring>
@@ -204,9 +204,10 @@ void RomInfoWidget::drawWidget(bool hilite)
   }
   else if(mySurfaceErrorMsg != "")
   {
-    uInt32 x = _x + ((_w - _font->getStringWidth(mySurfaceErrorMsg)) >> 1);
-    uInt32 y = _y + ((yoff - _font->getLineHeight()) >> 1);
-    s.drawString(_font, mySurfaceErrorMsg, x, y, _w - 10, _textcolor);
+    const GUI::Font* font = &instance().font();
+    uInt32 x = _x + ((_w - font->getStringWidth(mySurfaceErrorMsg)) >> 1);
+    uInt32 y = _y + ((yoff - font->getLineHeight()) >> 1);
+    s.drawString(font, mySurfaceErrorMsg, x, y, _w - 10, _textcolor);
   }
   int xpos = _x + 5, ypos = _y + yoff + 10;
   for(unsigned int i = 0; i < myRomInfo.size(); ++i)
diff --git a/stella/src/gui/StellaFont.hxx b/stella/src/gui/StellaFont.hxx
index 9d3f1a6e9..d7970aec8 100644
--- a/stella/src/gui/StellaFont.hxx
+++ b/stella/src/gui/StellaFont.hxx
@@ -8,12 +8,12 @@
 //  SS  SS   tt   ee      ll   ll  aa  aa
 //   SSSS     ttt  eeeee llll llll  aaaaa
 //
-// Copyright (c) 1995-2009 by Bradford W. Mott and the Stella team
+// Copyright (c) 1995-2008 by Bradford W. Mott and the Stella team
 //
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: StellaFont.hxx,v 1.12 2009-01-01 18:13:39 stephena Exp $
+// $Id: StellaFont.hxx,v 1.13 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -28,47 +28,39 @@
 namespace GUI {
 
 /* Font information:
-   name: m_9x18b
-   facename: -Misc-Fixed-Bold-R-Normal--18-120-100-100-C-90-ISO8859-1
-   w x h: 9x18
-   bbx: 9 18 0 -4
+   name: s_6x10
+   facename: -Misc-Fixed-Medium-R-Normal--10-100-75-75-C-60-ISO8859-1
+   w x h: 6x10
+   bbx: 6 10 0 -2
    size: 95
-   ascent: 14
-   descent: 4
+   ascent: 8
+   descent: 2
    first char: 32 (0x20)
    last char: 126 (0x7e)
    default char: 32 (0x20)
    proportional: no
-   Public domain font.  Share and enjoy.
+   Public domain terminal emulator font.  Share and enjoy.
 */
 
 /* Font character bitmap data. */
 static const uInt16 _stella_font_bits[] = {
 
 /* Character 32 (0x20):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
@@ -80,96 +72,56 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
 
 /* Character 33 (0x21):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |      |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
 0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 34 (0x22):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |  ** **  |
-   |  ** **  |
-   |  ** **  |
-   |  ** **  |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | * *  |
+   | * *  |
+   | * *  |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x3600,
-0x3600,
-0x3600,
-0x3600,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
+0x5000,
+0x5000,
+0x5000,
 0x0000,
 0x0000,
 0x0000,
@@ -178,218 +130,138 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 
 /* Character 35 (0x23):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |  ** **  |
-   |  ** **  |
-   |  ** **  |
-   | ******* |
-   |  ** **  |
-   |  ** **  |
-   | ******* |
-   |  ** **  |
-   |  ** **  |
-   |  ** **  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | * *  |
+   | * *  |
+   |***** |
+   | * *  |
+   |***** |
+   | * *  |
+   | * *  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3600,
-0x3600,
-0x3600,
-0x7f00,
-0x3600,
-0x3600,
-0x7f00,
-0x3600,
-0x3600,
-0x3600,
-0x0000,
-0x0000,
+0x5000,
+0x5000,
+0xf800,
+0x5000,
+0xf800,
+0x5000,
+0x5000,
 0x0000,
 0x0000,
 
 /* Character 36 (0x24):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   | ******  |
-   |** ** ** |
-   |** **    |
-   | ****    |
-   |  ****   |
-   |   ****  |
-   |   ** ** |
-   |** ** ** |
-   | ******  |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   | ***  |
+   |* *   |
+   | ***  |
+   |  * * |
+   | ***  |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x7e00,
-0xdb00,
-0xd800,
-0x7800,
-0x3c00,
-0x1e00,
-0x1b00,
-0xdb00,
-0x7e00,
-0x1800,
-0x0000,
+0x2000,
+0x7000,
+0xa000,
+0x7000,
+0x2800,
+0x7000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 37 (0x25):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ***  ** |
-   |** ****  |
-   |** ****  |
-   | ** **   |
-   |   **    |
-   |   **    |
-   |  ** **  |
-   | **** ** |
-   | **** ** |
-   |**  ***  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | *  * |
+   |* * * |
+   | * *  |
+   |  *   |
+   | * *  |
+   |* * * |
+   |*  *  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7300,
-0xde00,
-0xde00,
-0x6c00,
-0x1800,
-0x1800,
-0x3600,
-0x7b00,
-0x7b00,
-0xce00,
-0x0000,
-0x0000,
+0x4800,
+0xa800,
+0x5000,
+0x2000,
+0x5000,
+0xa800,
+0x9000,
 0x0000,
 0x0000,
 
 /* Character 38 (0x26):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ***     |
-   |** **    |
-   |** **    |
-   |** **    |
-   | ***     |
-   | ***  ** |
-   |** ****  |
-   |**  **   |
-   |** ****  |
-   | ***  ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | *    |
+   |* *   |
+   |* *   |
+   | *    |
+   |* * * |
+   |*  *  |
+   | ** * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7000,
-0xd800,
-0xd800,
-0xd800,
-0x7000,
-0x7300,
-0xde00,
-0xcc00,
-0xde00,
-0x7300,
-0x0000,
-0x0000,
+0x4000,
+0xa000,
+0xa000,
+0x4000,
+0xa800,
+0x9000,
+0x6800,
 0x0000,
 0x0000,
 
 /* Character 39 (0x27):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   |  *   |
+   |  *   |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
+0x2000,
+0x2000,
+0x2000,
 0x0000,
 0x0000,
 0x0000,
@@ -398,205 +270,133 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 
 /* Character 40 (0x28):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |    **   |
-   |   **    |
-   |   **    |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |   **    |
-   |   **    |
-   |    **   |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |   *  |
+   |  *   |
+   | *    |
+   | *    |
+   | *    |
+   |  *   |
+   |   *  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0c00,
-0x1800,
-0x1800,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x1800,
-0x1800,
-0x0c00,
-0x0000,
+0x1000,
+0x2000,
+0x4000,
+0x4000,
+0x4000,
+0x2000,
+0x1000,
 0x0000,
 0x0000,
 
 /* Character 41 (0x29):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |  **     |
-   |   **    |
-   |   **    |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |   **    |
-   |   **    |
-   |  **     |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | *    |
+   |  *   |
+   |   *  |
+   |   *  |
+   |   *  |
+   |  *   |
+   | *    |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x3000,
-0x1800,
-0x1800,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x1800,
-0x1800,
-0x3000,
-0x0000,
+0x4000,
+0x2000,
+0x1000,
+0x1000,
+0x1000,
+0x2000,
+0x4000,
 0x0000,
 0x0000,
 
 /* Character 42 (0x2a):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |** ** ** |
-   | ******  |
-   |  ****   |
-   | ******  |
-   |** ** ** |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |*   * |
+   | * *  |
+   |***** |
+   | * *  |
+   |*   * |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1800,
-0xdb00,
-0x7e00,
-0x3c00,
-0x7e00,
-0xdb00,
-0x1800,
-0x0000,
-0x0000,
+0x8800,
+0x5000,
+0xf800,
+0x5000,
+0x8800,
 0x0000,
 0x0000,
 0x0000,
 
 /* Character 43 (0x2b):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   |   **    |
-   |******** |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |  *   |
+   |  *   |
+   |***** |
+   |  *   |
+   |  *   |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x1800,
-0xff00,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
+0x2000,
+0x2000,
+0xf800,
+0x2000,
+0x2000,
 0x0000,
 0x0000,
 0x0000,
 
 /* Character 44 (0x2c):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |   ***   |
-   |    **   |
-   |   **    |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |  **  |
+   |  *   |
+   | *    |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
@@ -604,57 +404,33 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x1c00,
-0x0c00,
-0x1800,
-0x0000,
+0x3000,
+0x2000,
+0x4000,
 0x0000,
 
 /* Character 45 (0x2d):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |      |
+   |***** |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x0000,
-0x0000,
-0x0000,
+0xf800,
 0x0000,
 0x0000,
 0x0000,
@@ -662,29 +438,21 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 
 /* Character 46 (0x2e):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |  *   |
+   | ***  |
+   |  *   |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
@@ -692,2124 +460,1348 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x1c00,
-0x0000,
-0x0000,
-0x0000,
+0x2000,
+0x7000,
+0x2000,
 0x0000,
 
 /* Character 47 (0x2f):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |      ** |
-   |     **  |
-   |     **  |
-   |    **   |
-   |   **    |
-   |   **    |
-   |  **     |
-   | **      |
-   | **      |
-   |**       |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |    * |
+   |    * |
+   |   *  |
+   |  *   |
+   | *    |
+   |*     |
+   |*     |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0300,
-0x0600,
-0x0600,
-0x0c00,
-0x1800,
-0x1800,
-0x3000,
-0x6000,
-0x6000,
-0xc000,
-0x0000,
-0x0000,
+0x0800,
+0x0800,
+0x1000,
+0x2000,
+0x4000,
+0x8000,
+0x8000,
 0x0000,
 0x0000,
 
 /* Character 48 (0x30):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   | * *  |
+   |*   * |
+   |*   * |
+   |*   * |
+   | * *  |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0000,
-0x0000,
+0x2000,
+0x5000,
+0x8800,
+0x8800,
+0x8800,
+0x5000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 49 (0x31):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |  ***    |
-   | ****    |
-   |** **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |******** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   | **   |
+   |* *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |***** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x3800,
-0x7800,
-0xd800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0xff00,
-0x0000,
-0x0000,
+0x2000,
+0x6000,
+0xa000,
+0x2000,
+0x2000,
+0x2000,
+0xf800,
 0x0000,
 0x0000,
 
 /* Character 50 (0x32):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   |      ** |
-   |      ** |
-   |     **  |
-   |    **   |
-   |   **    |
-   |  **     |
-   | ******* |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |    * |
+   |  **  |
+   | *    |
+   |*     |
+   |***** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x0300,
-0x0300,
-0x0600,
-0x0c00,
-0x1800,
+0x7000,
+0x8800,
+0x0800,
 0x3000,
-0x7f00,
-0x0000,
-0x0000,
+0x4000,
+0x8000,
+0xf800,
 0x0000,
 0x0000,
 
 /* Character 51 (0x33):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   |      ** |
-   |     **  |
-   |    **   |
-   |   ***   |
-   |     **  |
-   |      ** |
-   |      ** |
-   | **  **  |
-   |  ****   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |    * |
+   |   *  |
+   |  **  |
+   |    * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x0300,
-0x0600,
-0x0c00,
-0x1c00,
-0x0600,
-0x0300,
-0x0300,
-0x6600,
-0x3c00,
-0x0000,
-0x0000,
+0xf800,
+0x0800,
+0x1000,
+0x3000,
+0x0800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 52 (0x34):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |     **  |
-   |    ***  |
-   |   ****  |
-   |  ** **  |
-   | **  **  |
-   | **  **  |
-   | ******* |
-   |     **  |
-   |     **  |
-   |     **  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |   *  |
+   |  **  |
+   | * *  |
+   |*  *  |
+   |***** |
+   |   *  |
+   |   *  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0600,
-0x0e00,
-0x1e00,
-0x3600,
-0x6600,
-0x6600,
-0x7f00,
-0x0600,
-0x0600,
-0x0600,
-0x0000,
-0x0000,
+0x1000,
+0x3000,
+0x5000,
+0x9000,
+0xf800,
+0x1000,
+0x1000,
 0x0000,
 0x0000,
 
 /* Character 53 (0x35):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   | **      |
-   | **      |
-   | **      |
-   | *****   |
-   |     **  |
-   |      ** |
-   |      ** |
-   | **  **  |
-   |  ****   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |*     |
+   |* **  |
+   |**  * |
+   |    * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x6000,
-0x6000,
-0x6000,
-0x7c00,
-0x0600,
-0x0300,
-0x0300,
-0x6600,
-0x3c00,
-0x0000,
-0x0000,
+0xf800,
+0x8000,
+0xb000,
+0xc800,
+0x0800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 54 (0x36):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ****  |
-   |  **     |
-   | **      |
-   | **      |
-   | *****   |
-   | **  **  |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  **  |
+   | *    |
+   |*     |
+   |* **  |
+   |**  * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1e00,
 0x3000,
-0x6000,
-0x6000,
-0x7c00,
-0x6600,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0000,
-0x0000,
+0x4000,
+0x8000,
+0xb000,
+0xc800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 55 (0x37):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   |      ** |
-   |     **  |
-   |     **  |
-   |    **   |
-   |    **   |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |    * |
+   |   *  |
+   |   *  |
+   |  *   |
+   | *    |
+   | *    |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x0300,
-0x0600,
-0x0600,
-0x0c00,
-0x0c00,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
+0xf800,
+0x0800,
+0x1000,
+0x1000,
+0x2000,
+0x4000,
+0x4000,
 0x0000,
 0x0000,
 
 /* Character 56 (0x38):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*   * |
+   | ***  |
+   |*   * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x3600,
-0x1c00,
-0x3600,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8800,
+0x7000,
+0x8800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 57 (0x39):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   |  ** *** |
-   |   ***** |
-   |      ** |
-   |      ** |
-   |     **  |
-   |  ****   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*  ** |
+   | ** * |
+   |    * |
+   |   *  |
+   | **   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x6300,
-0x3700,
-0x1f00,
-0x0300,
-0x0300,
-0x0600,
-0x3c00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x9800,
+0x6800,
+0x0800,
+0x1000,
+0x6000,
 0x0000,
 0x0000,
 
 /* Character 58 (0x3a):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |  *   |
+   | ***  |
+   |  *   |
+   |      |
+   |  *   |
+   | ***  |
+   |  *   |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
+0x2000,
+0x7000,
+0x2000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x1c00,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x1c00,
-0x0000,
-0x0000,
-0x0000,
+0x2000,
+0x7000,
+0x2000,
 0x0000,
 
 /* Character 59 (0x3b):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |   ***   |
-   |    **   |
-   |   **    |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |  *   |
+   | ***  |
+   |  *   |
+   |      |
+   |  **  |
+   |  *   |
+   | *    |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
+0x2000,
+0x7000,
+0x2000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x1c00,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x1c00,
-0x0c00,
-0x1800,
-0x0000,
+0x3000,
+0x2000,
+0x4000,
 0x0000,
 
 /* Character 60 (0x3c):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |     **  |
-   |    **   |
-   |   **    |
-   |  **     |
-   | **      |
-   |  **     |
-   |   **    |
-   |    **   |
-   |     **  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |    * |
+   |   *  |
+   |  *   |
+   | *    |
+   |  *   |
+   |   *  |
+   |    * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0600,
-0x0c00,
-0x1800,
-0x3000,
-0x6000,
-0x3000,
-0x1800,
-0x0c00,
-0x0600,
-0x0000,
-0x0000,
+0x0800,
+0x1000,
+0x2000,
+0x4000,
+0x2000,
+0x1000,
+0x0800,
 0x0000,
 0x0000,
 
 /* Character 61 (0x3d):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   |         |
-   |         |
-   | ******* |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |***** |
+   |      |
+   |***** |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
+0xf800,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x0000,
-0x0000,
-0x7f00,
-0x0000,
-0x0000,
+0xf800,
 0x0000,
 0x0000,
 0x0000,
 0x0000,
 
 /* Character 62 (0x3e):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | **      |
-   |  **     |
-   |   **    |
-   |    **   |
-   |     **  |
-   |    **   |
-   |   **    |
-   |  **     |
-   | **      |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | *    |
+   |  *   |
+   |   *  |
+   |    * |
+   |   *  |
+   |  *   |
+   | *    |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6000,
-0x3000,
-0x1800,
-0x0c00,
-0x0600,
-0x0c00,
-0x1800,
-0x3000,
-0x6000,
-0x0000,
-0x0000,
+0x4000,
+0x2000,
+0x1000,
+0x0800,
+0x1000,
+0x2000,
+0x4000,
 0x0000,
 0x0000,
 
 /* Character 63 (0x3f):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   |      ** |
-   |     **  |
-   |    **   |
-   |   **    |
-   |   **    |
-   |         |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |   *  |
+   |  *   |
+   |  *   |
+   |      |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
+0x7000,
+0x8800,
+0x1000,
+0x2000,
+0x2000,
 0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x0300,
-0x0600,
-0x0c00,
-0x1800,
-0x1800,
-0x0000,
-0x1800,
-0x0000,
-0x0000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 64 (0x40):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   | **   ** |
-   |**  ** **|
-   |** * * **|
-   |** * * **|
-   |** * * **|
-   |** * * **|
-   |**  **** |
-   | **      |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*  ** |
+   |* * * |
+   |* **  |
+   |*     |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x6300,
-0xcd80,
-0xd580,
-0xd580,
-0xd580,
-0xd580,
-0xcf00,
-0x6000,
-0x3e00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x9800,
+0xa800,
+0xb000,
+0x8000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 65 (0x41):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |    *    |
-   |   ***   |
-   |   ***   |
-   |   ***   |
-   |  ** **  |
-   |  *****  |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   | * *  |
+   |*   * |
+   |*   * |
+   |***** |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0800,
-0x1c00,
-0x1c00,
-0x1c00,
-0x3600,
-0x3e00,
-0x3600,
-0x6300,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x2000,
+0x5000,
+0x8800,
+0x8800,
+0xf800,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 66 (0x42):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ******  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ******  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |****  |
+   | *  * |
+   | *  * |
+   | ***  |
+   | *  * |
+   | *  * |
+   |****  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7e00,
-0x6300,
-0x6300,
-0x6300,
-0x7e00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x7e00,
-0x0000,
-0x0000,
+0xf000,
+0x4800,
+0x4800,
+0x7000,
+0x4800,
+0x4800,
+0xf000,
 0x0000,
 0x0000,
 
 /* Character 67 (0x43):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ****  |
-   |  **  ** |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   |  **  ** |
-   |   ****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*     |
+   |*     |
+   |*     |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1e00,
-0x3300,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x3300,
-0x1e00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8000,
+0x8000,
+0x8000,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 68 (0x44):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | *****   |
-   | **  **  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **  **  |
-   | *****   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |****  |
+   | *  * |
+   | *  * |
+   | *  * |
+   | *  * |
+   | *  * |
+   |****  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7c00,
-0x6600,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6600,
-0x7c00,
-0x0000,
-0x0000,
+0xf000,
+0x4800,
+0x4800,
+0x4800,
+0x4800,
+0x4800,
+0xf000,
 0x0000,
 0x0000,
 
 /* Character 69 (0x45):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   | **      |
-   | **      |
-   | **      |
-   | *****   |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | ******* |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |*     |
+   |*     |
+   |****  |
+   |*     |
+   |*     |
+   |***** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x6000,
-0x6000,
-0x6000,
-0x7c00,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x7f00,
-0x0000,
-0x0000,
+0xf800,
+0x8000,
+0x8000,
+0xf000,
+0x8000,
+0x8000,
+0xf800,
 0x0000,
 0x0000,
 
 /* Character 70 (0x46):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   | **      |
-   | **      |
-   | **      |
-   | *****   |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |*     |
+   |*     |
+   |****  |
+   |*     |
+   |*     |
+   |*     |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x6000,
-0x6000,
-0x6000,
-0x7c00,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x0000,
-0x0000,
+0xf800,
+0x8000,
+0x8000,
+0xf000,
+0x8000,
+0x8000,
+0x8000,
 0x0000,
 0x0000,
 
 /* Character 71 (0x47):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **      |
-   | **      |
-   | **  *** |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*     |
+   |*     |
+   |*  ** |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x6000,
-0x6000,
-0x6700,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8000,
+0x8000,
+0x9800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 72 (0x48):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ******* |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   |*   * |
+   |***** |
+   |*   * |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x7f00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x8800,
+0xf800,
+0x8800,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 73 (0x49):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******  |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   | ******  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7e00,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x7e00,
-0x0000,
-0x0000,
+0x7000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 74 (0x4a):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |    **** |
-   |     **  |
-   |     **  |
-   |     **  |
-   |     **  |
-   |     **  |
-   |     **  |
-   | **  **  |
-   | **  **  |
-   |  ****   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *** |
+   |   *  |
+   |   *  |
+   |   *  |
+   |   *  |
+   |*  *  |
+   | **   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0f00,
-0x0600,
-0x0600,
-0x0600,
-0x0600,
-0x0600,
-0x0600,
-0x6600,
-0x6600,
-0x3c00,
-0x0000,
-0x0000,
+0x3800,
+0x1000,
+0x1000,
+0x1000,
+0x1000,
+0x9000,
+0x6000,
 0x0000,
 0x0000,
 
 /* Character 75 (0x4b):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **  **  |
-   | ** **   |
-   | ****    |
-   | ***     |
-   | ****    |
-   | ** **   |
-   | **  **  |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*  *  |
+   |* *   |
+   |**    |
+   |* *   |
+   |*  *  |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6600,
-0x6c00,
-0x7800,
-0x7000,
-0x7800,
-0x6c00,
-0x6600,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x8800,
+0x9000,
+0xa000,
+0xc000,
+0xa000,
+0x9000,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 76 (0x4c):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   | ******* |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*     |
+   |*     |
+   |*     |
+   |*     |
+   |*     |
+   |*     |
+   |***** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x7f00,
-0x0000,
-0x0000,
+0x8000,
+0x8000,
+0x8000,
+0x8000,
+0x8000,
+0x8000,
+0xf800,
 0x0000,
 0x0000,
 
 /* Character 77 (0x4d):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | *** *** |
-   | ******* |
-   | ** * ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   |** ** |
+   |* * * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x7700,
-0x7f00,
-0x6b00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0xd800,
+0xa800,
+0x8800,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 78 (0x4e):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   | ***  ** |
-   | **** ** |
-   | ** **** |
-   | **  *** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   |**  * |
+   |* * * |
+   |*  ** |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x7300,
-0x7b00,
-0x6f00,
-0x6700,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0xc800,
+0xa800,
+0x9800,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 79 (0x4f):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x3e00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8800,
+0x8800,
+0x8800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 80 (0x50):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | *****   |
-   | **  **  |
-   | **   ** |
-   | **   ** |
-   | **  **  |
-   | *****   |
-   | **      |
-   | **      |
-   | **      |
-   | **      |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |****  |
+   |*   * |
+   |*   * |
+   |****  |
+   |*     |
+   |*     |
+   |*     |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7c00,
-0x6600,
-0x6300,
-0x6300,
-0x6600,
-0x7c00,
-0x6000,
-0x6000,
-0x6000,
-0x6000,
-0x0000,
-0x0000,
+0xf000,
+0x8800,
+0x8800,
+0xf000,
+0x8000,
+0x8000,
+0x8000,
 0x0000,
 0x0000,
 
 /* Character 81 (0x51):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ** **** |
-   |  ** **  |
-   |   ***** |
-   |       **|
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |* * * |
+   | ***  |
+   |    * |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6f00,
-0x3600,
-0x1f00,
-0x0180,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8800,
+0x8800,
+0x8800,
+0xa800,
+0x7000,
+0x0800,
 0x0000,
 
 /* Character 82 (0x52):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ******  |
-   | ** **   |
-   | **  **  |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |****  |
+   |*   * |
+   |*   * |
+   |****  |
+   |* *   |
+   |*  *  |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7e00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x7e00,
-0x6c00,
-0x6600,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0xf000,
+0x8800,
+0x8800,
+0xf000,
+0xa000,
+0x9000,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 83 (0x53):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   | **   ** |
-   | **      |
-   | **      |
-   |  *****  |
-   |      ** |
-   |      ** |
-   |      ** |
-   | **   ** |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |*   * |
+   |*     |
+   | ***  |
+   |    * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x6300,
-0x6000,
-0x6000,
-0x3e00,
-0x0300,
-0x0300,
-0x0300,
-0x6300,
-0x3e00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8000,
+0x7000,
+0x0800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 84 (0x54):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******  |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7e00,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
+0xf800,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 85 (0x55):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x8800,
+0x8800,
+0x8800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 86 (0x56):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |  ** **  |
-   |  ** **  |
-   |   ***   |
-   |   ***   |
-   |   ***   |
-   |    *    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   |*   * |
+   | * *  |
+   | * *  |
+   | * *  |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x6300,
-0x3600,
-0x3600,
-0x3600,
-0x1c00,
-0x1c00,
-0x1c00,
-0x0800,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x8800,
+0x5000,
+0x5000,
+0x5000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 87 (0x57):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ** * ** |
-   | ** * ** |
-   | ** * ** |
-   | ******* |
-   | *** *** |
-   |  *   *  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   |*   * |
+   |* * * |
+   |* * * |
+   |** ** |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6b00,
-0x6b00,
-0x6b00,
-0x7f00,
-0x7700,
-0x2200,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x8800,
+0xa800,
+0xa800,
+0xd800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 88 (0x58):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |    *    |
-   |    *    |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   | * *  |
+   |  *   |
+   | * *  |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0800,
-0x0800,
-0x1c00,
-0x3600,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x5000,
+0x2000,
+0x5000,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 89 (0x59):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |**    ** |
-   |**    ** |
-   | **  **  |
-   |  ****   |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*   * |
+   |*   * |
+   | * *  |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0xc300,
-0xc300,
-0x6600,
-0x3c00,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x5000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 90 (0x5a):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******* |
-   |      ** |
-   |      ** |
-   |     **  |
-   |    **   |
-   |   **    |
-   |  **     |
-   | **      |
-   | **      |
-   | ******* |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |***** |
+   |    * |
+   |   *  |
+   |  *   |
+   | *    |
+   |*     |
+   |***** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7f00,
-0x0300,
-0x0300,
-0x0600,
-0x0c00,
-0x1800,
-0x3000,
-0x6000,
-0x6000,
-0x7f00,
-0x0000,
-0x0000,
+0xf800,
+0x0800,
+0x1000,
+0x2000,
+0x4000,
+0x8000,
+0xf800,
 0x0000,
 0x0000,
 
 /* Character 91 (0x5b):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   | *    |
+   | *    |
+   | *    |
+   | *    |
+   | *    |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3e00,
-0x0000,
+0x7000,
+0x4000,
+0x4000,
+0x4000,
+0x4000,
+0x4000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 92 (0x5c):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |**       |
-   | **      |
-   | **      |
-   |  **     |
-   |   **    |
-   |   **    |
-   |    **   |
-   |     **  |
-   |     **  |
-   |      ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*     |
+   |*     |
+   | *    |
+   |  *   |
+   |   *  |
+   |    * |
+   |    * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0xc000,
-0x6000,
-0x6000,
-0x3000,
-0x1800,
-0x1800,
-0x0c00,
-0x0600,
-0x0600,
-0x0300,
-0x0000,
-0x0000,
+0x8000,
+0x8000,
+0x4000,
+0x2000,
+0x1000,
+0x0800,
+0x0800,
 0x0000,
 0x0000,
 
 /* Character 93 (0x5d):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |  ****   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |    **   |
-   |  ****   |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | ***  |
+   |   *  |
+   |   *  |
+   |   *  |
+   |   *  |
+   |   *  |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x3c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x0c00,
-0x3c00,
-0x0000,
+0x7000,
+0x1000,
+0x1000,
+0x1000,
+0x1000,
+0x1000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 94 (0x5e):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |  ****   |
-   | **  **  |
-   |**    ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   | * *  |
+   |*   * |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x3c00,
-0x6600,
-0xc300,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
+0x2000,
+0x5000,
+0x8800,
 0x0000,
 0x0000,
 0x0000,
@@ -2818,29 +1810,21 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 
 /* Character 95 (0x5f):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |******** |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |***** |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
@@ -2850,52 +1834,28 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0xff00,
-0x0000,
-0x0000,
+0xf800,
 0x0000,
 
 /* Character 96 (0x60):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |  **     |
-   |   **    |
-   |    **   |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |  *   |
+   |   *  |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
-0x0000,
-0x3000,
-0x1800,
-0x0c00,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
+0x2000,
+0x1000,
 0x0000,
 0x0000,
 0x0000,
@@ -2906,1318 +1866,838 @@ static const uInt16 _stella_font_bits[] = {
 0x0000,
 
 /* Character 97 (0x61):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   |      ** |
-   |      ** |
-   |  ****** |
-   | **   ** |
-   | **   ** |
-   |  ****** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | ***  |
+   |    * |
+   | **** |
+   |*   * |
+   | **** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x0300,
-0x0300,
-0x3f00,
-0x6300,
-0x6300,
-0x3f00,
-0x0000,
-0x0000,
+0x7000,
+0x0800,
+0x7800,
+0x8800,
+0x7800,
 0x0000,
 0x0000,
 
 /* Character 98 (0x62):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **      |
-   | **      |
-   | **      |
-   | ******  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | ******  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*     |
+   |*     |
+   |* **  |
+   |**  * |
+   |*   * |
+   |**  * |
+   |* **  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6000,
-0x6000,
-0x6000,
-0x7e00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x7e00,
-0x0000,
-0x0000,
+0x8000,
+0x8000,
+0xb000,
+0xc800,
+0x8800,
+0xc800,
+0xb000,
 0x0000,
 0x0000,
 
 /* Character 99 (0x63):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   | **   ** |
-   | **      |
-   | **      |
-   | **      |
-   | **   ** |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | ***  |
+   |*   * |
+   |*     |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x6300,
-0x6000,
-0x6000,
-0x6000,
-0x6300,
-0x3e00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8000,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 100 (0x64):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |      ** |
-   |      ** |
-   |      ** |
-   |  ****** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  ****** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |    * |
+   |    * |
+   | ** * |
+   |*  ** |
+   |*   * |
+   |*  ** |
+   | ** * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0300,
-0x0300,
-0x0300,
-0x3f00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x3f00,
-0x0000,
-0x0000,
+0x0800,
+0x0800,
+0x6800,
+0x9800,
+0x8800,
+0x9800,
+0x6800,
 0x0000,
 0x0000,
 
 /* Character 101 (0x65):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   | **   ** |
-   | **   ** |
-   | ******* |
-   | **      |
-   | **   ** |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | ***  |
+   |*   * |
+   |***** |
+   |*     |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x6300,
-0x6300,
-0x7f00,
-0x6000,
-0x6300,
-0x3e00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0xf800,
+0x8000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 102 (0x66):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   |  ** **  |
-   |  **     |
-   |  **     |
-   | ****    |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  **  |
+   | *  * |
+   | *    |
+   |****  |
+   | *    |
+   | *    |
+   | *    |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x3600,
 0x3000,
-0x3000,
-0x7800,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x0000,
-0x0000,
+0x4800,
+0x4000,
+0xf000,
+0x4000,
+0x4000,
+0x4000,
 0x0000,
 0x0000,
 
 /* Character 103 (0x67):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |  ****** |
-   | **  **  |
-   | **  **  |
-   | **  **  |
-   |  ****   |
-   | **      |
-   |  *****  |
-   | **   ** |
-   | **   ** |
-   |  *****  |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | **** |
+   |*   * |
+   |*   * |
+   | **** |
+   |    * |
+   |*   * |
+   | ***  |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3f00,
-0x6600,
-0x6600,
-0x6600,
-0x3c00,
-0x6000,
-0x3e00,
-0x6300,
-0x6300,
-0x3e00,
-0x0000,
+0x7800,
+0x8800,
+0x8800,
+0x7800,
+0x0800,
+0x8800,
+0x7000,
 
 /* Character 104 (0x68):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **      |
-   | **      |
-   | **      |
-   | ******  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*     |
+   |*     |
+   |* **  |
+   |**  * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6000,
-0x6000,
-0x6000,
-0x7e00,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0x8000,
+0x8000,
+0xb000,
+0xc800,
+0x8800,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 105 (0x69):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   |         |
-   | ****    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   | ******  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   |      |
+   | **   |
+   |  *   |
+   |  *   |
+   |  *   |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
+0x2000,
 0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x0000,
-0x7800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x7e00,
-0x0000,
-0x0000,
+0x6000,
+0x2000,
+0x2000,
+0x2000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 106 (0x6a):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |     **  |
-   |     **  |
-   |         |
-   |    ***  |
-   |     **  |
-   |     **  |
-   |     **  |
-   |     **  |
-   |     **  |
-   |     **  |
-   |  ** **  |
-   |  ** **  |
-   |   ***   |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |    * |
+   |      |
+   |   ** |
+   |    * |
+   |    * |
+   |    * |
+   | *  * |
+   | *  * |
+   |  **  |
+   +------+
 */
 0x0000,
+0x0800,
 0x0000,
-0x0000,
-0x0000,
-0x0600,
-0x0600,
-0x0000,
-0x0e00,
-0x0600,
-0x0600,
-0x0600,
-0x0600,
-0x0600,
-0x0600,
-0x3600,
-0x3600,
-0x1c00,
-0x0000,
+0x1800,
+0x0800,
+0x0800,
+0x0800,
+0x4800,
+0x4800,
+0x3000,
 
 /* Character 107 (0x6b):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | **      |
-   | **      |
-   | **      |
-   | **  **  |
-   | ** **   |
-   | ****    |
-   | ****    |
-   | ** **   |
-   | **  **  |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |*     |
+   |*     |
+   |*   * |
+   |*  *  |
+   |***   |
+   |*  *  |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6000,
-0x6000,
-0x6000,
-0x6600,
-0x6c00,
-0x7800,
-0x7800,
-0x6c00,
-0x6600,
-0x6300,
-0x0000,
-0x0000,
+0x8000,
+0x8000,
+0x8800,
+0x9000,
+0xe000,
+0x9000,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 108 (0x6c):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ****    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   | ******  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | **   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x7e00,
-0x0000,
-0x0000,
+0x6000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 109 (0x6d):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |*******  |
-   |** ** ** |
-   |** ** ** |
-   |** ** ** |
-   |** ** ** |
-   |** ** ** |
-   |**    ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |** *  |
+   |* * * |
+   |* * * |
+   |* * * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0xfe00,
-0xdb00,
-0xdb00,
-0xdb00,
-0xdb00,
-0xdb00,
-0xc300,
-0x0000,
-0x0000,
+0xd000,
+0xa800,
+0xa800,
+0xa800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 110 (0x6e):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | ** ***  |
-   | ***  ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |* **  |
+   |**  * |
+   |*   * |
+   |*   * |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6e00,
-0x7300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x0000,
-0x0000,
+0xb000,
+0xc800,
+0x8800,
+0x8800,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 111 (0x6f):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | ***  |
+   |*   * |
+   |*   * |
+   |*   * |
+   | ***  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1c00,
-0x3600,
-0x6300,
-0x6300,
-0x6300,
-0x3600,
-0x1c00,
-0x0000,
-0x0000,
+0x7000,
+0x8800,
+0x8800,
+0x8800,
+0x7000,
 0x0000,
 0x0000,
 
 /* Character 112 (0x70):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | *****   |
-   | **  **  |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **  **  |
-   | *****   |
-   | **      |
-   | **      |
-   | **      |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |* **  |
+   |**  * |
+   |*   * |
+   |**  * |
+   |* **  |
+   |*     |
+   |*     |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7c00,
-0x6600,
-0x6300,
-0x6300,
-0x6300,
-0x6600,
-0x7c00,
-0x6000,
-0x6000,
-0x6000,
-0x0000,
+0xb000,
+0xc800,
+0x8800,
+0xc800,
+0xb000,
+0x8000,
+0x8000,
 
 /* Character 113 (0x71):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   ***** |
-   |  **  ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  **  ** |
-   |   ***** |
-   |      ** |
-   |      ** |
-   |      ** |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | ** * |
+   |*  ** |
+   |*   * |
+   |*  ** |
+   | ** * |
+   |    * |
+   |    * |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1f00,
-0x3300,
-0x6300,
-0x6300,
-0x6300,
-0x3300,
-0x1f00,
-0x0300,
-0x0300,
-0x0300,
-0x0000,
+0x6800,
+0x9800,
+0x8800,
+0x9800,
+0x6800,
+0x0800,
+0x0800,
 
 /* Character 114 (0x72):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | ** ***  |
-   |  *** ** |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |* **  |
+   |**  * |
+   |*     |
+   |*     |
+   |*     |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6e00,
-0x3b00,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x0000,
-0x0000,
+0xb000,
+0xc800,
+0x8000,
+0x8000,
+0x8000,
 0x0000,
 0x0000,
 
 /* Character 115 (0x73):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |  *****  |
-   | **   ** |
-   | **      |
-   |  *****  |
-   |      ** |
-   | **   ** |
-   |  *****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   | ***  |
+   |*     |
+   | ***  |
+   |    * |
+   |****  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x3e00,
-0x6300,
-0x6000,
-0x3e00,
-0x0300,
-0x6300,
-0x3e00,
-0x0000,
-0x0000,
+0x7000,
+0x8000,
+0x7000,
+0x0800,
+0xf000,
 0x0000,
 0x0000,
 
 /* Character 116 (0x74):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   | ******  |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   ** ** |
-   |    ***  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | *    |
+   | *    |
+   |****  |
+   | *    |
+   | *    |
+   | *  * |
+   |  **  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x7e00,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1b00,
-0x0e00,
-0x0000,
-0x0000,
+0x4000,
+0x4000,
+0xf000,
+0x4000,
+0x4000,
+0x4800,
+0x3000,
 0x0000,
 0x0000,
 
 /* Character 117 (0x75):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   | **   ** |
-   |  ****** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |*   * |
+   |*   * |
+   |*   * |
+   |*  ** |
+   | ** * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x6300,
-0x3f00,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x8800,
+0x9800,
+0x6800,
 0x0000,
 0x0000,
 
 /* Character 118 (0x76):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |  ** **  |
-   |   ***   |
-   |   ***   |
-   |    *    |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |*   * |
+   |*   * |
+   | * *  |
+   | * *  |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x3600,
-0x3600,
-0x1c00,
-0x1c00,
-0x0800,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0x5000,
+0x5000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 119 (0x77):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |**    ** |
-   |**    ** |
-   |** ** ** |
-   |** ** ** |
-   |** ** ** |
-   |******** |
-   | **  **  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |*   * |
+   |*   * |
+   |* * * |
+   |* * * |
+   | * *  |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0xc300,
-0xc300,
-0xdb00,
-0xdb00,
-0xdb00,
-0xff00,
-0x6600,
-0x0000,
-0x0000,
+0x8800,
+0x8800,
+0xa800,
+0xa800,
+0x5000,
 0x0000,
 0x0000,
 
 /* Character 120 (0x78):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   |  ** **  |
-   |   ***   |
-   |    *    |
-   |   ***   |
-   |  ** **  |
-   | **   ** |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |*   * |
+   | * *  |
+   |  *   |
+   | * *  |
+   |*   * |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x3600,
-0x1c00,
-0x0800,
-0x1c00,
-0x3600,
-0x6300,
-0x0000,
-0x0000,
+0x8800,
+0x5000,
+0x2000,
+0x5000,
+0x8800,
 0x0000,
 0x0000,
 
 /* Character 121 (0x79):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | **   ** |
-   | **   ** |
-   |  ** **  |
-   |  ** **  |
-   |  ** **  |
-   |   ***   |
-   |   ***   |
-   |   **    |
-   | * **    |
-   |  **     |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |*   * |
+   |*   * |
+   |*  ** |
+   | ** * |
+   |    * |
+   |*   * |
+   | ***  |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x6300,
-0x6300,
-0x3600,
-0x3600,
-0x3600,
-0x1c00,
-0x1c00,
-0x1800,
-0x5800,
-0x3000,
-0x0000,
+0x8800,
+0x8800,
+0x9800,
+0x6800,
+0x0800,
+0x8800,
+0x7000,
 
 /* Character 122 (0x7a):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   | ******  |
-   |     **  |
-   |    **   |
-   |   **    |
-   |  **     |
-   | **      |
-   | ******  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |      |
+   |      |
+   |***** |
+   |   *  |
+   |  *   |
+   | *    |
+   |***** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
 0x0000,
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7e00,
-0x0600,
-0x0c00,
-0x1800,
-0x3000,
-0x6000,
-0x7e00,
-0x0000,
-0x0000,
+0xf800,
+0x1000,
+0x2000,
+0x4000,
+0xf800,
 0x0000,
 0x0000,
 
 /* Character 123 (0x7b):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |   ****  |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   | **      |
-   |  **     |
-   |  **     |
-   |  **     |
-   |  **     |
-   |   ****  |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |   ** |
+   |  *   |
+   |   *  |
+   | **   |
+   |   *  |
+   |  *   |
+   |   ** |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x1e00,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
+0x1800,
+0x2000,
+0x1000,
 0x6000,
-0x3000,
-0x3000,
-0x3000,
-0x3000,
-0x1e00,
-0x0000,
-0x0000,
+0x1000,
+0x2000,
+0x1800,
 0x0000,
 0x0000,
 
 /* Character 124 (0x7c):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |  *   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
+0x2000,
 0x0000,
 0x0000,
 
 /* Character 125 (0x7d):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   | ***     |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   |    ***  |
-   |   **    |
-   |   **    |
-   |   **    |
-   |   **    |
-   | ***     |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | **   |
+   |   *  |
+   |  *   |
+   |   ** |
+   |  *   |
+   |   *  |
+   | **   |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x7000,
+0x6000,
+0x1000,
+0x2000,
 0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x0e00,
-0x1800,
-0x1800,
-0x1800,
-0x1800,
-0x7000,
-0x0000,
-0x0000,
+0x2000,
+0x1000,
+0x6000,
 0x0000,
 0x0000,
 
 /* Character 126 (0x7e):
-   width 9
-   bbx ( 9, 18, 0, -4 )
+   width 6
+   bbx ( 6, 10, 0, -2 )
 
-   +---------+
-   |         |
-   |         |
-   |         |
-   |         |
-   | ***  ** |
-   |** ** ** |
-   |**  ***  |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   |         |
-   +---------+
+   +------+
+   |      |
+   | *  * |
+   |* * * |
+   |*  *  |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   |      |
+   +------+
 */
 0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x7300,
-0xdb00,
-0xce00,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
-0x0000,
+0x4800,
+0xa800,
+0x9000,
 0x0000,
 0x0000,
 0x0000,
@@ -4228,11 +2708,11 @@ static const uInt16 _stella_font_bits[] = {
 
 /* Exported structure definition. */
 static const FontDesc stellaDesc = {
-	"m_9x18b",
-	9,
-	18,
-	9, 18, 0, -4,
-	14,
+	"s_6x10",
+	6,
+	10,
+	6, 10, 0, -2,
+	8,
 	32,
 	95,
 	_stella_font_bits,
diff --git a/stella/src/gui/StellaMediumFont.hxx b/stella/src/gui/StellaMediumFont.hxx
new file mode 100644
index 000000000..b589b54eb
--- /dev/null
+++ b/stella/src/gui/StellaMediumFont.hxx
@@ -0,0 +1,4248 @@
+//============================================================================
+//
+//   SSSS    tt          lll  lll       
+//  SS  SS   tt           ll   ll        
+//  SS     tttttt  eeee   ll   ll   aaaa 
+//   SSSS    tt   ee  ee  ll   ll      aa
+//      SS   tt   eeeeee  ll   ll   aaaaa  --  "An Atari 2600 VCS Emulator"
+//  SS  SS   tt   ee      ll   ll  aa  aa
+//   SSSS     ttt  eeeee llll llll  aaaaa
+//
+// Copyright (c) 1995-2009 by Bradford W. Mott and the Stella team
+//
+// See the file "license" for information on usage and redistribution of
+// this file, and for a DISCLAIMER OF ALL WARRANTIES.
+//
+// $Id: StellaMediumFont.hxx,v 1.1 2009-01-04 22:27:44 stephena Exp $
+//
+//   Based on code from ScummVM - Scumm Interpreter
+//   Copyright (C) 2002-2004 The ScummVM project
+//============================================================================
+
+#ifndef STELLA_MEDIUM_FONT_DATA_HXX
+#define STELLA_MEDIUM_FONT_DATA_HXX
+
+#include "Font.hxx"
+#include "bspf.hxx"
+
+namespace GUI {
+
+/* Font information:
+   name: m_9x18b
+   facename: -Misc-Fixed-Bold-R-Normal--18-120-100-100-C-90-ISO8859-1
+   w x h: 9x18
+   bbx: 9 18 0 -4
+   size: 95
+   ascent: 14
+   descent: 4
+   first char: 32 (0x20)
+   last char: 126 (0x7e)
+   default char: 32 (0x20)
+   proportional: no
+   Public domain font.  Share and enjoy.
+*/
+
+/* Font character bitmap data. */
+static const uInt16 _stella_medium_font_bits[] = {
+
+/* Character 32 (0x20):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 33 (0x21):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 34 (0x22):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |  ** **  |
+   |  ** **  |
+   |  ** **  |
+   |  ** **  |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x3600,
+0x3600,
+0x3600,
+0x3600,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 35 (0x23):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |  ** **  |
+   |  ** **  |
+   |  ** **  |
+   | ******* |
+   |  ** **  |
+   |  ** **  |
+   | ******* |
+   |  ** **  |
+   |  ** **  |
+   |  ** **  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3600,
+0x3600,
+0x3600,
+0x7f00,
+0x3600,
+0x3600,
+0x7f00,
+0x3600,
+0x3600,
+0x3600,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 36 (0x24):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   | ******  |
+   |** ** ** |
+   |** **    |
+   | ****    |
+   |  ****   |
+   |   ****  |
+   |   ** ** |
+   |** ** ** |
+   | ******  |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x7e00,
+0xdb00,
+0xd800,
+0x7800,
+0x3c00,
+0x1e00,
+0x1b00,
+0xdb00,
+0x7e00,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 37 (0x25):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ***  ** |
+   |** ****  |
+   |** ****  |
+   | ** **   |
+   |   **    |
+   |   **    |
+   |  ** **  |
+   | **** ** |
+   | **** ** |
+   |**  ***  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7300,
+0xde00,
+0xde00,
+0x6c00,
+0x1800,
+0x1800,
+0x3600,
+0x7b00,
+0x7b00,
+0xce00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 38 (0x26):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ***     |
+   |** **    |
+   |** **    |
+   |** **    |
+   | ***     |
+   | ***  ** |
+   |** ****  |
+   |**  **   |
+   |** ****  |
+   | ***  ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7000,
+0xd800,
+0xd800,
+0xd800,
+0x7000,
+0x7300,
+0xde00,
+0xcc00,
+0xde00,
+0x7300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 39 (0x27):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 40 (0x28):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |    **   |
+   |   **    |
+   |   **    |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |   **    |
+   |   **    |
+   |    **   |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0c00,
+0x1800,
+0x1800,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x1800,
+0x1800,
+0x0c00,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 41 (0x29):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |  **     |
+   |   **    |
+   |   **    |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |   **    |
+   |   **    |
+   |  **     |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x3000,
+0x1800,
+0x1800,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x1800,
+0x1800,
+0x3000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 42 (0x2a):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |** ** ** |
+   | ******  |
+   |  ****   |
+   | ******  |
+   |** ** ** |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0xdb00,
+0x7e00,
+0x3c00,
+0x7e00,
+0xdb00,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 43 (0x2b):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   |   **    |
+   |******** |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x1800,
+0xff00,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 44 (0x2c):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |   ***   |
+   |    **   |
+   |   **    |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x1c00,
+0x0c00,
+0x1800,
+0x0000,
+0x0000,
+
+/* Character 45 (0x2d):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 46 (0x2e):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 47 (0x2f):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |      ** |
+   |     **  |
+   |     **  |
+   |    **   |
+   |   **    |
+   |   **    |
+   |  **     |
+   | **      |
+   | **      |
+   |**       |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0300,
+0x0600,
+0x0600,
+0x0c00,
+0x1800,
+0x1800,
+0x3000,
+0x6000,
+0x6000,
+0xc000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 48 (0x30):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 49 (0x31):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |  ***    |
+   | ****    |
+   |** **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |******** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x3800,
+0x7800,
+0xd800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0xff00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 50 (0x32):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   |      ** |
+   |      ** |
+   |     **  |
+   |    **   |
+   |   **    |
+   |  **     |
+   | ******* |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x0300,
+0x0300,
+0x0600,
+0x0c00,
+0x1800,
+0x3000,
+0x7f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 51 (0x33):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   |      ** |
+   |     **  |
+   |    **   |
+   |   ***   |
+   |     **  |
+   |      ** |
+   |      ** |
+   | **  **  |
+   |  ****   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x0300,
+0x0600,
+0x0c00,
+0x1c00,
+0x0600,
+0x0300,
+0x0300,
+0x6600,
+0x3c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 52 (0x34):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |     **  |
+   |    ***  |
+   |   ****  |
+   |  ** **  |
+   | **  **  |
+   | **  **  |
+   | ******* |
+   |     **  |
+   |     **  |
+   |     **  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0600,
+0x0e00,
+0x1e00,
+0x3600,
+0x6600,
+0x6600,
+0x7f00,
+0x0600,
+0x0600,
+0x0600,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 53 (0x35):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   | **      |
+   | **      |
+   | **      |
+   | *****   |
+   |     **  |
+   |      ** |
+   |      ** |
+   | **  **  |
+   |  ****   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x6000,
+0x6000,
+0x6000,
+0x7c00,
+0x0600,
+0x0300,
+0x0300,
+0x6600,
+0x3c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 54 (0x36):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ****  |
+   |  **     |
+   | **      |
+   | **      |
+   | *****   |
+   | **  **  |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1e00,
+0x3000,
+0x6000,
+0x6000,
+0x7c00,
+0x6600,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 55 (0x37):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   |      ** |
+   |     **  |
+   |     **  |
+   |    **   |
+   |    **   |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x0300,
+0x0600,
+0x0600,
+0x0c00,
+0x0c00,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 56 (0x38):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x3600,
+0x1c00,
+0x3600,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 57 (0x39):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   |  ** *** |
+   |   ***** |
+   |      ** |
+   |      ** |
+   |     **  |
+   |  ****   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x6300,
+0x3700,
+0x1f00,
+0x0300,
+0x0300,
+0x0600,
+0x3c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 58 (0x3a):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 59 (0x3b):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |   ***   |
+   |    **   |
+   |   **    |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x1c00,
+0x0c00,
+0x1800,
+0x0000,
+0x0000,
+
+/* Character 60 (0x3c):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |     **  |
+   |    **   |
+   |   **    |
+   |  **     |
+   | **      |
+   |  **     |
+   |   **    |
+   |    **   |
+   |     **  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0600,
+0x0c00,
+0x1800,
+0x3000,
+0x6000,
+0x3000,
+0x1800,
+0x0c00,
+0x0600,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 61 (0x3d):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   |         |
+   |         |
+   | ******* |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x0000,
+0x0000,
+0x7f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 62 (0x3e):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | **      |
+   |  **     |
+   |   **    |
+   |    **   |
+   |     **  |
+   |    **   |
+   |   **    |
+   |  **     |
+   | **      |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6000,
+0x3000,
+0x1800,
+0x0c00,
+0x0600,
+0x0c00,
+0x1800,
+0x3000,
+0x6000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 63 (0x3f):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   |      ** |
+   |     **  |
+   |    **   |
+   |   **    |
+   |   **    |
+   |         |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x0300,
+0x0600,
+0x0c00,
+0x1800,
+0x1800,
+0x0000,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 64 (0x40):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   | **   ** |
+   |**  ** **|
+   |** * * **|
+   |** * * **|
+   |** * * **|
+   |** * * **|
+   |**  **** |
+   | **      |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x6300,
+0xcd80,
+0xd580,
+0xd580,
+0xd580,
+0xd580,
+0xcf00,
+0x6000,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 65 (0x41):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |    *    |
+   |   ***   |
+   |   ***   |
+   |   ***   |
+   |  ** **  |
+   |  *****  |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0800,
+0x1c00,
+0x1c00,
+0x1c00,
+0x3600,
+0x3e00,
+0x3600,
+0x6300,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 66 (0x42):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ******  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ******  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7e00,
+0x6300,
+0x6300,
+0x6300,
+0x7e00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x7e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 67 (0x43):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ****  |
+   |  **  ** |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   |  **  ** |
+   |   ****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1e00,
+0x3300,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x3300,
+0x1e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 68 (0x44):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | *****   |
+   | **  **  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **  **  |
+   | *****   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7c00,
+0x6600,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6600,
+0x7c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 69 (0x45):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   | **      |
+   | **      |
+   | **      |
+   | *****   |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | ******* |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x6000,
+0x6000,
+0x6000,
+0x7c00,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x7f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 70 (0x46):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   | **      |
+   | **      |
+   | **      |
+   | *****   |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x6000,
+0x6000,
+0x6000,
+0x7c00,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 71 (0x47):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **      |
+   | **      |
+   | **  *** |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x6000,
+0x6000,
+0x6700,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 72 (0x48):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ******* |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x7f00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 73 (0x49):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******  |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   | ******  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7e00,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x7e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 74 (0x4a):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |    **** |
+   |     **  |
+   |     **  |
+   |     **  |
+   |     **  |
+   |     **  |
+   |     **  |
+   | **  **  |
+   | **  **  |
+   |  ****   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0f00,
+0x0600,
+0x0600,
+0x0600,
+0x0600,
+0x0600,
+0x0600,
+0x6600,
+0x6600,
+0x3c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 75 (0x4b):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **  **  |
+   | ** **   |
+   | ****    |
+   | ***     |
+   | ****    |
+   | ** **   |
+   | **  **  |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6600,
+0x6c00,
+0x7800,
+0x7000,
+0x7800,
+0x6c00,
+0x6600,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 76 (0x4c):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   | ******* |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x7f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 77 (0x4d):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | *** *** |
+   | ******* |
+   | ** * ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x7700,
+0x7f00,
+0x6b00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 78 (0x4e):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   | ***  ** |
+   | **** ** |
+   | ** **** |
+   | **  *** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x7300,
+0x7b00,
+0x6f00,
+0x6700,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 79 (0x4f):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 80 (0x50):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | *****   |
+   | **  **  |
+   | **   ** |
+   | **   ** |
+   | **  **  |
+   | *****   |
+   | **      |
+   | **      |
+   | **      |
+   | **      |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7c00,
+0x6600,
+0x6300,
+0x6300,
+0x6600,
+0x7c00,
+0x6000,
+0x6000,
+0x6000,
+0x6000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 81 (0x51):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ** **** |
+   |  ** **  |
+   |   ***** |
+   |       **|
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6f00,
+0x3600,
+0x1f00,
+0x0180,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 82 (0x52):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ******  |
+   | ** **   |
+   | **  **  |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7e00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x7e00,
+0x6c00,
+0x6600,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 83 (0x53):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   | **   ** |
+   | **      |
+   | **      |
+   |  *****  |
+   |      ** |
+   |      ** |
+   |      ** |
+   | **   ** |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x6300,
+0x6000,
+0x6000,
+0x3e00,
+0x0300,
+0x0300,
+0x0300,
+0x6300,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 84 (0x54):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******  |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7e00,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 85 (0x55):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 86 (0x56):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |  ** **  |
+   |  ** **  |
+   |   ***   |
+   |   ***   |
+   |   ***   |
+   |    *    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x6300,
+0x3600,
+0x3600,
+0x3600,
+0x1c00,
+0x1c00,
+0x1c00,
+0x0800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 87 (0x57):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ** * ** |
+   | ** * ** |
+   | ** * ** |
+   | ******* |
+   | *** *** |
+   |  *   *  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6b00,
+0x6b00,
+0x6b00,
+0x7f00,
+0x7700,
+0x2200,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 88 (0x58):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |    *    |
+   |    *    |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0800,
+0x0800,
+0x1c00,
+0x3600,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 89 (0x59):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |**    ** |
+   |**    ** |
+   | **  **  |
+   |  ****   |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0xc300,
+0xc300,
+0x6600,
+0x3c00,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 90 (0x5a):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******* |
+   |      ** |
+   |      ** |
+   |     **  |
+   |    **   |
+   |   **    |
+   |  **     |
+   | **      |
+   | **      |
+   | ******* |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7f00,
+0x0300,
+0x0300,
+0x0600,
+0x0c00,
+0x1800,
+0x3000,
+0x6000,
+0x6000,
+0x7f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 91 (0x5b):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 92 (0x5c):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |**       |
+   | **      |
+   | **      |
+   |  **     |
+   |   **    |
+   |   **    |
+   |    **   |
+   |     **  |
+   |     **  |
+   |      ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0xc000,
+0x6000,
+0x6000,
+0x3000,
+0x1800,
+0x1800,
+0x0c00,
+0x0600,
+0x0600,
+0x0300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 93 (0x5d):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |  ****   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |    **   |
+   |  ****   |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x3c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x0c00,
+0x3c00,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 94 (0x5e):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |  ****   |
+   | **  **  |
+   |**    ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x3c00,
+0x6600,
+0xc300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 95 (0x5f):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |******** |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0xff00,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 96 (0x60):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |  **     |
+   |   **    |
+   |    **   |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x3000,
+0x1800,
+0x0c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 97 (0x61):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   |      ** |
+   |      ** |
+   |  ****** |
+   | **   ** |
+   | **   ** |
+   |  ****** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x0300,
+0x0300,
+0x3f00,
+0x6300,
+0x6300,
+0x3f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 98 (0x62):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **      |
+   | **      |
+   | **      |
+   | ******  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | ******  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6000,
+0x6000,
+0x6000,
+0x7e00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x7e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 99 (0x63):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   | **   ** |
+   | **      |
+   | **      |
+   | **      |
+   | **   ** |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x6300,
+0x6000,
+0x6000,
+0x6000,
+0x6300,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 100 (0x64):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |      ** |
+   |      ** |
+   |      ** |
+   |  ****** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  ****** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0300,
+0x0300,
+0x0300,
+0x3f00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x3f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 101 (0x65):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   | **   ** |
+   | **   ** |
+   | ******* |
+   | **      |
+   | **   ** |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x6300,
+0x6300,
+0x7f00,
+0x6000,
+0x6300,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 102 (0x66):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   |  ** **  |
+   |  **     |
+   |  **     |
+   | ****    |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x3600,
+0x3000,
+0x3000,
+0x7800,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 103 (0x67):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |  ****** |
+   | **  **  |
+   | **  **  |
+   | **  **  |
+   |  ****   |
+   | **      |
+   |  *****  |
+   | **   ** |
+   | **   ** |
+   |  *****  |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3f00,
+0x6600,
+0x6600,
+0x6600,
+0x3c00,
+0x6000,
+0x3e00,
+0x6300,
+0x6300,
+0x3e00,
+0x0000,
+
+/* Character 104 (0x68):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **      |
+   | **      |
+   | **      |
+   | ******  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6000,
+0x6000,
+0x6000,
+0x7e00,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 105 (0x69):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   |         |
+   | ****    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   | ******  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x0000,
+0x7800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x7e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 106 (0x6a):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |     **  |
+   |     **  |
+   |         |
+   |    ***  |
+   |     **  |
+   |     **  |
+   |     **  |
+   |     **  |
+   |     **  |
+   |     **  |
+   |  ** **  |
+   |  ** **  |
+   |   ***   |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0600,
+0x0600,
+0x0000,
+0x0e00,
+0x0600,
+0x0600,
+0x0600,
+0x0600,
+0x0600,
+0x0600,
+0x3600,
+0x3600,
+0x1c00,
+0x0000,
+
+/* Character 107 (0x6b):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | **      |
+   | **      |
+   | **      |
+   | **  **  |
+   | ** **   |
+   | ****    |
+   | ****    |
+   | ** **   |
+   | **  **  |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6000,
+0x6000,
+0x6000,
+0x6600,
+0x6c00,
+0x7800,
+0x7800,
+0x6c00,
+0x6600,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 108 (0x6c):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ****    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   | ******  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x7e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 109 (0x6d):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |*******  |
+   |** ** ** |
+   |** ** ** |
+   |** ** ** |
+   |** ** ** |
+   |** ** ** |
+   |**    ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0xfe00,
+0xdb00,
+0xdb00,
+0xdb00,
+0xdb00,
+0xdb00,
+0xc300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 110 (0x6e):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | ** ***  |
+   | ***  ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6e00,
+0x7300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 111 (0x6f):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1c00,
+0x3600,
+0x6300,
+0x6300,
+0x6300,
+0x3600,
+0x1c00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 112 (0x70):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | *****   |
+   | **  **  |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **  **  |
+   | *****   |
+   | **      |
+   | **      |
+   | **      |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7c00,
+0x6600,
+0x6300,
+0x6300,
+0x6300,
+0x6600,
+0x7c00,
+0x6000,
+0x6000,
+0x6000,
+0x0000,
+
+/* Character 113 (0x71):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   ***** |
+   |  **  ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  **  ** |
+   |   ***** |
+   |      ** |
+   |      ** |
+   |      ** |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1f00,
+0x3300,
+0x6300,
+0x6300,
+0x6300,
+0x3300,
+0x1f00,
+0x0300,
+0x0300,
+0x0300,
+0x0000,
+
+/* Character 114 (0x72):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | ** ***  |
+   |  *** ** |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6e00,
+0x3b00,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 115 (0x73):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |  *****  |
+   | **   ** |
+   | **      |
+   |  *****  |
+   |      ** |
+   | **   ** |
+   |  *****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x3e00,
+0x6300,
+0x6000,
+0x3e00,
+0x0300,
+0x6300,
+0x3e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 116 (0x74):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   | ******  |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   ** ** |
+   |    ***  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x7e00,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1b00,
+0x0e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 117 (0x75):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   | **   ** |
+   |  ****** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x6300,
+0x3f00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 118 (0x76):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |  ** **  |
+   |   ***   |
+   |   ***   |
+   |    *    |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x3600,
+0x3600,
+0x1c00,
+0x1c00,
+0x0800,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 119 (0x77):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |**    ** |
+   |**    ** |
+   |** ** ** |
+   |** ** ** |
+   |** ** ** |
+   |******** |
+   | **  **  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0xc300,
+0xc300,
+0xdb00,
+0xdb00,
+0xdb00,
+0xff00,
+0x6600,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 120 (0x78):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   |  ** **  |
+   |   ***   |
+   |    *    |
+   |   ***   |
+   |  ** **  |
+   | **   ** |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x3600,
+0x1c00,
+0x0800,
+0x1c00,
+0x3600,
+0x6300,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 121 (0x79):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | **   ** |
+   | **   ** |
+   |  ** **  |
+   |  ** **  |
+   |  ** **  |
+   |   ***   |
+   |   ***   |
+   |   **    |
+   | * **    |
+   |  **     |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x6300,
+0x6300,
+0x3600,
+0x3600,
+0x3600,
+0x1c00,
+0x1c00,
+0x1800,
+0x5800,
+0x3000,
+0x0000,
+
+/* Character 122 (0x7a):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   | ******  |
+   |     **  |
+   |    **   |
+   |   **    |
+   |  **     |
+   | **      |
+   | ******  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7e00,
+0x0600,
+0x0c00,
+0x1800,
+0x3000,
+0x6000,
+0x7e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 123 (0x7b):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |   ****  |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   | **      |
+   |  **     |
+   |  **     |
+   |  **     |
+   |  **     |
+   |   ****  |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x1e00,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x6000,
+0x3000,
+0x3000,
+0x3000,
+0x3000,
+0x1e00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 124 (0x7c):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 125 (0x7d):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   | ***     |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   |    ***  |
+   |   **    |
+   |   **    |
+   |   **    |
+   |   **    |
+   | ***     |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x7000,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x0e00,
+0x1800,
+0x1800,
+0x1800,
+0x1800,
+0x7000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+
+/* Character 126 (0x7e):
+   width 9
+   bbx ( 9, 18, 0, -4 )
+
+   +---------+
+   |         |
+   |         |
+   |         |
+   |         |
+   | ***  ** |
+   |** ** ** |
+   |**  ***  |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   |         |
+   +---------+
+*/
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x7300,
+0xdb00,
+0xce00,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+0x0000,
+};
+
+/* Exported structure definition. */
+static const FontDesc stellaMediumDesc = {
+	"m_9x18b",
+	9,
+	18,
+	9, 18, 0, -4,
+	14,
+	32,
+	95,
+	_stella_medium_font_bits,
+	0,  /* no encode table*/
+	0,  /* fixed width*/
+	0,  /* fixed bbox*/
+	32,
+	sizeof(_stella_medium_font_bits)/sizeof(uInt16)
+};
+
+} // namespace GUI
+
+#endif
diff --git a/stella/src/gui/UIDialog.cxx b/stella/src/gui/UIDialog.cxx
index 4b098e59e..2c31d9d9e 100644
--- a/stella/src/gui/UIDialog.cxx
+++ b/stella/src/gui/UIDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: UIDialog.cxx,v 1.18 2009-01-03 15:44:13 stephena Exp $
+// $Id: UIDialog.cxx,v 1.19 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -36,8 +36,8 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
-                   const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h)
+                   const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0)
 {
   const int lineHeight   = font.getLineHeight(),
             fontWidth    = font.getMaxCharWidth(),
@@ -51,8 +51,8 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
   StringMap items;
 
   // Set real dimensions
-//  _w = 36 * fontWidth + 10;
-//  _h = 10 * (lineHeight + 4) + 10;
+  _w = 42 * fontWidth + 10;
+  _h = 9 * (lineHeight + 4) + 10;
 
   // The tab widget
   xpos = ypos = vBorder;
@@ -98,8 +98,9 @@ UIDialog::UIDialog(OSystem* osystem, DialogContainer* parent,
   // Launcher font
   pwidth = font.getStringWidth("2x (1000x760)");
   items.clear();
-  items.push_back("Small", "small");
-  items.push_back("Large", "large");
+  items.push_back("Small",  "small");
+  items.push_back("Medium", "medium");
+  items.push_back("Large",  "large");
   myLauncherFontPopup =
     new PopUpWidget(myTab, font, xpos, ypos+1, pwidth, lineHeight, items,
                     "Launcher Font: ", lwidth);
@@ -255,7 +256,7 @@ void UIDialog::loadConfig()
 
   // Launcher font
   const string& font = instance().settings().getString("launcherfont");
-     myLauncherFontPopup->setSelected(font, "small");
+     myLauncherFontPopup->setSelected(font, "medium");
 
   // ROM launcher info viewer
   const string& viewer = instance().settings().getString("romviewer");
@@ -328,7 +329,7 @@ void UIDialog::setDefaults()
       myLauncherWidthLabel->setValue(w);
       myLauncherHeightSlider->setValue(h);
       myLauncherHeightLabel->setValue(h);
-      myLauncherFontPopup->setSelected("small", "");
+      myLauncherFontPopup->setSelected("medium", "");
       myRomViewerPopup->setSelected("0", "");
       break;
     }
diff --git a/stella/src/gui/UIDialog.hxx b/stella/src/gui/UIDialog.hxx
index 44b38fc50..828fd1435 100644
--- a/stella/src/gui/UIDialog.hxx
+++ b/stella/src/gui/UIDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: UIDialog.hxx,v 1.10 2009-01-01 18:13:39 stephena Exp $
+// $Id: UIDialog.hxx,v 1.11 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -37,8 +37,7 @@ class TabWidget;
 class UIDialog : public Dialog
 {
   public:
-    UIDialog(OSystem* osystem, DialogContainer* parent,
-             const GUI::Font& font, int x, int y, int w, int h);
+    UIDialog(OSystem* osystem, DialogContainer* parent, const GUI::Font& font);
     ~UIDialog();
 
   protected:
diff --git a/stella/src/gui/VideoDialog.cxx b/stella/src/gui/VideoDialog.cxx
index 9adaf6124..22d3735c9 100644
--- a/stella/src/gui/VideoDialog.cxx
+++ b/stella/src/gui/VideoDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: VideoDialog.cxx,v 1.59 2009-01-01 18:13:39 stephena Exp $
+// $Id: VideoDialog.cxx,v 1.60 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -38,8 +38,8 @@
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent,
-                         const GUI::Font& font, int x, int y, int w, int h)
-  : Dialog(osystem, parent, x, y, w, h)
+                         const GUI::Font& font)
+  : Dialog(osystem, parent, 0, 0, 0, 0)
 {
   const int lineHeight   = font.getLineHeight(),
             fontWidth    = font.getMaxCharWidth(),
@@ -53,6 +53,10 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent,
   WidgetArray wid;
   StringMap items;
 
+  // Set real dimensions
+  _w = 46 * fontWidth + 10;
+  _h = 11 * (lineHeight + 4) + 10;
+
   xpos = 5;  ypos = 10;
 
   // Video renderer
diff --git a/stella/src/gui/VideoDialog.hxx b/stella/src/gui/VideoDialog.hxx
index 8edf44f8d..54cb0b232 100644
--- a/stella/src/gui/VideoDialog.hxx
+++ b/stella/src/gui/VideoDialog.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: VideoDialog.hxx,v 1.27 2009-01-01 18:13:39 stephena Exp $
+// $Id: VideoDialog.hxx,v 1.28 2009-01-04 22:27:44 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -37,8 +37,7 @@ class CheckboxWidget;
 class VideoDialog : public Dialog
 {
   public:
-    VideoDialog(OSystem* osystem, DialogContainer* parent,
-                const GUI::Font& font, int x, int y, int w, int h);
+    VideoDialog(OSystem* osystem, DialogContainer* parent, const GUI::Font& font);
     ~VideoDialog();
 
   private: