From 0e7ccb896dafb69664fb313c63bdb8fbe0ea82d1 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Mon, 28 Jun 2010 15:17:10 +0000
Subject: [PATCH] i18n: Add support for locale-dependent fonts

Currently it ws not decided where to put fonts, but if you put BDF files into
themepath, they will get picked up.

The font name has to contain same codepage specification as in the .po file,
i.e. fixed5x8-iso-8859-5.bdf for Cyrillic codepage. In case the font does not
exist, default will be used.

All built in fonts get proper names.

TODO: Currently there is a bug with our font cacher. Font clR6x12-iso-8859-5
is empty after loading from FCC file. Reason is unknown.

svn-id: r50448
---
 common/translation.cpp                     |    4 +
 common/translation.h                       |    5 +
 graphics/fontman.cpp                       |   28 +-
 gui/ThemeEngine.cpp                        |   39 +-
 gui/ThemeEngine.h                          |    1 +
 gui/themes/default.inc                     | 1574 ++++++++++----------
 gui/themes/scummclassic.zip                |  Bin 56607 -> 57409 bytes
 gui/themes/scummclassic/classic_gfx.stx    |   20 +-
 gui/themes/scummmodern.zip                 |  Bin 163899 -> 158996 bytes
 gui/themes/scummmodern/scummmodern_gfx.stx |   20 +-
 10 files changed, 891 insertions(+), 800 deletions(-)

diff --git a/common/translation.cpp b/common/translation.cpp
index 3c5ff4d3c7b..093f26510fb 100644
--- a/common/translation.cpp
+++ b/common/translation.cpp
@@ -130,6 +130,10 @@ const char *TranslationManager::getTranslation(const char *message) {
 	return po2c_gettext(message);
 }
 
+const char *TranslationManager::getCurrentCharset() {
+	return po2c_getcharset();
+}
+
 String TranslationManager::getTranslation(const String &message) {
 	return po2c_gettext(message.c_str());
 }
diff --git a/common/translation.h b/common/translation.h
index 0722ae44aef..277ac6f5c48 100644
--- a/common/translation.h
+++ b/common/translation.h
@@ -121,6 +121,11 @@ public:
 	 */
 	const TLangArray getSupportedLanguages() const;
 
+	/**
+	 * Returns charset specified by selected translation language
+	 */
+	const char *getCurrentCharset();
+
 private:
 	Common::String _syslang;
 };
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index 808dbafa1a9..c6972cfaabe 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -57,18 +57,28 @@ FontManager::~FontManager() {
 	g_consolefont = 0;
 }
 
-const char *builtinFontNames[] = {
-	"builtinOSD",
-	"builtinConsole",
-	"builtinGUI",
-	"builtinBigGUI",
-	0
+const struct {
+	const char *name;
+	FontManager::FontUsage id;
+} builtinFontNames[] = {
+	{ "builtinOSD", FontManager::kOSDFont },
+	{ "builtinConsole", FontManager::kConsoleFont },
+	{ "fixed5x8.bdf", FontManager::kConsoleFont },
+	{ "fixed5x8-iso-8859-1.bdf", FontManager::kConsoleFont },
+	{ "fixed5x8-ascii.bdf", FontManager::kConsoleFont },
+	{ "clR6x12.bdf", FontManager::kGUIFont },
+	{ "clR6x12-iso-8859-1.bdf", FontManager::kGUIFont },
+	{ "clR6x12-ascii.bdf", FontManager::kGUIFont },
+	{ "helvB12.bdf", FontManager::kBigGUIFont },
+	{ "helvB12-iso-8859-1.bdf", FontManager::kBigGUIFont },
+	{ "helvB12-ascii.bdf", FontManager::kBigGUIFont },
+	{ 0, FontManager::kOSDFont }
 };
 
 const Font *FontManager::getFontByName(const Common::String &name) const {
-	for (int i = 0; builtinFontNames[i]; i++)
-		if (!strcmp(name.c_str(), builtinFontNames[i]))
-			return getFontByUsage((FontUsage)i);
+	for (int i = 0; builtinFontNames[i].name; i++)
+		if (!scumm_stricmp(name.c_str(), builtinFontNames[i].name))
+			return getFontByUsage(builtinFontNames[i].id);
 
 	if (!_fontMap.contains(name))
 		return 0;
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 8f4f767a949..0691f8351d8 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -568,10 +568,17 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) {
 	if (file == "default") {
 		_texts[textId]->_fontPtr = _font;
 	} else {
-		_texts[textId]->_fontPtr = FontMan.getFontByName(file);
+		Common::String localized = genLocalizedFontFilename(file.c_str());
+		// Try built-in fonts
+		_texts[textId]->_fontPtr = FontMan.getFontByName(localized);
 
 		if (!_texts[textId]->_fontPtr) {
-			_texts[textId]->_fontPtr = loadFont(file);
+			// First try to load localized font
+			_texts[textId]->_fontPtr = loadFont(localized);
+
+			// Fallback to non-localized font
+			if (!_texts[textId]->_fontPtr)
+				_texts[textId]->_fontPtr = loadFont(file);
 
 			if (!_texts[textId]->_fontPtr)
 				error("Couldn't load font '%s'", file.c_str());
@@ -1495,6 +1502,34 @@ Common::String ThemeEngine::genCacheFilename(const char *filename) {
 	return Common::String();
 }
 
+Common::String ThemeEngine::genLocalizedFontFilename(const char *filename) {
+#ifndef USE_TRANSLATION
+	return Common::String(filename);
+#else
+
+	Common::String result;
+	bool pointPassed = false;
+
+	for (const char *p = filename; *p != 0; p++) {
+		if (!pointPassed) {
+			if (*p != '.') {
+				result += *p;
+			} else {
+				result += "-";
+				result += TransMan.getCurrentCharset();
+				result += *p;
+
+				pointPassed = true;
+			}
+		} else {
+			result += *p;
+		}
+	}
+
+	return result;
+#endif
+}
+
 
 /**********************************************************
  *	Static Theme XML functions
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 5f474f1a88a..f0d4e2585d2 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -539,6 +539,7 @@ protected:
 	const Graphics::Font *loadFont(const Common::String &filename);
 	const Graphics::Font *loadFontFromArchive(const Common::String &filename);
 	Common::String genCacheFilename(const char *filename);
+	Common::String genLocalizedFontFilename(const char *filename);
 
 	/**
 	 *	Actual Dirty Screen handling function.
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 9554bdf7991..086fecc123f 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,4 +1,781 @@
  "<?xml version = '1.0'?>"
+"<layout_info resolution='320xY,256x240,Xx272'> "
+"<globals> "
+"<def var='Line.Height' value='12' /> "
+"<def var='Font.Height' value='10' /> "
+"<def var='About.OuterBorder' value='10'/> "
+"<def var='Layout.Spacing' value='8'/> "
+"<def var='ShowLauncherLogo' value='0'/> "
+"<def var='ShowGlobalMenuLogo' value='0'/> "
+"<def var='ShowSearchPic' value='0'/> "
+"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> "
+"<def var='KeyMapper.Spacing' value='5'/> "
+"<def var='KeyMapper.LabelWidth' value='80'/> "
+"<def var='KeyMapper.ButtonWidth' value='60'/> "
+"<def var='Tooltip.MaxWidth' value='70'/> "
+"<def var='Tooltip.XDelta' value='8'/> "
+"<def var='Tooltip.YDelta' value='8'/> "
+"<widget name='Button' "
+"size='72,16' "
+"/> "
+"<widget name='Slider' "
+"size='85,12' "
+"/> "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='SmallLabel' "
+"size='18,Globals.Line.Height' "
+"/> "
+"<widget name='PopUp' "
+"size='-1,15' "
+"/> "
+"<widget name='Checkbox' "
+"size='-1,Globals.Line.Height' "
+"/> "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
+"/> "
+"<widget name='ListWidget' "
+"padding='5,0,0,0' "
+"/> "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
+"/> "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
+"/> "
+"<widget name='Console' "
+"padding='7,5,5,5' "
+"/> "
+"<widget name='Scrollbar' "
+"size='9,0' "
+"/> "
+"<widget name='TabWidget.Tab' "
+"size='45,16' "
+"padding='0,0,2,0' "
+"/> "
+"<widget name='TabWidget.Body' "
+"padding='0,0,0,0' "
+"/> "
+"<widget name='TabWidget.NavButton' "
+"size='32,18' "
+"padding='0,3,4,0' "
+"/> "
+"</globals> "
+"<dialog name='Launcher' overlays='screen'> "
+"<layout type='vertical' center='true' padding='6,6,2,2'> "
+"<widget name='Version' "
+"height='Globals.Line.Height' "
+"/> "
+"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
+"<widget name='SearchDesc' "
+"width='50' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"<space /> "
+"</layout> "
+"<widget name='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='LoadGameButton' "
+"height='12' "
+"/> "
+"<widget name='AddGameButton' "
+"height='12' "
+"/> "
+"<widget name='EditGameButton' "
+"height='12' "
+"/> "
+"<widget name='RemoveGameButton' "
+"height='12' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='QuitButton' "
+"height='12' "
+"/> "
+"<widget name='AboutButton' "
+"height='12' "
+"/> "
+"<widget name='OptionsButton' "
+"height='12' "
+"/> "
+"<widget name='StartButton' "
+"height='12' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,0,4'> "
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='Path' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,8,0'> "
+"<widget name='Up' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Choose' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0'> "
+"<widget name='TabWidget'/> "
+"<layout type='horizontal' padding='8,8,8,8'> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grModePopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='grFullscreenCheckbox' "
+"type='Checkbox' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auPrefMt32PopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auOPLPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auSampleRatePopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"/> "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"/> "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
+"/> "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcMusicText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<space size='110' /> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
+"/> "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
+"/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
+"/> "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='SaveButton' "
+"type='Button' "
+"/> "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
+"type='Button' "
+"/> "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ExtraButton' "
+"type='Button' "
+"/> "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
+"type='Button' "
+"/> "
+"<widget name='PluginsPath' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
+"type='Button' "
+"/> "
+"<widget name='CurTheme' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='RendererPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='RendererPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Action' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='List'/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
+"/> "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
+"<widget name='TabWidget'/> "
+"<layout type='horizontal' padding='8,8,8,8'> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
+"/> "
+"<import layout='Dialog.GlobalOptions_Graphics' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
+"/> "
+"<import layout='Dialog.GlobalOptions_Audio' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
+"/> "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
+"/> "
+"<import layout='Dialog.GlobalOptions_Volume' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='Id' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='Domain' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='Name' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='Desc' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<space size='8'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='LangPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='LangPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Savepath' "
+"type='Button' "
+"/> "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Extrapath' "
+"type='Button' "
+"/> "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
+"/> "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalMenu' overlays='screen_center'> "
+"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> "
+"<widget name='Title' "
+"width='160' "
+"height='4' "
+"/> "
+"<widget name='Version' "
+"width='160' "
+"height='4' "
+"/> "
+"<space size='1'/> "
+"<widget name='Load' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='Save' "
+"width='120' "
+"height='12' "
+"/> "
+"<space size='1'/> "
+"<widget name='Options' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='Help' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='About' "
+"width='120' "
+"height='12' "
+"/> "
+"<space size='1'/> "
+"<widget name='Resume' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='RTL' "
+"width='120' "
+"height='12' "
+"/> "
+"<widget name='Quit' "
+"width='120' "
+"height='12' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalConfig' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcMusicText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<space size='110' /> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"width='80' "
+"/> "
+"</layout> "
+"<space size='4' /> "
+"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
+"/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='90' "
+"/> "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='90' "
+"/> "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='90' "
+"/> "
+"</layout> "
+"</layout> "
+"<space size='4' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
+"/> "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
+"/> "
+"</layout> "
+"<space size='20'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"<widget name='Keys' "
+"type='Button' "
+"/> "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Title' height='Globals.Line.Height'/> "
+"<widget name='List' /> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<space/> "
+"<widget name='Delete' "
+"type='Button' "
+"/> "
+"<space size='16'/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Choose' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='ScummHelp' overlays='screen'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<widget name='Title' "
+"width='180' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='HelpText' "
+"height='140' "
+"/> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='Prev' "
+"type='Button' "
+"/> "
+"<widget name='Next' "
+"type='Button' "
+"/> "
+"<space size='32'/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='4,4,16,4' center='true'> "
+"<widget name='DirProgressText' "
+"width='280' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameProgressText' "
+"width='280' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameList' "
+"width='280' "
+"height='100' "
+"/> "
+"<layout type='horizontal' padding='4,4,4,4'> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<widget name='KeymapArea' "
+"width='300' "
+"height='120' "
+"/> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"</layout_info> "
 "<render_info> "
 "<palette> "
 "<color name='black' "
@@ -19,16 +796,28 @@
 "</palette> "
 "<fonts> "
 "<font id='text_default' "
-"file='default' "
+"file='helvb12.bdf' "
+"/> "
+"<font resolution='320xY,256x240' "
+"id='text_default' "
+"file='clR6x12.bdf' "
 "/> "
 "<font id='text_button' "
-"file='default' "
+"file='helvb12.bdf' "
+"/> "
+"<font resolution='320xY,256x240' "
+"id='text_button' "
+"file='clR6x12.bdf' "
 "/> "
 "<font id='text_normal' "
-"file='default' "
+"file='helvb12.bdf' "
+"/> "
+"<font resolution='320xY,256x240' "
+"id='text_normal' "
+"file='clR6x12.bdf' "
 "/> "
 "<font id='tooltip_normal' "
-"file='builtinConsole' "
+"file='fixed5x8.bdf' "
 "/> "
 "<text_color id='color_normal' "
 "color='green' "
@@ -1195,780 +1984,3 @@
 "</layout> "
 "</dialog> "
 "</layout_info> "
-"<layout_info resolution='320xY,256x240,Xx272'> "
-"<globals> "
-"<def var='Line.Height' value='12' /> "
-"<def var='Font.Height' value='10' /> "
-"<def var='About.OuterBorder' value='10'/> "
-"<def var='Layout.Spacing' value='8'/> "
-"<def var='ShowLauncherLogo' value='0'/> "
-"<def var='ShowGlobalMenuLogo' value='0'/> "
-"<def var='ShowSearchPic' value='0'/> "
-"<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> "
-"<def var='KeyMapper.Spacing' value='5'/> "
-"<def var='KeyMapper.LabelWidth' value='80'/> "
-"<def var='KeyMapper.ButtonWidth' value='60'/> "
-"<def var='Tooltip.MaxWidth' value='70'/> "
-"<def var='Tooltip.XDelta' value='8'/> "
-"<def var='Tooltip.YDelta' value='8'/> "
-"<widget name='Button' "
-"size='72,16' "
-"/> "
-"<widget name='Slider' "
-"size='85,12' "
-"/> "
-"<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='SmallLabel' "
-"size='18,Globals.Line.Height' "
-"/> "
-"<widget name='PopUp' "
-"size='-1,15' "
-"/> "
-"<widget name='Checkbox' "
-"size='-1,Globals.Line.Height' "
-"/> "
-"<widget name='Radiobutton' "
-"size='-1,Globals.Line.Height' "
-"/> "
-"<widget name='ListWidget' "
-"padding='5,0,0,0' "
-"/> "
-"<widget name='PopUpWidget' "
-"padding='7,5,0,0' "
-"/> "
-"<widget name='EditTextWidget' "
-"padding='5,5,0,0' "
-"/> "
-"<widget name='Console' "
-"padding='7,5,5,5' "
-"/> "
-"<widget name='Scrollbar' "
-"size='9,0' "
-"/> "
-"<widget name='TabWidget.Tab' "
-"size='45,16' "
-"padding='0,0,2,0' "
-"/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,0' "
-"/> "
-"<widget name='TabWidget.NavButton' "
-"size='32,18' "
-"padding='0,3,4,0' "
-"/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='6,6,2,2'> "
-"<widget name='Version' "
-"height='Globals.Line.Height' "
-"/> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='50' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
-"/> "
-"<space /> "
-"</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='LoadGameButton' "
-"height='12' "
-"/> "
-"<widget name='AddGameButton' "
-"height='12' "
-"/> "
-"<widget name='EditGameButton' "
-"height='12' "
-"/> "
-"<widget name='RemoveGameButton' "
-"height='12' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='QuitButton' "
-"height='12' "
-"/> "
-"<widget name='AboutButton' "
-"height='12' "
-"/> "
-"<widget name='OptionsButton' "
-"height='12' "
-"/> "
-"<widget name='StartButton' "
-"height='12' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='Browser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,0,4'> "
-"<widget name='Headline' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='Path' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,8,0'> "
-"<widget name='Up' "
-"type='Button' "
-"/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Choose' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grModePopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<widget name='grAspectCheckbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='grFullscreenCheckbox' "
-"type='Checkbox' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auMidiPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auMidiPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auOPLPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auOPLPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auSampleRatePopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
-"/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcMusicText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSfxText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
-"/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='mcMidiGainText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='mcMidiGainSlider' "
-"type='Slider' "
-"/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='SaveButton' "
-"type='Button' "
-"/> "
-"<widget name='SavePath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ThemeButton' "
-"type='Button' "
-"/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ExtraButton' "
-"type='Button' "
-"/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
-"type='Button' "
-"/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ThemeButton' "
-"type='Button' "
-"/> "
-"<widget name='CurTheme' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='RendererPopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='RendererPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<widget name='KeysButton' "
-"type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
-"height='Globals.Line.Height' "
-"/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
-"type='Button' "
-"/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
-"<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Graphics' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Audio' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='Id' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='Domain' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='Name' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='Desc' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<space size='8'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='LangPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='LangPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Savepath' "
-"type='Button' "
-"/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
-"/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
-"/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> "
-"<widget name='Title' "
-"width='160' "
-"height='4' "
-"/> "
-"<widget name='Version' "
-"width='160' "
-"height='4' "
-"/> "
-"<space size='1'/> "
-"<widget name='Load' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Save' "
-"width='120' "
-"height='12' "
-"/> "
-"<space size='1'/> "
-"<widget name='Options' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Help' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='About' "
-"width='120' "
-"height='12' "
-"/> "
-"<space size='1'/> "
-"<widget name='Resume' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='RTL' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Quit' "
-"width='120' "
-"height='12' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcMusicText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSfxText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80' "
-"/> "
-"</layout> "
-"<space size='4' /> "
-"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='90' "
-"/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='90' "
-"/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='90' "
-"/> "
-"</layout> "
-"</layout> "
-"<space size='4' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
-"/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
-"/> "
-"</layout> "
-"<space size='20'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
-"<widget name='Keys' "
-"type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Title' height='Globals.Line.Height'/> "
-"<widget name='List' /> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<space/> "
-"<widget name='Delete' "
-"type='Button' "
-"/> "
-"<space size='16'/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Choose' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummHelp' overlays='screen'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<widget name='Title' "
-"width='180' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='HelpText' "
-"height='140' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='Prev' "
-"type='Button' "
-"/> "
-"<widget name='Next' "
-"type='Button' "
-"/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='4,4,16,4' center='true'> "
-"<widget name='DirProgressText' "
-"width='280' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='GameProgressText' "
-"width='280' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='GameList' "
-"width='280' "
-"height='100' "
-"/> "
-"<layout type='horizontal' padding='4,4,4,4'> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='150' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<widget name='KeymapArea' "
-"width='300' "
-"height='120' "
-"/> "
-"<widget name='Close' "
-"type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 67b3d7c0411c0e671395f37829a5970d13d62c35..27362daf4ad8cc59a6e522c1fdda4440506f0566 100644
GIT binary patch
delta 1091
zcmbQgi}~OIX5IjAW)=|!5V*B@_C(%bA%&3JHv3mxUCS29zyQLM43pp8k>1#RkvYan
zA)}<Epx8=Zzc{%xH@7TTuedBvuQ<Q7C^<DPzbHLbFE6!3zql-~C_ldhrUp)z6qV*>
z>!+7y>X&4s=B5@yB$9Iyi;FXp^(TM0Bgw6x!lj_ApyHWgr2yiqDVQ1<8d)e985kPq
z8kp%C87deVS{a*J8Jk5Zq-Ex%=jWtl<|#~`pr^8VUwcT%<ep{@KDCK=Y&N!N6(7@P
zU^u3|G4C03JuTf0b$@(%T7_P5Nd=M*;4*4ZDHBU`a}&5{3{4db4XjL!tc*>g6pB;J
z6gJ1O<T5&Dq~??*85-#&rKG8IadPV0adC3mq~+(8a2BN&=jW7`Waj57*ea+S8yQqY
z>L?hQnpGH?7=V;2C@64pW~NMTR2CCX%gjjysY=cXGOK`?Hu(apo*iYTPrk>hz>R98
z)MR-!kxa^r<;+Y0xwRy<q9i^qzbH2`2jm@2PVAl#n;gI<&6Ac{k(y#!VF3!K$+qko
zlh+BcZC=jyN|_Ioe&zp*%&3WEV5o`QJYVZ2eG))UVr7153Dz`Vl#DD(RGQvALGMop
zFC&u(Gdy!nmcL`9fSEfHU`b;bD6h(DA+(`p1_lOxgldK*jguoM7v7Ntn~4Z91_mJ%
dMQyE<*WD2lVPyk}vM{hP{A6HYFuD&?0|2FLQGoye

delta 381
zcmX?jfO-BdX5IjAW)=|!5ZJmvZX$0mpH#+qo4Mz$4zXx4FtBKCULE<2nL~w3L03V=
zGi9?`TrMMfN@`kSX->&x-UK})w$$W(2_kU5b)q3(QfX#RNoJmNeqM2YPU>WvB#q4r
z5<e*O3CCTv*?sF==H&<mhRYF~=e52>*f3d^Rb_Kb*NqS{n6p5tKVPje^^ag+@Q>J-
z_W_}Jvn*>x2rna(2s7LVlO69HDWH0Rfq@_FKL}XT7{)O9)_vI|R97%C2%#uy*J5Bu
z&PgmT&P<NaNvzB-Ezv73sR-~!Scd8@1_ntK{awur43qD%NQwn`v$BC?SQuCseljpH
J2;2dw0{})BYGnWb

diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index 05040751f9c..8c03aa932cd 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -44,16 +44,28 @@
 
 	<fonts>
 		<font	id = 'text_default'
-				file = 'default'
+				file = 'helvb12.bdf'
+		/>
+		<font	resolution = '320xY, 256x240'
+		   		id = 'text_default'
+				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_button'
-				file = 'default'
+				file = 'helvb12.bdf'
+		/>
+		<font	resolution = '320xY, 256x240'
+		   		id = 'text_button'
+				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_normal'
-				file = 'default'
+				file = 'helvb12.bdf'
+		/>
+		<font	resolution = '320xY, 256x240'
+		   		id = 'text_normal'
+				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'tooltip_normal'
-				file = 'builtinConsole'
+				file = 'fixed5x8.bdf'
 		/>
 
 		<text_color	id = 'color_normal'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index fb01518e82c1f0309bf22e121b8431432b20667a..699cbb319a4485369adf3a78e00e697b44909182 100644
GIT binary patch
delta 1418
zcmcgsO=uHA6n-<4Mm8q3TH8Zo%xG%`HGi8Xwrf>H@GmG;6fq)Vlif6!&6ezLNYylI
z!Gnkzu?$)i1y8Lg5^)7Rco0!fO7&p<J9)4oD0mS)$fl+?^`I9Wc<eIsy|>@D?|pOU
zu<h&^=je(M%Um$mSZS!}*oMbPjCFnZ7_nFOkDrfplpa~5_Stm%%g%vP@XW2<0A@6@
zOK#j?9K4U7lY&5dG_6+^d_Fa%%W_uss@b$xRrE|ul$1<D^rl74r)JX`MbRpl$)}dl
z)BAl1J?YbWL|IfP4rC=RX3|sN_onvsDZ1uWwH$4+Q4ej|7#FA-(>vs!=&6X1Kft$B
z-XHLL{9z9tpnO0GhJ|1_N~L5vp`@f_nzD1vxWzd15Y_J_k2gOvtOF=a$XIE}_`CwW
zU28G*--s<EwWj<7Ywliej{>wujSFu4h3x)^ve}aYcFmk3v%JyzcdCqY&3I&oDPv&J
zV+?xGu38eU(MzrMTP^teaH&YzNLlV^0r^R7!@#S~`FlJkhF1d&uQoOvL*xIgr3oqb
zdp~7a_LRFndEC~qe0kesGXo(S@CzYc2!^6m6|>anJdSQ#n|j1lwmZOkyW`Sg8^`%p
z**LCKQqmg7x(1PJhK=JWr5qbQjTX#|rM8806JX{qq9*qBCbBP-k|~j{q>KMh%J#Dq
zmyEMdH&H`<C2v|)zVUDPtSTZpolhe>T0~B}l+20oP_Et7#Cp%7g>1_iWHm;M=m76P
zcrKarFMDwa^LTuOeJkL3g&hE(iu*FL9&fkY+ZFi*HAnhXb5IJ~0nD(KFMx@4<;Xh%
z5YscNl9`_O+XYaSx3&(T?EMMbvTJTUgIz4(I&;q0`+n@Scv1jt>uJ=$Tm@`5r<3*e
zV<(XmU?)w0$&Ag)<0ibJ#Fpl96Rma~fUD}8xm)bA8@t)ZN;#n)JDnfu5TulZGM#_4
zMrZf(*h$vAF?*B8t_9zR9|+f8_bsv#05j%PRUc}`Ov+<-S-@43=+jor9{1yUk!r&L
e)K?{1mf)$sqB6r>ks7OsbASWf1mJBF1Hccbvacop

delta 6317
zcmc(jdvF!i9mhZCoZY>5@4ck4B#M9#5EX6FNJVG_8!*-|ppDk|leZB9L>`4&+Fb%-
zbZn)Hy>zrrr1%(S>O@nE^)baqEmb?VQ`<T+ZFR<JwVhFXbS9l4q4PUu_db$z{IA_J
z=k7Vb{hi<W{vPM|+q=8o3ZIE{quLf2uMWAM?3wWWQI~jMKI!VFzRUZ*X!O44_CIo>
zKFc`LC+6ycIe1d%{!1t7i@iwLW}N@qlRvBn=`}$6@{Vt;J9GN9jx$eRv2-Z~YRL0B
zI66Qcl-(s*xew^7=rWJ1n#_A_o61y<*xqJa1D!ld51kQHd6Y-#q=6;uVi)aX8BJYW
z7oSKYt+die8+WjsJ6V^AZ=jjxs;y++K%CqgO3m^0&`gh|_1j-ZJxokgOKpkdM0V0$
z)dbqxC4o+~@MP^ux28X#G?FE2S9g+SjMcl9ZjM-bzlD6bf~Pa0o0wh>CR=vWZv{J0
zPEQA@46Cy=-kgZ)B(_eGOKgx{PR|039H5Z`{Xl;*7Fs8f=$hI98koqU_`>G9oA)&D
zX?{4qk7mxL*6Pth3tQ;2t)K0-mG85eSK*L(%(l-QxBPCWpCbuJ`F<oyNX|48KB=JZ
z*=1j)sU&2uG^!3WnTgrcCMtEZoo;s0!`tkno9%QBTh&h-N6*L4$9v*E@veAR+#Pqv
zUA({^_HZ|Ma0ff+vVgXhTB@1oUk%#v+|I4cV@`!-WOHeo*-p$N#^5FML24swd~twl
zj<x)|+3GB&Z?R4gE`iw{&*w5OW3p{s$#Zd(a5}TQHL2u5G+sr}4st-^f4C`yTzQa0
zzyTXd5>A!v01dR!&7kFXXJWH8{{}0g9M%Wvwa?vd;vR8UJG&+RrR}CYiE1&bFf`K4
z+g01Ov%7*@j+w-L<>?VgauTYQlJigr+l?JhBq4Hu1N7K1sa`0vy}ZTUrB>F+1(^fy
z#^q<Ct&=nqvS=;)mG+5P#7-L)wd`b(#a5~HqKYlVMs7n%qLPSQ97rTc9Bj9_QgWum
zkK^1~;*~^oI7wM<EEbMZW0VclSVlKwB>r|SO;0jAz%q7QqYpKFOl^|qr3xIRlV%G~
z_Bw3Wwnp^Yqak@-4v3%@-6T)DT%Ce&S2~kmlfxuuyW8sR;-QCgnaln0p13F86W<@t
z<y@P*dw{o@N*g`2*+S&m79CC&?232W93Tr0TfyQE(a*t<#3|cJN<M5wO2LtHA>o>~
z-Mp7ToJ~9L+173ku2ev2a<ZJ&nq_sAcwF+7Aav*i<y>B{CwM-ispph<ZbE5g0d?^)
zOy+|49VXMl6n;&fdX9@H(O{Ffs~ZAJidQYzL+o-xn!=@g;p$)Y14$wyEvWl1^pUwm
zic3A!(kI4Zg;u^6+e{I0SDa>i=UYjza!eW%<mF=Fo=Yhe<iqI>_;9)a98Pt0GKv3k
z^vh^?3X!el6=I}BGBR}w^AMMPWPj(eC9&U-`V!GaEm;_$%t*E#iJnDX^u%h_Wyv{c
zIDN{9-0qx3lD}!55Km%W+!D9Mt#MmCiR+0I^OsAJ8_6q&n149knSVIFbwq9_rAzd$
zu2W*_@@s|6(l?*p<e2p)(5efLq$GyWq&y9!Ne(E}?EBA#Dv}(V4K`0T4iUGB?l>Dq
zaW~!ZCi~2VWO~dbeWxJ0ONFcqtV}BbllqrdycAcN;$pNqI7bT4kwSBLShm|Y>1<M>
zU3Q3^Im)$5$dy{iT=c8dBBhnINGQTrHg8JptWd1HQt~M@L^RRDLM~+)Ej*QMoi26n
z1#atVn%laXCibhQRIaS9gyJ|+`c$`|T(MIjt+sGV5^~vE6(4L;+oBN20i%IqfeB#q
z%b7qEFb9|qTn1bTTn8)y76VIwRlo+|+rSRsF0jS(L9l<I`haJFUjnZJzX#p~4%zBJ
z#QVS}Hld+>P&J^A1JwZPR8Z4Fodc=`)P<lf2XzCec2GBix&_oWP<Mj57t{lw9s$)0
z>gS+d0QD-UH$eRv)cc@51~mv;5ur6`4|E=M9q4hOr-1$f=(9kd3;F`kZJ@6Oy&Uu!
z&>KN-0lf|McR?3HKLGk6(2s$B67;j6Uj+RM=r=$g0{wT;pMX9pF95}dnp9V06c`Pr
z0Hz+y1Ta&;Oan6uObeLv!CVC9>tL<~b1j(bz^njsBbZfS)`8gsW(%0_fawOa3(UP>
zehB6PFh2(KD455=JPqbWBFt-G-URb5n8RR>fR_PpG<f5|n+o1p;5CD{5WFkETMFJ<
z@V*7!4)E>*?>_Jz0k03dUx4>2cz*=%5O{wB?_=-=!OwwT5B?<ZPm93+68Lk#zX1G;
z!M_IlW#F#?e<S$9b36F=fd3=#9|pe{{HMWx3H;xH|0nR@0so)i{|o%15QGqX9)jZ_
zm;k|42&O|Y8-nv8xCDaedKG@g<rzPd$%n@C{EX)tFH^dVkzpashG8}vh9;BE<ilJx
zm(6CfVLl8)<C!3%Ex*ZRj0sFA6E85COc-PW&qQA4Gqw*y&u(J^llL=OKQAymE#f>s
zlgs520r@bS&1Q`;CJb|OWpY9YvkBb1gJB%#^onGlGNI!C(<8UBQlLVGF)9eM5+v$q
zn1E771*V_|Oo0J;?)yq<qXs>NQA**3;LF-j*}IIz_i`WFRiMyW1_K}E8>NHDS4x<2
zIdxPl5L8$~#+7pcD7?Za_Y`0@;Y;ssjRc_MP5Dv_>w+2((7M1t<Qx2qVo+<cK_)?5
zaktv#)PQU#0Ax`*&In)Hg(s&5Oh(~l#2S>Ig&7Dk)~W;Y%quXU1Vn*oAkdf;+5i5Y
z_+K`*G2k>kDjEg>)-@`x27U3pA}gjezVajn0#9j)0ik({tmom0H9Q|<e2iFBEE0&e
zN*UuZpnYZ1^<fC16hRsIp&G~(6jeR%=GK1&5u_;fymf{6(xvV^WJB!wY(Z7`yg~ry
z@*FL#7g>2lBpXVgSdDXvsxDT@DMInF^RL`pmsrSw&M8a|=kN5{(7VX@mCCpnsFX1l
zf0P>V3$B+xyzZN|@V5S1wZFesUsYrF&05&Ee(hh+GlkyQ_y6T&-DqUg*VJ*gsTte;
z`s@`QKV9?Q9C&Ze{_&^jf0*o)T*I`6Df5@@f8uogR8Uy9e8u989UD%`h2a^+<{7%a
z_`wWamr2OQRcGtzf%`~Xym^KmT|8!{o?NqJ<4qkKZd!BR+BNIfb}TO*n5m~0KWx*%
z{?#+}hUsI|PsF3I|HJGLe(>Ul!8IWLSc<(X^_ad*wZALlc%pvh6*a>7*vemhe9KjE
z%T;|lfA(pa;qLk=eQTb%?J~XZxyKjpFr$>NGo??^#Sd=M(`U=q<rUjL{Z3#&dLjKX
z3GCe}FG)+=moHtlWbNkDm#pq=TTm9U@44bd9eTXE)lgjBp(omp*TrjB>aiz06Ts4q
z>(;MbH+0d#lRAsXbm(#B_|X*4=+Gy8Wu(vB>9u$3>f?rf?5=_^Yhm%wDm`vo_cZ8O
zd*j-n+X=(iReIc{ch6Cl;fD3A7k6|FWh?Z)Uc5_Cy&S3HPdfDY$%Wq6XU`q;(KV@A
z>QhM8EdTCO6yp`TzL;O73zMpY#l3o_*WRtucc|i|({$amO60@+TfX*gUGS1BKE6_)
zIH}sXa6*}jy<2acsD*9xJ;y(jFTS=)7v}AI?&YRMH$MGzy8-F)BAi}(w>EuKvwr#F
WbxYfw0sKIo)lkDV242~sf&T!@JTfr=

diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 3ed915200a5..ad41475a96f 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -106,16 +106,28 @@
 
 	<fonts>
 		<font	id = 'text_default'
-				file = 'default'
+				file = 'helvb12.bdf'
+		/>
+		<font	resolution = '320xY, 256x240'
+		   		id = 'text_default'
+				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_button'
-				file = 'default'
+				file = 'helvb12.bdf'
+		/>
+		<font	resolution = '320xY, 256x240'
+		   		id = 'text_button'
+				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_normal'
-				file = 'helvr12-l1.bdf'
+				file = 'helvb12.bdf'
+		/>
+		<font	resolution = '320xY, 256x240'
+		   		id = 'text_normal'
+				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'tooltip_normal'
-				file = 'builtinConsole'
+				file = 'fixed5x8.bdf'
 		/>
 
 		<text_color	id = 'color_normal'