From 27628688d2bab872adfbed40bf098381def586e6 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 5 Nov 2008 14:33:22 +0000
Subject: Tweaked classic theme in 320x200 mode, to use the available space
 better

svn-id: r34902
---
 gui/themes/default.inc                         | 1369 ++++++++++++------------
 gui/themes/scummclassic.zip                    |  Bin 43739 -> 43715 bytes
 gui/themes/scummclassic/classic_layout.stx     |    2 +-
 gui/themes/scummclassic/classic_layout_320.stx |    3 +-
 gui/themes/scummmodern.zip                     |  Bin 144058 -> 144058 bytes
 5 files changed, 686 insertions(+), 688 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index ca9fca3f21..dece0d9571 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,480 +1,487 @@
  "<?xml version = '1.0'?>"
-"<layout_info resolution = '-320xY, -256x240'> "
-"<globals> "
-"<def var = 'Line.Height' value = '16' /> "
-"<def var = 'Font.Height' value = '16' /> "
-"<def var = 'TabLabelWidth' value = '110' /> "
-"<def var = 'WidgetSize' value = 'kBigWidgetSize' /> "
-"<def var = 'About.OuterBorder' value = '80'/> "
-"<def var = 'PopUpWidget.labelSpacing' value = '10' /> "
-"<def var = 'Layout.Spacing' value = '8' /> "
-"<def var = 'ShowLauncherLogo' value = '0'/> "
-"<def var = 'ShowGlobalMenuLogo' value = '0'/> "
-"<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> "
-"<widget name = 'OptionsLabel' "
-"size = '110, Globals.Line.Height' "
-"/> "
-"<widget name = 'SmallLabel' "
-"size = '24, Globals.Line.Height' "
-"/> "
-"<widget name = 'ShortOptionsLabel' "
-"size = '60, Globals.Line.Height' "
-"/> "
-"<widget name = 'Button' "
-"size = 'kBigButtonWidth, kBigButtonHeight' "
-"/> "
-"<widget name = 'Slider' "
-"size = 'kBigSliderWidth, kBigSliderHeight' "
-"/> "
-"<widget name = 'PopUp' "
-"size = '-1, 19' "
+"<render_info> "
+"<palette> "
+"<color name = 'black' "
+"rgb = '0, 0, 0' "
 "/> "
-"<widget name = 'Checkbox' "
-"size = '-1, 14' "
+"<color name = 'lightgrey' "
+"rgb = '104, 104, 104' "
 "/> "
-"<widget name = 'ListWidget' "
-"padding = '5, 0, 8, 0' "
+"<color name = 'darkgrey' "
+"rgb = '64, 64, 64' "
 "/> "
-"<widget name = 'PopUpWidget' "
-"padding = '7, 5, 0, 0' "
+"<color name = 'green' "
+"rgb = '32, 160, 32' "
 "/> "
-"<widget name = 'EditTextWidget' "
-"padding = '5, 5, 0, 0' "
+"<color name = 'green2' "
+"rgb = '0, 255, 0' "
 "/> "
-"<widget name = 'Console' "
-"padding = '7, 5, 5, 5' "
+"</palette> "
+"<fonts> "
+"<font id = 'text_default' "
+"file = 'default' "
+"color = 'green' "
 "/> "
-"<widget name = 'TabWidget.Tab' "
-"size = '75, 27' "
-"padding = '0, 0, 8, 0' "
+"<font id = 'text_hover' "
+"file = 'default' "
+"color = 'green2' "
 "/> "
-"<widget name = 'TabWidget.NavButton' "
-"size = '15, 18' "
-"padding = '0, 3, 4, 0' "
+"<font id = 'text_disabled' "
+"file = 'default' "
+"color = 'lightgrey' "
 "/> "
-"</globals> "
-"<dialog name = 'Launcher' overlays = 'screen'> "
-"<layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'> "
-"<widget name = 'Version' "
-"height = 'Globals.Line.Height' "
+"<font id = 'text_inverted' "
+"file = 'default' "
+"color = 'black' "
 "/> "
-"<widget name = 'GameList'/> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
-"<widget name = 'LoadGameButton' "
-"height = '20' "
+"<font id = 'text_button' "
+"file = 'default' "
+"color = 'green' "
 "/> "
-"<widget name = 'AddGameButton' "
-"height = '20' "
+"<font id = 'text_button_hover' "
+"file = 'default' "
+"color = 'green2' "
 "/> "
-"<widget name = 'EditGameButton' "
-"height = '20' "
+"<font id = 'text_normal' "
+"file = 'default' "
+"color = 'green' "
 "/> "
-"<widget name = 'RemoveGameButton' "
-"height = '20' "
+"</fonts> "
+"<defaults fill = 'foreground' fg_color = 'darkgrey' bg_color = 'black' shadow = '0' bevel_color = 'lightgrey'/> "
+"<drawdata id = 'text_selection' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
 "/> "
-"</layout> "
-"<space size = '12'/> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
-"<widget name = 'QuitButton' "
-"height = '20' "
+"</drawdata> "
+"<drawdata id = 'mainmenu_bg' cache = false> "
+"<drawstep func = 'fill' "
+"fill = 'foreground' "
+"fg_color = 'black' "
 "/> "
-"<widget name = 'AboutButton' "
-"height = '20' "
+"</drawdata> "
+"<drawdata id = 'special_bg' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
-"<widget name = 'OptionsButton' "
-"height = '20' "
+"</drawdata> "
+"<drawdata id = 'separator' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"height = '2' "
+"ypos = 'center' "
+"fg_color = 'lightgrey' "
 "/> "
-"<widget name = 'StartButton' "
-"height = '20' "
+"</drawdata> "
+"<drawdata id = 'scrollbar_base' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8'> "
-"<widget name = 'Headline' "
-"height = 'Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id = 'scrollbar_handle_hover' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green2' "
 "/> "
-"<widget name = 'Path' "
-"height = 'Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id = 'scrollbar_handle_idle' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
 "/> "
-"<widget name = 'List'/> "
-"<layout type = 'horizontal' padding = '0, 0, 16, 0'> "
-"<widget name = 'Up' "
-"type = 'Button' "
+"</drawdata> "
+"<drawdata id = 'scrollbar_button_idle' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<space/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
+"<drawstep func = 'triangle' "
+"fg_color = 'green' "
+"fill = 'foreground' "
+"width = 'auto' "
+"height = 'auto' "
+"xpos = 'center' "
+"ypos = 'center' "
+"orientation = 'top' "
 "/> "
-"<widget name = 'Choose' "
-"type = 'Button' "
+"</drawdata> "
+"<drawdata id = 'scrollbar_button_hover' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0'> "
-"<widget name = 'TabWidget'/> "
-"<layout type = 'horizontal' padding = '16, 16, 16, 16'> "
-"<space/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
+"<drawstep func = 'triangle' "
+"fg_color = 'green2' "
+"fill = 'foreground' "
+"width = 'auto' "
+"height = 'auto' "
+"xpos = 'center' "
+"ypos = 'center' "
+"orientation = 'top' "
 "/> "
-"<widget name = 'Ok' "
-"type = 'Button' "
+"</drawdata> "
+"<drawdata id = 'tab_active' cache = false> "
+"<text font = 'text_hover' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
-"<widget name = 'grModePopup' "
-"type = 'PopUp' "
+"<drawstep func = 'tab' "
+"bevel = '2' "
+"radius = '0' "
+"fill = 'none' "
 "/> "
-"<widget name = 'grRenderPopup' "
-"type = 'PopUp' "
+"</drawdata> "
+"<drawdata id = 'tab_inactive' cache = false> "
+"<text font = 'text_default' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
 "/> "
-"<widget name = 'grAspectCheckbox' "
-"type = 'Checkbox' "
+"<drawstep func = 'tab' "
+"bevel = '2' "
+"radius = '0' "
+"fill = 'none' "
 "/> "
-"<widget name = 'grFullscreenCheckbox' "
-"type = 'Checkbox' "
+"</drawdata> "
+"<drawdata id = 'tab_background' cache = false> "
+"</drawdata> "
+"<drawdata id = 'widget_slider' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
-"<widget name = 'auMidiPopup' "
-"type = 'PopUp' "
+"</drawdata> "
+"<drawdata id = 'slider_disabled' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'lightgrey' "
 "/> "
-"<widget name = 'auSampleRatePopup' "
-"type = 'PopUp' "
+"</drawdata> "
+"<drawdata id = 'slider_full' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
 "/> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
-"<widget name = 'subToggleDesc' "
-"type = 'OptionsLabel' "
+"</drawdata> "
+"<drawdata id = 'slider_hover' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green2' "
 "/> "
-"<widget name = 'subToggleButton' "
-"width = '150' "
-"height = 'Globals.Slider.Height' "
+"</drawdata> "
+"<drawdata id = 'widget_small' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
-"<widget name = 'subSubtitleSpeedDesc' "
-"type = 'OptionsLabel' "
+"</drawdata> "
+"<drawdata id = 'popup_idle' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<widget name = 'subSubtitleSpeedSlider' "
-"type = 'Slider' "
+"<drawstep func = 'triangle' "
+"fg_color = 'green' "
+"fill = 'foreground' "
+"width = 'height' "
+"height = 'auto' "
+"xpos = 'right' "
+"ypos = 'center' "
+"orientation = 'bottom' "
 "/> "
-"<widget name = 'subSubtitleSpeedLabel' "
-"type = 'SmallLabel' "
+"<text font = 'text_default' "
+"vertical_align = 'center' "
+"horizontal_align = 'left' "
 "/> "
-"</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'> "
-"<widget name = 'vcMusicText' "
-"type = 'OptionsLabel' "
+"</drawdata> "
+"<drawdata id = 'popup_hover' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<widget name = 'vcMusicSlider' "
-"type = 'Slider' "
+"<drawstep func = 'triangle' "
+"fg_color = 'green2' "
+"fill = 'foreground' "
+"width = 'height' "
+"height = 'auto' "
+"xpos = 'right' "
+"ypos = 'center' "
+"orientation = 'bottom' "
 "/> "
-"<widget name = 'vcMusicLabel' "
-"type = 'SmallLabel' "
+"<text font = 'text_hover' "
+"vertical_align = 'center' "
+"horizontal_align = 'left' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
-"<widget name = 'vcSfxText' "
-"type = 'OptionsLabel' "
+"</drawdata> "
+"<drawdata id = 'widget_textedit' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<widget name = 'vcSfxSlider' "
-"type = 'Slider' "
+"</drawdata> "
+"<drawdata id = 'plain_bg' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
-"<widget name = 'vcSfxLabel' "
-"type = 'SmallLabel' "
+"</drawdata> "
+"<drawdata id = 'caret' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'lightgrey' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
-"<widget name = 'vcSpeechText' "
-"type = 'OptionsLabel' "
+"</drawdata> "
+"<drawdata id = 'default_bg' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
-"<widget name = 'vcSpeechSlider' "
-"type = 'Slider' "
+"</drawdata> "
+"<drawdata id = 'button_idle' cache = false> "
+"<text font = 'text_button' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
 "/> "
-"<widget name = 'vcSpeechLabel' "
-"type = 'SmallLabel' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"</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'> "
-"<widget name = 'mcFontButton' "
-"type = 'Button' "
+"</drawdata> "
+"<drawdata id = 'button_hover' cache = false> "
+"<text font = 'text_button_hover' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
 "/> "
-"<widget name = 'mcFontPath' "
-"height = 'Globals.Line.Height' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<widget name = 'mcFontClearButton' "
-"height = 'Globals.Line.Height' "
-"width = 'Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id = 'button_disabled' cache = false> "
+"<text font = 'text_disabled' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
 "/> "
-"</layout> "
-"<widget name = 'mcMixedCheckbox' "
-"type = 'Checkbox' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<widget name = 'mcMt32Checkbox' "
-"type = 'Checkbox' "
+"</drawdata> "
+"<drawdata id = 'checkbox_disabled' cache = false> "
+"<text font = 'text_disabled' "
+"vertical_align = 'top' "
+"horizontal_align = 'left' "
 "/> "
-"<widget name = 'mcGSCheckbox' "
-"type = 'Checkbox' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
-"<widget name = 'mcMidiGainText' "
-"type = 'OptionsLabel' "
+"</drawdata> "
+"<drawdata id = 'checkbox_selected' cache = false> "
+"<text font = 'text_default' "
+"vertical_align = 'top' "
+"horizontal_align = 'left' "
 "/> "
-"<widget name = 'mcMidiGainSlider' "
-"type = 'Slider' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"<widget name = 'mcMidiGainLabel' "
-"width = '32' "
-"height = 'Globals.Line.Height' "
+"<drawstep func = 'cross' "
+"fill = 'foreground' "
+"stroke = '2' "
+"fg_color = 'green' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id = 'checkbox_default' cache = false> "
+"<text font = 'text_default' "
+"vertical_align = 'top' "
+"horizontal_align = 'left' "
 "/> "
-"<widget name = 'SavePath' "
-"height = 'Globals.Line.Height' "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
-"<widget name = 'ThemeButton' "
-"type = 'Button' "
+"</drawdata> "
+"<drawdata id = 'widget_default' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
 "/> "
-"<widget name = 'ThemePath' "
-"height = 'Globals.Line.Height' "
+"</drawdata> "
+"</render_info> "
+"<layout_info resolution = '-320xY, -256x240'> "
+"<globals> "
+"<def var = 'Line.Height' value = '16' /> "
+"<def var = 'Font.Height' value = '16' /> "
+"<def var = 'TabLabelWidth' value = '110' /> "
+"<def var = 'WidgetSize' value = 'kBigWidgetSize' /> "
+"<def var = 'About.OuterBorder' value = '80'/> "
+"<def var = 'PopUpWidget.labelSpacing' value = '10' /> "
+"<def var = 'Layout.Spacing' value = '8' /> "
+"<def var = 'ShowLauncherLogo' value = '0'/> "
+"<def var = 'ShowGlobalMenuLogo' value = '0'/> "
+"<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> "
+"<widget name = 'OptionsLabel' "
+"size = '110, Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
-"<widget name = 'ExtraButton' "
-"type = 'Button' "
+"<widget name = 'SmallLabel' "
+"size = '24, Globals.Line.Height' "
 "/> "
-"<widget name = 'ExtraPath' "
-"height = 'Globals.Line.Height' "
+"<widget name = 'ShortOptionsLabel' "
+"size = '60, Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
-"<widget name = 'PluginsButton' "
-"type = 'Button' "
+"<widget name = 'Button' "
+"size = 'kBigButtonWidth, kBigButtonHeight' "
 "/> "
-"<widget name = 'PluginsPath' "
-"height = 'Globals.Line.Height' "
+"<widget name = 'Slider' "
+"size = 'kBigSliderWidth, kBigSliderHeight' "
 "/> "
-"</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 = 'PopUp' "
+"size = '-1, 19' "
 "/> "
-"<widget name = 'CurTheme' "
-"height = 'Globals.Line.Height' "
+"<widget name = 'Checkbox' "
+"size = '-1, 14' "
 "/> "
-"</layout> "
-"<widget name = 'Renderer' "
-"type = 'PopUp' "
+"<widget name = 'ListWidget' "
+"padding = '5, 0, 8, 0' "
 "/> "
-"<widget name = 'AutosavePeriod' "
-"type = 'PopUp' "
+"<widget name = 'PopUpWidget' "
+"padding = '7, 5, 0, 0' "
 "/> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> "
-"<widget name = 'TabWidget'/> "
-"<layout type = 'horizontal' padding = '16, 16, 16, 4'> "
-"<space/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
+"<widget name = 'EditTextWidget' "
+"padding = '5, 5, 0, 0' "
 "/> "
-"<widget name = 'Ok' "
-"type = 'Button' "
+"<widget name = 'Console' "
+"padding = '7, 5, 5, 5' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
-"<widget name = 'EnableTabCheckbox' "
-"type = 'Checkbox' "
+"<widget name = 'TabWidget.Tab' "
+"size = '75, 27' "
+"padding = '0, 0, 8, 0' "
 "/> "
-"<import layout = 'Dialog.GlobalOptions_Graphics' /> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
-"<widget name = 'EnableTabCheckbox' "
-"type = 'Checkbox' "
+"<widget name = 'TabWidget.NavButton' "
+"size = '15, 18' "
+"padding = '0, 3, 4, 0' "
 "/> "
-"<import layout = 'Dialog.GlobalOptions_Audio' /> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
-"<widget name = 'EnableTabCheckbox' "
-"type = 'Checkbox' "
+"</globals> "
+"<dialog name = 'Launcher' overlays = 'screen'> "
+"<layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'> "
+"<widget name = 'Version' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<import layout = 'Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
-"<widget name = 'EnableTabCheckbox' "
-"type = 'Checkbox' "
+"<widget name = 'GameList'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
+"<widget name = 'LoadGameButton' "
+"height = '20' "
 "/> "
-"<import layout = 'Dialog.GlobalOptions_Volume' /> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions_Game' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16'> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
-"<widget name = 'Id' "
-"type = 'OptionsLabel' "
+"<widget name = 'AddGameButton' "
+"height = '20' "
 "/> "
-"<widget name = 'Domain' "
-"type = 'PopUp' "
+"<widget name = 'EditGameButton' "
+"height = '20' "
+"/> "
+"<widget name = 'RemoveGameButton' "
+"height = '20' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
-"<widget name = 'Name' "
-"type = 'OptionsLabel' "
+"<space size = '4'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
+"<widget name = 'QuitButton' "
+"height = '20' "
 "/> "
-"<widget name = 'Desc' "
-"type = 'PopUp' "
+"<widget name = 'AboutButton' "
+"height = '20' "
 "/> "
-"</layout> "
-"<widget name = 'Lang' "
-"type = 'PopUp' "
+"<widget name = 'OptionsButton' "
+"height = '20' "
 "/> "
-"<widget name = 'Platform' "
-"type = 'PopUp' "
+"<widget name = 'StartButton' "
+"height = '20' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16'> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> "
-"<widget name = 'Savepath' "
-"type = 'Button' "
+"<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8'> "
+"<widget name = 'Headline' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'SavepathText' "
+"<widget name = 'Path' "
 "height = 'Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> "
-"<widget name = 'Extrapath' "
+"<widget name = 'List'/> "
+"<layout type = 'horizontal' padding = '0, 0, 16, 0'> "
+"<widget name = 'Up' "
 "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' "
+"<space/> "
+"<widget name = 'Cancel' "
 "type = 'Button' "
 "/> "
-"<widget name = 'GamepathText' "
-"height = 'Globals.Line.Height' "
+"<widget name = 'Choose' "
+"type = 'Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'GlobalMenu' overlays = 'screen_center'> "
-"<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'> "
-"<widget name = 'Title' "
-"width = '210' "
-"height = 'Globals.Line.Height' "
-"/> "
-"<widget name = 'Version' "
-"width = '210' "
-"height = 'Globals.Line.Height' "
-"/> "
-"<widget name = 'Resume' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
-"/> "
-"<space size = '10'/> "
-"<widget name = 'Load' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
+"<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
+"<layout type = 'vertical' padding = '0, 0, 0, 0'> "
+"<widget name = 'TabWidget'/> "
+"<layout type = 'horizontal' padding = '16, 16, 16, 16'> "
+"<space/> "
+"<widget name = 'Cancel' "
+"type = 'Button' "
 "/> "
-"<widget name = 'Save' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
+"<widget name = 'Ok' "
+"type = 'Button' "
 "/> "
-"<space size = '10'/> "
-"<widget name = 'Options' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
+"<widget name = 'grModePopup' "
+"type = 'PopUp' "
 "/> "
-"<widget name = 'About' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
+"<widget name = 'grRenderPopup' "
+"type = 'PopUp' "
 "/> "
-"<space size = '10'/> "
-"<widget name = 'RTL' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
+"<widget name = 'grAspectCheckbox' "
+"type = 'Checkbox' "
 "/> "
-"<widget name = 'Quit' "
-"width = '150' "
-"height = 'Globals.Button.Height' "
+"<widget name = 'grFullscreenCheckbox' "
+"type = 'Checkbox' "
 "/> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'ScummMain' overlays = 'screen_center'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8'> "
-"<widget name = 'Resume' "
-"type = 'Button' "
+"<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
+"<widget name = 'auMidiPopup' "
+"type = 'PopUp' "
 "/> "
-"<space size = '15'/> "
-"<widget name = 'Load' "
-"type = 'Button' "
+"<widget name = 'auSampleRatePopup' "
+"type = 'PopUp' "
 "/> "
-"<widget name = 'Save' "
-"type = 'Button' "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
+"<widget name = 'subToggleDesc' "
+"type = 'OptionsLabel' "
 "/> "
-"<space size = '15'/> "
-"<widget name = 'Options' "
-"type = 'Button' "
+"<widget name = 'subToggleButton' "
+"width = '150' "
+"height = 'Globals.Slider.Height' "
 "/> "
-"<widget name = 'Help' "
-"type = 'Button' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
+"<widget name = 'subSubtitleSpeedDesc' "
+"type = 'OptionsLabel' "
 "/> "
-"<widget name = 'About' "
-"type = 'Button' "
+"<widget name = 'subSubtitleSpeedSlider' "
+"type = 'Slider' "
 "/> "
-"<space size = '15'/> "
-"<widget name = 'Quit' "
-"type = 'Button' "
+"<widget name = 'subSubtitleSpeedLabel' "
+"type = 'SmallLabel' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name = 'ScummConfig' overlays = 'screen_center'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<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'> "
 "<widget name = 'vcMusicText' "
 "type = 'OptionsLabel' "
 "/> "
@@ -485,7 +492,7 @@
 "type = 'SmallLabel' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
 "<widget name = 'vcSfxText' "
 "type = 'OptionsLabel' "
 "/> "
@@ -496,7 +503,7 @@
 "type = 'SmallLabel' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
 "<widget name = 'vcSpeechText' "
 "type = 'OptionsLabel' "
 "/> "
@@ -507,416 +514,409 @@
 "type = 'SmallLabel' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<widget name = 'subToggleDesc' "
-"type = 'OptionsLabel' "
+"</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'> "
+"<widget name = 'mcFontButton' "
+"type = 'Button' "
 "/> "
-"<widget name = 'subToggleButton' "
-"width = '158' "
-"height = 'Globals.Slider.Height' "
+"<widget name = 'mcFontPath' "
+"height = 'Globals.Line.Height' "
+"/> "
+"<widget name = 'mcFontClearButton' "
+"height = 'Globals.Line.Height' "
+"width = 'Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<widget name = 'subSubtitleSpeedDesc' "
+"<widget name = 'mcMixedCheckbox' "
+"type = 'Checkbox' "
+"/> "
+"<widget name = 'mcMt32Checkbox' "
+"type = 'Checkbox' "
+"/> "
+"<widget name = 'mcGSCheckbox' "
+"type = 'Checkbox' "
+"/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
+"<widget name = 'mcMidiGainText' "
 "type = 'OptionsLabel' "
 "/> "
-"<widget name = 'subSubtitleSpeedSlider' "
+"<widget name = 'mcMidiGainSlider' "
 "type = 'Slider' "
 "/> "
-"<widget name = 'subSubtitleSpeedLabel' "
-"type = 'SmallLabel' "
+"<widget name = 'mcMidiGainLabel' "
+"width = '32' "
+"height = 'Globals.Line.Height' "
 "/> "
 "</layout> "
-"<space size = '60'/> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<space size = 'Globals.Button.Width' /> "
-"<widget name = 'Cancel' "
+"</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 = 'Ok' "
-"type = 'Button' "
+"<widget name = 'SavePath' "
+"height = 'Globals.Line.Height' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> "
-"<widget name = 'Title' "
-"height = 'Globals.Line.Height' "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
+"<widget name = 'ThemeButton' "
+"type = 'Button' "
 "/> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> "
-"<widget name = 'List' /> "
-"<widget name = 'Thumbnail' "
-"width = '180' "
-"height = '200' "
+"<widget name = 'ThemePath' "
+"height = 'Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
-"<space/> "
-"<widget name = 'Delete' "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
+"<widget name = 'ExtraButton' "
 "type = 'Button' "
 "/> "
-"<space size = '32'/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
+"<widget name = 'ExtraPath' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'Choose' "
+"</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 = 'ScummHelp' overlays = 'screen_center'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> "
-"<widget name = 'Title' "
-"width = '320' "
+"<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' "
 "/> "
-"<widget name = 'HelpText' "
-"height = '220' "
+"</layout> "
+"<widget name = 'Renderer' "
+"type = 'PopUp' "
 "/> "
-"<layout type = 'horizontal' padding = '0, 0, 16, 0'> "
-"<widget name = 'Prev' "
-"type = 'Button' "
+"<widget name = 'AutosavePeriod' "
+"type = 'PopUp' "
 "/> "
-"<widget name = 'Next' "
+"</layout> "
+"</dialog> "
+"<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
+"<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'> "
+"<widget name = 'TabWidget'/> "
+"<layout type = 'horizontal' padding = '16, 16, 16, 4'> "
+"<space/> "
+"<widget name = 'Cancel' "
 "type = 'Button' "
 "/> "
-"<space size = '32'/> "
-"<widget name = 'Close' "
+"<widget name = 'Ok' "
 "type = 'Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> "
-"<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> "
-"<widget name = 'DirProgressText' "
-"width = '250' "
-"height = 'Globals.Line.Height' "
-"/> "
-"<widget name = 'GameProgressText' "
-"width = '250' "
-"height = 'Globals.Line.Height' "
+"<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
+"<widget name = 'EnableTabCheckbox' "
+"type = 'Checkbox' "
 "/> "
-"<space size = '32' /> "
-"<layout type = 'horizontal' padding = '8, 8, 8, 8'> "
-"<widget name = 'Ok' "
-"type = 'Button' "
+"<import layout = 'Dialog.GlobalOptions_Graphics' /> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'GameOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
+"<widget name = 'EnableTabCheckbox' "
+"type = 'Checkbox' "
 "/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
+"<import layout = 'Dialog.GlobalOptions_Audio' /> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'GameOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
+"<widget name = 'EnableTabCheckbox' "
+"type = 'Checkbox' "
 "/> "
+"<import layout = 'Dialog.GlobalOptions_MIDI' /> "
 "</layout> "
+"</dialog> "
+"<dialog name = 'GameOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> "
+"<widget name = 'EnableTabCheckbox' "
+"type = 'Checkbox' "
+"/> "
+"<import layout = 'Dialog.GlobalOptions_Volume' /> "
 "</layout> "
 "</dialog> "
-"</layout_info> "
-"<render_info> "
-"<palette> "
-"<color name = 'black' "
-"rgb = '0, 0, 0' "
+"<dialog name = 'GameOptions_Game' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16'> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
+"<widget name = 'Id' "
+"type = 'OptionsLabel' "
 "/> "
-"<color name = 'lightgrey' "
-"rgb = '104, 104, 104' "
+"<widget name = 'Domain' "
+"type = 'PopUp' "
 "/> "
-"<color name = 'darkgrey' "
-"rgb = '64, 64, 64' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
+"<widget name = 'Name' "
+"type = 'OptionsLabel' "
 "/> "
-"<color name = 'green' "
-"rgb = '32, 160, 32' "
+"<widget name = 'Desc' "
+"type = 'PopUp' "
 "/> "
-"<color name = 'green2' "
-"rgb = '0, 255, 0' "
+"</layout> "
+"<widget name = 'Lang' "
+"type = 'PopUp' "
 "/> "
-"</palette> "
-"<fonts> "
-"<font id = 'text_default' "
-"file = 'default' "
-"color = 'green' "
+"<widget name = 'Platform' "
+"type = 'PopUp' "
 "/> "
-"<font id = 'text_hover' "
-"file = 'default' "
-"color = 'green2' "
+"</layout> "
+"</dialog> "
+"<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16'> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> "
+"<widget name = 'Savepath' "
+"type = 'Button' "
 "/> "
-"<font id = 'text_disabled' "
-"file = 'default' "
-"color = 'lightgrey' "
+"<widget name = 'SavepathText' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<font id = 'text_inverted' "
-"file = 'default' "
-"color = 'black' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> "
+"<widget name = 'Extrapath' "
+"type = 'Button' "
 "/> "
-"<font id = 'text_button' "
-"file = 'default' "
-"color = 'green' "
+"<widget name = 'ExtrapathText' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<font id = 'text_button_hover' "
-"file = 'default' "
-"color = 'green2' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'> "
+"<widget name = 'Gamepath' "
+"type = 'Button' "
 "/> "
-"<font id = 'text_normal' "
-"file = 'default' "
-"color = 'green' "
+"<widget name = 'GamepathText' "
+"height = 'Globals.Line.Height' "
 "/> "
-"</fonts> "
-"<defaults fill = 'foreground' fg_color = 'darkgrey' bg_color = 'black' shadow = '0' bevel_color = 'lightgrey'/> "
-"<drawdata id = 'text_selection' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'GlobalMenu' overlays = 'screen_center'> "
+"<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'> "
+"<widget name = 'Title' "
+"width = '210' "
+"height = 'Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'mainmenu_bg' cache = false> "
-"<drawstep func = 'fill' "
-"fill = 'foreground' "
-"fg_color = 'black' "
+"<widget name = 'Version' "
+"width = '210' "
+"height = 'Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'special_bg' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
+"<widget name = 'Resume' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'separator' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"height = '2' "
-"ypos = 'center' "
-"fg_color = 'lightgrey' "
+"<space size = '10'/> "
+"<widget name = 'Load' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_base' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
+"<widget name = 'Save' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_handle_hover' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green2' "
+"<space size = '10'/> "
+"<widget name = 'Options' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_handle_idle' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green' "
+"<widget name = 'About' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_button_idle' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<space size = '10'/> "
+"<widget name = 'RTL' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green' "
-"fill = 'foreground' "
-"width = 'auto' "
-"height = 'auto' "
-"xpos = 'center' "
-"ypos = 'center' "
-"orientation = 'top' "
+"<widget name = 'Quit' "
+"width = '150' "
+"height = 'Globals.Button.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_button_hover' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"</layout> "
+"</dialog> "
+"<dialog name = 'ScummMain' overlays = 'screen_center'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8'> "
+"<widget name = 'Resume' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green2' "
-"fill = 'foreground' "
-"width = 'auto' "
-"height = 'auto' "
-"xpos = 'center' "
-"ypos = 'center' "
-"orientation = 'top' "
+"<space size = '15'/> "
+"<widget name = 'Load' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'tab_active' cache = false> "
-"<text font = 'text_hover' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
+"<widget name = 'Save' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'tab' "
-"bevel = '2' "
-"radius = '0' "
-"fill = 'none' "
+"<space size = '15'/> "
+"<widget name = 'Options' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'tab_inactive' cache = false> "
-"<text font = 'text_default' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
+"<widget name = 'Help' "
+"type = 'Button' "
+"/> "
+"<widget name = 'About' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'tab' "
-"bevel = '2' "
-"radius = '0' "
-"fill = 'none' "
+"<space size = '15'/> "
+"<widget name = 'Quit' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'tab_background' cache = false> "
-"</drawdata> "
-"<drawdata id = 'widget_slider' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"</layout> "
+"</dialog> "
+"<dialog name = 'ScummConfig' overlays = 'screen_center'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<widget name = 'vcMusicText' "
+"type = 'OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'slider_disabled' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'lightgrey' "
+"<widget name = 'vcMusicSlider' "
+"type = 'Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'slider_full' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green' "
+"<widget name = 'vcMusicLabel' "
+"type = 'SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'slider_hover' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green2' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<widget name = 'vcSfxText' "
+"type = 'OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'widget_small' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'vcSfxSlider' "
+"type = 'Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'popup_idle' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'vcSfxLabel' "
+"type = 'SmallLabel' "
 "/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green' "
-"fill = 'foreground' "
-"width = 'height' "
-"height = 'auto' "
-"xpos = 'right' "
-"ypos = 'center' "
-"orientation = 'bottom' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<widget name = 'vcSpeechText' "
+"type = 'OptionsLabel' "
 "/> "
-"<text font = 'text_default' "
-"vertical_align = 'center' "
-"horizontal_align = 'left' "
+"<widget name = 'vcSpeechSlider' "
+"type = 'Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'popup_hover' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'vcSpeechLabel' "
+"type = 'SmallLabel' "
 "/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green2' "
-"fill = 'foreground' "
-"width = 'height' "
-"height = 'auto' "
-"xpos = 'right' "
-"ypos = 'center' "
-"orientation = 'bottom' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<widget name = 'subToggleDesc' "
+"type = 'OptionsLabel' "
 "/> "
-"<text font = 'text_hover' "
-"vertical_align = 'center' "
-"horizontal_align = 'left' "
+"<widget name = 'subToggleButton' "
+"width = '158' "
+"height = 'Globals.Slider.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'widget_textedit' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<widget name = 'subSubtitleSpeedDesc' "
+"type = 'OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'plain_bg' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
+"<widget name = 'subSubtitleSpeedSlider' "
+"type = 'Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'caret' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'lightgrey' "
+"<widget name = 'subSubtitleSpeedLabel' "
+"type = 'SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'default_bg' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
+"</layout> "
+"<space size = '60'/> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
+"<space size = 'Globals.Button.Width' /> "
+"<widget name = 'Cancel' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'button_idle' cache = false> "
-"<text font = 'text_button' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
+"<widget name = 'Ok' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> "
+"<widget name = 'Title' "
+"height = 'Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'button_hover' cache = false> "
-"<text font = 'text_button_hover' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
+"<layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> "
+"<widget name = 'List' /> "
+"<widget name = 'Thumbnail' "
+"width = '180' "
+"height = '200' "
 "/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"</layout> "
+"<layout type = 'horizontal' padding = '0, 0, 0, 0'> "
+"<space/> "
+"<widget name = 'Delete' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'button_disabled' cache = false> "
-"<text font = 'text_disabled' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
+"<space size = '32'/> "
+"<widget name = 'Cancel' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'Choose' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'checkbox_disabled' cache = false> "
-"<text font = 'text_disabled' "
-"vertical_align = 'top' "
-"horizontal_align = 'left' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'ScummHelp' overlays = 'screen_center'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'> "
+"<widget name = 'Title' "
+"width = '320' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'HelpText' "
+"height = '220' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'checkbox_selected' cache = false> "
-"<text font = 'text_default' "
-"vertical_align = 'top' "
-"horizontal_align = 'left' "
+"<layout type = 'horizontal' padding = '0, 0, 16, 0'> "
+"<widget name = 'Prev' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'Next' "
+"type = 'Button' "
 "/> "
-"<drawstep func = 'cross' "
-"fill = 'foreground' "
-"stroke = '2' "
-"fg_color = 'green' "
+"<space size = '32'/> "
+"<widget name = 'Close' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'checkbox_default' cache = false> "
-"<text font = 'text_default' "
-"vertical_align = 'top' "
-"horizontal_align = 'left' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> "
+"<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> "
+"<widget name = 'DirProgressText' "
+"width = '250' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
+"<widget name = 'GameProgressText' "
+"width = '250' "
+"height = 'Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id = 'widget_default' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
+"<space size = '32' /> "
+"<layout type = 'horizontal' padding = '8, 8, 8, 8'> "
+"<widget name = 'Ok' "
+"type = 'Button' "
 "/> "
-"</drawdata> "
-"</render_info> "
+"<widget name = 'Cancel' "
+"type = 'Button' "
+"/> "
+"</layout> "
+"</layout> "
+"</dialog> "
+"</layout_info> "
 "<layout_info resolution = '320xY, 256x240'> "
 "<globals> "
 "<def var = 'Line.Height' value = '12' /> "
@@ -948,7 +948,7 @@
 "size = '-1, Globals.Line.Height' "
 "/> "
 "<widget name = 'ListWidget' "
-"padding = '5, 0, 8, 0' "
+"padding = '5, 0, 0, 0' "
 "/> "
 "<widget name = 'PopUpWidget' "
 "padding = '7, 5, 0, 0' "
@@ -988,7 +988,6 @@
 "height = '12' "
 "/> "
 "</layout> "
-"<space size = '4'/> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
 "<widget name = 'QuitButton' "
 "height = '12' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 9278727cb3..afc545f335 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index c663c16853..888d34ba3b 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -105,7 +105,7 @@
 						height = '20'
 				/>
 			</layout>
-			<space size = '12'/>
+			<space size = '4'/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'QuitButton' 
 						height = '20'
diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx
index 921e3ff5eb..7304adb15e 100644
--- a/gui/themes/scummclassic/classic_layout_320.stx
+++ b/gui/themes/scummclassic/classic_layout_320.stx
@@ -60,7 +60,7 @@
 				size = '-1, Globals.Line.Height'
 		/>
 		<widget name = 'ListWidget'
-				padding = '5, 0, 8, 0'
+				padding = '5, 0, 0, 0'
 		/>
 		<widget name = 'PopUpWidget'
 				padding = '7, 5, 0, 0'
@@ -101,7 +101,6 @@
 						height = '12'
 				/>
 			</layout>
-			<space size = '4'/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'QuitButton' 
 						height = '12'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 8e2cb0be67..b62aa2c9f3 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
-- 
cgit v1.2.3