From 50a682e7e1c69082735a07b2261d1c0c61ac12c9 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Wed, 23 Feb 2011 18:58:59 +0100
Subject: GUI: Make the ThemeParser less dumb

Instead of running into assert()s due to dumb parser decisions, use
'less than' and 'greater than' width/height conditions on the
'resolution' tags.
Seems better than listing >9000 different android resolutions.
---
 gui/themes/default.inc                             | 2898 ++++++++++----------
 gui/themes/scummclassic.zip                        |  Bin 91252 -> 91156 bytes
 gui/themes/scummclassic/classic_gfx.stx            |    6 +-
 gui/themes/scummclassic/classic_layout.stx         |    2 +-
 gui/themes/scummclassic/classic_layout_lowres.stx  |    2 +-
 gui/themes/scummmodern.zip                         |  Bin 198584 -> 198479 bytes
 gui/themes/scummmodern/scummmodern_gfx.stx         |    8 +-
 gui/themes/scummmodern/scummmodern_layout.stx      |    2 +-
 .../scummmodern/scummmodern_layout_lowres.stx      |    2 +-
 9 files changed, 1460 insertions(+), 1460 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 3236071055..62a796a6f9 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,614 +1,688 @@
  "<?xml version = '1.0'?>"
-"<layout_info resolution='-320xY,-256x240,-Xx272,-544x332,-Xx350'> "
-"<globals> "
-"<def var='Line.Height' value='16' /> "
-"<def var='Font.Height' value='16' /> "
-"<def var='About.OuterBorder' value='80'/> "
-"<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='1'/> "
-"<def var='KeyMapper.Spacing' value='10'/> "
-"<def var='KeyMapper.LabelWidth' value='100'/> "
-"<def var='KeyMapper.ButtonWidth' value='80'/> "
-"<def var='Tooltip.MaxWidth' value='200'/> "
-"<def var='Tooltip.XDelta' value='16'/> "
-"<def var='Tooltip.YDelta' value='16'/> "
-"<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='SmallLabel' "
-"size='24,Globals.Line.Height' "
+"<render_info> "
+"<palette> "
+"<color name='black' "
+"rgb='0,0,0' "
 "/> "
-"<widget name='ShortOptionsLabel' "
-"size='60,Globals.Line.Height' "
+"<color name='lightgrey' "
+"rgb='104,104,104' "
 "/> "
-"<widget name='Button' "
-"size='108,24' "
+"<color name='darkgrey' "
+"rgb='64,64,64' "
 "/> "
-"<widget name='Slider' "
-"size='128,18' "
+"<color name='green' "
+"rgb='32,160,32' "
 "/> "
-"<widget name='PopUp' "
-"size='-1,19' "
+"<color name='green2' "
+"rgb='0,255,0' "
 "/> "
-"<widget name='Checkbox' "
-"size='-1,14' "
+"</palette> "
+"<fonts> "
+"<font id='text_default' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='Radiobutton' "
-"size='-1,Globals.Line.Height' "
+"<font resolution='y<400' "
+"id='text_default' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='ListWidget' "
-"padding='5,0,8,0' "
+"<font id='text_button' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='PopUpWidget' "
-"padding='7,5,0,0' "
+"<font resolution='y<400' "
+"id='text_button' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='EditTextWidget' "
-"padding='5,5,0,0' "
+"<font id='text_normal' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='Console' "
-"padding='7,5,5,5' "
+"<font resolution='y<400' "
+"id='text_normal' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='Scrollbar' "
-"size='15,0' "
+"<font id='tooltip_normal' "
+"file='fixed5x8.bdf' "
 "/> "
-"<widget name='TabWidget.Tab' "
-"size='75,27' "
-"padding='0,0,8,0' "
+"<text_color id='color_normal' "
+"color='green' "
 "/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,0' "
+"<text_color id='color_normal_inverted' "
+"color='black' "
 "/> "
-"<widget name='TabWidget.NavButton' "
-"size='15,18' "
-"padding='0,3,4,0' "
+"<text_color id='color_normal_hover' "
+"color='green2' "
 "/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='16,16,8,8'> "
-"<widget name='Version' "
-"height='Globals.Line.Height' "
+"<text_color id='color_normal_disabled' "
+"color='lightgrey' "
 "/> "
-"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<text_color id='color_alternative' "
+"color='lightgrey' "
 "/> "
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
+"<text_color id='color_alternative_inverted' "
+"color='255,255,255' "
 "/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<text_color id='color_alternative_hover' "
+"color='176,176,176' "
 "/> "
-"<space /> "
-"</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='LoadGameButton' "
-"height='20' "
+"<text_color id='color_alternative_disabled' "
+"color='darkgrey' "
 "/> "
-"<widget name='AddGameButton' "
-"height='20' "
+"<text_color id='color_button' "
+"color='green' "
 "/> "
-"<widget name='EditGameButton' "
-"height='20' "
+"<text_color id='color_button_hover' "
+"color='green2' "
 "/> "
-"<widget name='RemoveGameButton' "
-"height='20' "
+"<text_color id='color_button_disabled' "
+"color='lightgrey' "
 "/> "
-"</layout> "
-"<space size='4'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='QuitButton' "
-"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='lightgrey' "
 "/> "
-"<widget name='AboutButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='text_selection_focus' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"<widget name='OptionsButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='mainmenu_bg' cache='false'> "
+"<drawstep func='fill' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"<widget name='StartButton' "
-"height='20' "
+"</drawdata> "
+"<drawdata id='special_bg' 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='tooltip_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"<widget name='Path' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='separator' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"height='2' "
+"ypos='center' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Up' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_base' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_idle' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='auto' "
+"height='auto' "
+"xpos='center' "
+"ypos='center' "
+"orientation='top' "
 "/> "
-"</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='10' center='true'> "
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='grModePopup' "
-"type='PopUp' "
+"<drawstep func='triangle' "
+"fg_color='green2' "
+"fill='foreground' "
+"width='auto' "
+"height='auto' "
+"xpos='center' "
+"ypos='center' "
+"orientation='top' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='tab_active' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
 "/> "
-"</layout> "
-"<widget name='grAspectCheckbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='tab_inactive' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='grFullscreenCheckbox' "
-"type='Checkbox' "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
 "/> "
-"<widget name='grDisableDitheringCheckbox' "
-"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'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auMidiPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='slider_disabled' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='auMidiPopup' "
-"type='PopUp' "
+"</drawdata> "
+"<drawdata id='slider_full' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auOPLPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='slider_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"<widget name='auOPLPopup' "
-"type='PopUp' "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='auSampleRatePopup' "
-"type='PopUp' "
+"<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='10'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"<drawstep func='triangle' "
+"fg_color='lightgrey' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<drawstep func='triangle' "
+"fg_color='green2' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='vcMusicText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='widget_textedit' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='plain_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='vcMusicLabel' "
-"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='vcSfxText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='default_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='button_idle' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='button_hover' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='button_disabled' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_disabled' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,0,24,0' center='true'> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
+"<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' spacing='10' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='checkbox_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='checkbox_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"<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' "
+"<drawstep func='cross' "
+"fill='foreground' "
+"stroke='2' "
+"fg_color='green' "
 "/> "
-"</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='checkbox_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='mcMidiGainText' "
-"type='OptionsLabel' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='mcMidiGainSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='radiobutton_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fill='background' "
+"bg_color='darkgrey' "
+"xpos='0' "
+"ypos='0' "
 "/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='radiobutton_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fg_color='darkgrey' "
+"fill='none' "
+"xpos='0' "
+"ypos='0' "
 "/> "
-"</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='5' "
+"fg_color='green' "
+"fill='foreground' "
+"xpos='2' "
+"ypos='2' "
 "/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
+"</drawdata> "
+"<drawdata id='radiobutton_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"</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='10' center='true'> "
-"<widget name='SaveButton' "
-"type='Button' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"bg_color='lightgrey' "
+"fill='background' "
+"xpos='0' "
+"ypos='0' "
 "/> "
-"<widget name='SavePath' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='widget_default' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ThemeButton' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='square' "
+"stroke='0' "
 "/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"</render_info> "
+"<layout_info resolution='y>399'> "
+"<globals> "
+"<def var='Line.Height' value='16' /> "
+"<def var='Font.Height' value='16' /> "
+"<def var='About.OuterBorder' value='80'/> "
+"<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='1'/> "
+"<def var='KeyMapper.Spacing' value='10'/> "
+"<def var='KeyMapper.LabelWidth' value='100'/> "
+"<def var='KeyMapper.ButtonWidth' value='80'/> "
+"<def var='Tooltip.MaxWidth' value='200'/> "
+"<def var='Tooltip.XDelta' value='16'/> "
+"<def var='Tooltip.YDelta' value='16'/> "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<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='108,24' "
 "/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
+"<widget name='Slider' "
+"size='128,18' "
 "/> "
-"</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='10' center='true'> "
-"<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> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='RendererPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
 "/> "
-"<widget name='RendererPopup' "
-"type='PopUp' "
+"<widget name='ListWidget' "
+"padding='5,0,8,0' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
 "/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Console' "
+"padding='7,5,5,5' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='Scrollbar' "
+"size='15,0' "
 "/> "
-"</layout> "
-"<widget name='KeysButton' "
-"type='Button' "
+"<widget name='TabWidget.Tab' "
+"size='75,27' "
+"padding='0,0,8,0' "
 "/> "
-"</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='TabWidget.Body' "
+"padding='0,0,0,0' "
 "/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
+"<widget name='TabWidget.NavButton' "
+"size='15,18' "
+"padding='0,3,4,0' "
+"/> "
+"</globals> "
+"<dialog name='Launcher' overlays='screen'> "
+"<layout type='vertical' center='true' padding='16,16,8,8'> "
+"<widget name='Version' "
 "height='Globals.Line.Height' "
 "/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
-"type='Button' "
+"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
+"<widget name='SearchDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
+"<space /> "
 "</layout> "
-"</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='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='LoadGameButton' "
+"height='20' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='AddGameButton' "
+"height='20' "
 "/> "
-"</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='EditGameButton' "
+"height='20' "
 "/> "
-"<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='RemoveGameButton' "
+"height='20' "
 "/> "
-"<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' "
+"<space size='4'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='QuitButton' "
+"height='20' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<widget name='AboutButton' "
+"height='20' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
+"<widget name='OptionsButton' "
+"height='20' "
+"/> "
+"<widget name='StartButton' "
+"height='20' "
+"/> "
+"</layout> "
 "</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' "
+"<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='Path' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Up' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
+"</layout> "
 "</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='10' center='true'> "
-"<widget name='Id' "
-"type='OptionsLabel' "
+"<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='Domain' "
-"type='PopUp' "
+"<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='10' center='true'> "
-"<widget name='Name' "
+"<widget name='grModePopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='Desc' "
+"<widget name='grModePopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='LangPopupDesc' "
+"<widget name='grRenderPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='LangPopup' "
+"<widget name='grRenderPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<widget name='grFullscreenCheckbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='grDisableDitheringCheckbox' "
+"type='Checkbox' "
 "/> "
-"</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
+"<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='10' center='true'> "
-"<widget name='Savepath' "
-"type='Button' "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
+"<widget name='auOPLPopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<widget name='auSampleRatePopup' "
+"type='PopUp' "
 "/> "
 "</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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Save' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/> "
-"<space size='10'/> "
-"<widget name='Options' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='Help' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
 "/> "
-"<widget name='About' "
-"width='150' "
-"height='Globals.Button.Height' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"<space size='10'/> "
-"<widget name='RTL' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"<widget name='Quit' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
 "<layout type='horizontal' padding='0,0,0,0'> "
-"<layout type='vertical' padding='0,0,0,0' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
 "/> "
@@ -619,7 +693,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' "
 "/> "
@@ -630,7 +704,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' "
 "/> "
@@ -642,392 +716,339 @@
 "/> "
 "</layout> "
 "</layout> "
-"<layout type='vertical' padding='24,24,24,24' center='true'> "
+"<layout type='vertical' padding='24,0,24,0' center='true'> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
-"width='80'  "
 "/> "
 "</layout> "
 "</layout> "
-"<space size='8' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
+"</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='10' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='100' "
-"/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='100' "
-"/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='100' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<space size='60'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='Keys' "
-"type='Button' "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
 "/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
+"/> "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,32' center='true'> "
-"<widget name='Title' "
-"height='Globals.Line.Height' "
+"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auPrefMt32PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
-"<widget name='List' /> "
-"<widget name='Thumbnail' "
-"width='180' "
-"height='200' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<space/> "
-"<widget name='Delete' "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
+"/> "
+"</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='10' center='true'> "
+"<widget name='SaveButton' "
 "type='Button' "
 "/> "
-"<space size='32'/> "
-"<widget name='Cancel' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ThemeButton' "
 "type='Button' "
 "/> "
-"<widget name='Choose' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<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='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='10' center='true'> "
+"<widget name='ThemeButton' "
+"type='Button' "
+"/> "
+"<widget name='CurTheme' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='HelpText' "
-"height='200' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Prev' "
-"type='Button' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='Next' "
-"type='Button' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
 "</layout> "
 "</dialog> "
-"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' center='true'> "
-"<widget name='DirProgressText' "
-"width='480' "
+"<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='GameProgressText' "
-"width='480' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='GameList' "
-"width='480' "
-"height='250' "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
+"type='Button' "
+"/> "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
 "<widget name='Ok' "
 "type='Button' "
 "/> "
+"</layout> "
+"</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='Ok' "
+"type='Button' "
+"/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,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='400' "
-"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' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Graphics' /> "
 "</layout> "
-"<widget name='KeymapArea' "
-"width='600' "
-"height='280' "
+"</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='Close' "
-"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> "
-"</layout_info> "
-"<layout_info resolution='320xY,256x240,Xx272,544x332,Xx350'> "
-"<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' "
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='Slider' "
-"size='85,12' "
+"<import layout='Dialog.GlobalOptions_MT32' /> "
+"</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='OptionsLabel' "
-"size='110,Globals.Line.Height' "
-"textalign='right' "
+"<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='10' center='true'> "
+"<widget name='Id' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='SmallLabel' "
-"size='18,Globals.Line.Height' "
+"<widget name='Domain' "
+"type='PopUp' "
 "/> "
-"<widget name='PopUp' "
-"size='-1,15' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Name' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Checkbox' "
-"size='-1,Globals.Line.Height' "
+"<widget name='Desc' "
+"type='PopUp' "
 "/> "
-"<widget name='Radiobutton' "
-"size='-1,Globals.Line.Height' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='LangPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<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,-8' "
-"/> "
-"<widget name='TabWidget.NavButton' "
-"size='32,18' "
-"padding='0,0,1,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' "
+"<widget name='LangPopup' "
+"type='PopUp' "
 "/> "
 "</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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='StartButton' "
-"height='12' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/> "
 "</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' "
+"<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='10' center='true'> "
+"<widget name='Savepath' "
 "type='Button' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Extrapath' "
 "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' "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
 "/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<widget name='grAspectCheckbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='grFullscreenCheckbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='grDisableDitheringCheckbox' "
-"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='auOPLPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auOPLPopup' "
-"type='PopUp' "
+"<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' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Version' "
+"width='210' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='auSampleRatePopup' "
-"type='PopUp' "
+"<widget name='Resume' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"<space size='10'/> "
+"<widget name='Load' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"<widget name='Save' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"<space size='10'/> "
+"<widget name='Options' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
+"<widget name='Help' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<widget name='About' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<space size='10'/> "
+"<widget name='RTL' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='Quit' "
+"width='150' "
+"height='Globals.Button.Height' "
 "/> "
 "</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'> "
+"<dialog name='GlobalConfig' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='vertical' padding='0,0,0,0' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
 "/> "
@@ -1038,7 +1059,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/> "
@@ -1049,7 +1070,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/> "
@@ -1060,412 +1081,377 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
+"</layout> "
+"<layout type='vertical' padding='24,24,24,24' center='true'> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
+"width='80'  "
 "/> "
 "</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='6' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
+"<space size='8' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
 "</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='mcMidiGainText' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='mcMidiGainSlider' "
+"<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
 "/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' 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='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
-"/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
-"/> "
-"</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' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ThemeButton' "
+"<space size='60'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='Keys' "
 "type='Button' "
 "/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ExtraButton' "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
+"<widget name='Ok' "
 "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' "
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,32' center='true'> "
+"<widget name='Title' "
 "height='Globals.Line.Height' "
-"textalign='right' "
 "/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
+"<widget name='List' /> "
+"<widget name='Thumbnail' "
+"width='180' "
+"height='200' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<space/> "
+"<widget name='Delete' "
+"type='Button' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<space size='32'/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='KeysButton' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
+"<dialog name='ScummHelp' overlays='screen_center'> "
 "<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<widget name='Title' "
+"width='320' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
-"height='Globals.Line.Height' "
+"<widget name='HelpText' "
+"height='200' "
 "/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Prev' "
 "type='Button' "
 "/> "
-"<space/> "
-"<widget name='Cancel' "
+"<widget name='Next' "
 "type='Button' "
 "/> "
-"<widget name='Ok' "
+"<space size='32'/> "
+"<widget name='Close' "
 "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'/> "
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' center='true'> "
+"<widget name='DirProgressText' "
+"width='480' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameProgressText' "
+"width='480' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
+"/> "
 "<layout type='horizontal' padding='8,8,8,8'> "
-"<space/> "
-"<widget name='Cancel' "
+"<widget name='Ok' "
 "type='Button' "
 "/> "
-"<widget name='Ok' "
+"<widget name='Cancel' "
 "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' "
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<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' "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='400' "
+"height='Globals.Line.Height' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
 "</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
-"</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' "
+"<widget name='Close' "
+"type='Button' "
 "/> "
-"<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' "
+"</layout_info> "
+"<layout_info resolution='y<400'> "
+"<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='Domain' "
-"type='PopUp' "
+"<widget name='Slider' "
+"size='85,12' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='Name' "
-"width='35' "
-"height='Globals.Line.Height' "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
 "textalign='right' "
 "/> "
-"<widget name='Desc' "
-"type='PopUp' "
+"<widget name='SmallLabel' "
+"size='18,Globals.Line.Height' "
 "/> "
-"</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='PopUp' "
+"size='-1,15' "
 "/> "
-"<widget name='LangPopup' "
-"type='PopUp' "
+"<widget name='Checkbox' "
+"size='-1,Globals.Line.Height' "
 "/> "
-"</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='Radiobutton' "
+"size='-1,Globals.Line.Height' "
 "/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<widget name='ListWidget' "
+"padding='5,0,0,0' "
 "/> "
-"</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='PopUpWidget' "
+"padding='7,5,0,0' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
+"<widget name='Console' "
+"padding='7,5,5,5' "
 "/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
+"<widget name='Scrollbar' "
+"size='9,0' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<widget name='TabWidget.Tab' "
+"size='45,16' "
+"padding='0,0,2,0' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<widget name='TabWidget.Body' "
+"padding='0,0,0,-8' "
 "/> "
-"</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='TabWidget.NavButton' "
+"size='32,18' "
+"padding='0,0,1,0' "
 "/> "
+"</globals> "
+"<dialog name='Launcher' overlays='screen'> "
+"<layout type='vertical' center='true' padding='6,6,2,2'> "
 "<widget name='Version' "
-"width='160' "
-"height='4' "
+"height='Globals.Line.Height' "
 "/> "
-"<space size='1'/> "
-"<widget name='Load' "
-"width='120' "
+"<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='Save' "
-"width='120' "
+"<widget name='AddGameButton' "
 "height='12' "
 "/> "
-"<space size='1'/> "
-"<widget name='Options' "
-"width='120' "
+"<widget name='EditGameButton' "
 "height='12' "
 "/> "
-"<widget name='Help' "
-"width='120' "
+"<widget name='RemoveGameButton' "
 "height='12' "
 "/> "
-"<widget name='About' "
-"width='120' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='QuitButton' "
 "height='12' "
 "/> "
-"<space size='1'/> "
-"<widget name='Resume' "
-"width='120' "
+"<widget name='AboutButton' "
 "height='12' "
 "/> "
-"<widget name='RTL' "
-"width='120' "
+"<widget name='OptionsButton' "
 "height='12' "
 "/> "
-"<widget name='Quit' "
-"width='120' "
+"<widget name='StartButton' "
 "height='12' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"<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='vcMusicText' "
+"<widget name='grModePopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSfxText' "
+"<widget name='grRenderPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
+"</layout> "
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='grFullscreenCheckbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='grDisableDitheringCheckbox' "
+"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='vcSpeechText' "
+"<widget name='auMidiPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"</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'> "
-"<space size='110' /> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80' "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auSampleRatePopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='3' 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='2' /> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
@@ -1477,546 +1463,560 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<space size='16'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
-"<widget name='Keys' "
-"type='Button' "
+"</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' "
 "/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
 "/> "
 "</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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
 "/> "
-"<space size='16'/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
 "/> "
 "</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' spacing='6' center='true'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='Prev' "
-"type='Button' "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
 "/> "
-"<widget name='Next' "
-"type='Button' "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
+"</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='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='4,4,16,4' center='true'> "
-"<widget name='DirProgressText' "
-"width='280' "
+"<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='6' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<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='GameProgressText' "
-"width='280' "
+"<widget name='mcFontClearButton' "
 "height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<widget name='GameList' "
-"width='280' "
-"height='100' "
+"</layout> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
 "/> "
-"<layout type='horizontal' padding='4,4,4,4'> "
-"<widget name='Ok' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
+"/> "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
 "</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' "
+"<dialog name='GlobalOptions_MT32' 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='auPrefMt32PopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='Popup' "
+"<widget name='auPrefMt32Popup' "
 "type='PopUp' "
-"width='150' "
-"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<widget name='KeymapArea' "
-"width='300' "
-"height='120' "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='Close' "
-"type='Button' "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
 "/> "
 "</layout> "
 "</dialog> "
-"</layout_info> "
-"<render_info> "
-"<palette> "
-"<color name='black' "
-"rgb='0,0,0' "
+"<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' "
 "/> "
-"<color name='lightgrey' "
-"rgb='104,104,104' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<color name='darkgrey' "
-"rgb='64,64,64' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
+"type='Button' "
 "/> "
-"<color name='green' "
-"rgb='32,160,32' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<color name='green2' "
-"rgb='0,255,0' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ExtraButton' "
+"type='Button' "
 "/> "
-"</palette> "
-"<fonts> "
-"<font id='text_default' "
-"file='helvb12.bdf' "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<font resolution='320xY,256x240' "
-"id='text_default' "
-"file='clR6x12.bdf' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
+"type='Button' "
 "/> "
-"<font id='text_button' "
-"file='helvb12.bdf' "
+"<widget name='PluginsPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<font resolution='320xY,256x240' "
-"id='text_button' "
-"file='clR6x12.bdf' "
+"</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' "
 "/> "
-"<font id='text_normal' "
-"file='helvb12.bdf' "
+"<widget name='CurTheme' "
+"height='Globals.Line.Height' "
 "/> "
-"<font resolution='320xY,256x240' "
-"id='text_normal' "
-"file='clR6x12.bdf' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='RendererPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<font id='tooltip_normal' "
-"file='fixed5x8.bdf' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<text_color id='color_normal' "
-"color='green' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<text_color id='color_normal_inverted' "
-"color='black' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
 "/> "
-"<text_color id='color_normal_hover' "
-"color='green2' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<text_color id='color_normal_disabled' "
-"color='lightgrey' "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/> "
-"<text_color id='color_alternative' "
-"color='lightgrey' "
+"</layout> "
+"<widget name='KeysButton' "
+"type='Button' "
 "/> "
-"<text_color id='color_alternative_inverted' "
-"color='255,255,255' "
+"</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' "
 "/> "
-"<text_color id='color_alternative_hover' "
-"color='176,176,176' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
 "/> "
-"<text_color id='color_alternative_disabled' "
-"color='darkgrey' "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
+"type='Button' "
 "/> "
-"<text_color id='color_button' "
-"color='green' "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<text_color id='color_button_hover' "
-"color='green2' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"<text_color id='color_button_disabled' "
-"color='lightgrey' "
+"</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' "
 "/> "
-"</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='lightgrey' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='text_selection_focus' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='mainmenu_bg' cache='false'> "
-"<drawstep func='fill' "
-"fill='foreground' "
-"fg_color='black' "
+"<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' "
 "/> "
-"</drawdata> "
-"<drawdata id='special_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<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' "
 "/> "
-"</drawdata> "
-"<drawdata id='tooltip_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='foreground' "
-"fg_color='black' "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='separator' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"height='2' "
-"ypos='center' "
-"fg_color='lightgrey' "
+"<import layout='Dialog.GlobalOptions_MT32' /> "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_base' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<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' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"<widget name='Domain' "
+"type='PopUp' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_idle' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='Name' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Desc' "
+"type='PopUp' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='auto' "
-"height='auto' "
-"xpos='center' "
-"ypos='center' "
-"orientation='top' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='LangPopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green2' "
-"fill='foreground' "
-"width='auto' "
-"height='auto' "
-"xpos='center' "
-"ypos='center' "
-"orientation='top' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_active' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_inactive' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Extrapath' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_background' cache='false'> "
-"</drawdata> "
-"<drawdata id='widget_slider' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_disabled' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_full' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Version' "
+"width='160' "
+"height='4' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='1'/> "
+"<widget name='Load' "
+"width='120' "
+"height='12' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
+"<widget name='Save' "
+"width='120' "
+"height='12' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<space size='1'/> "
+"<widget name='Options' "
+"width='120' "
+"height='12' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Help' "
+"width='120' "
+"height='12' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='lightgrey' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
+"<widget name='About' "
+"width='120' "
+"height='12' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<space size='1'/> "
+"<widget name='Resume' "
+"width='120' "
+"height='12' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='RTL' "
+"width='120' "
+"height='12' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green2' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
+"<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' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<space size='110' /> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
+"width='80' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_textedit' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='plain_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"</drawdata> "
-"<drawdata id='caret' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"</drawdata> "
-"<drawdata id='default_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_idle' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</layout> "
+"</layout> "
+"<space size='2' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_hover' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<space size='16'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"<widget name='Keys' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_disabled' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_disabled' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"</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' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<space size='16'/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_selected' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</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' "
 "/> "
-"<drawstep func='cross' "
-"fill='foreground' "
-"stroke='2' "
-"fg_color='green' "
+"<widget name='HelpText' "
+"height='140' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='Prev' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Next' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<space size='32'/> "
+"<widget name='Close' "
+"type='Button' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fill='background' "
-"bg_color='darkgrey' "
-"xpos='0' "
-"ypos='0' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_selected' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='GameProgressText' "
+"width='280' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fg_color='darkgrey' "
-"fill='none' "
-"xpos='0' "
-"ypos='0' "
+"<widget name='GameList' "
+"width='280' "
+"height='100' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='5' "
-"fg_color='green' "
-"fill='foreground' "
-"xpos='2' "
-"ypos='2' "
+"<layout type='horizontal' padding='4,4,4,4'> "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"bg_color='lightgrey' "
-"fill='background' "
-"xpos='0' "
-"ypos='0' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_default' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='square' "
-"stroke='0' "
+"</layout> "
+"<widget name='KeymapArea' "
+"width='300' "
+"height='120' "
 "/> "
-"</drawdata> "
-"</render_info> "
+"<widget name='Close' "
+"type='Button' "
+"/> "
+"</layout> "
+"</dialog> "
+"</layout_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 9fd2c187fd..ecc2ebb4dc 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index d672db2540..3fd00abbb9 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -46,21 +46,21 @@
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_default'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_button'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_normal'
 				file = 'clR6x12.bdf'
 		/>
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 416ffb30eb..f09c29e360 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = '-320xY, -256x240, -Xx272, -544x332, -Xx350'>
+<layout_info resolution = 'y>399'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
 		<def var = 'Font.Height' value = '16' />
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index fe0eb66b8d..a440be7694 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = "320xY, 256x240, Xx272, 544x332, Xx350">
+<layout_info resolution = 'y<400'>
 	<globals>
 		<def var = 'Line.Height' value = '12' />
 		<def var = 'Font.Height' value = '10' />
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index f4e18ef00c..6fd88c117a 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index cfe00a7016..a325d4982b 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -108,21 +108,21 @@
 		<font	id = 'text_default'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_default'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_button'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_button'
 				file = 'clR6x12.bdf'
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
 		/>
-		<font	resolution = '320xY, 256x240'
+		<font	resolution = 'y<400'
 		   		id = 'text_normal'
 				file = 'clR6x12.bdf'
 		/>
@@ -178,7 +178,7 @@
 	<!-- <defaults fill = 'gradient' fg_color = 'white'/> -->
 
 	<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
-	<cursor resolution = '320xY, 256x240' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
+	<cursor resolution = 'y<400' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
 
 	<!-- Selection (text or list items) -->
 	<drawdata id = 'text_selection' cache = 'false'>
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 879be2aafe..32d6d19d1a 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = '-320xY, -256x240, -Xx272, -544x332, -Xx350'>
+<layout_info resolution = 'y>399'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
 		<def var = 'Font.Height' value = '16' />
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 3a7a4b63b9..06916a80f1 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -23,7 +23,7 @@
  - $Id$
  -
  -->
-<layout_info resolution = "320xY, 256x240, Xx272, 544x332, Xx350">
+<layout_info resolution = 'y<400'>
 	<globals>
 		<def var = 'Line.Height' value = '12' />
 		<def var = 'Font.Height' value = '10' />
-- 
cgit v1.2.3


From 2d46c9b6a212edb6243da63dc1f721c50406fc2a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 1 Mar 2011 04:18:13 +0100
Subject: GUI: Increment theme version.

With 50a682e7e1c69082735a07b2261d1c0c61ac12c9 we changed the resolution string
in a way which is incompatible with old resolution strings, thus all old theme
files are not usable anymore and will cause problems. To avoid that we just
increase the version string and thus it is not possible to use them anymore.
---
 gui/themes/default.inc          | 2828 +++++++++++++++++++--------------------
 gui/themes/scummclassic.zip     |  Bin 91156 -> 91156 bytes
 gui/themes/scummclassic/THEMERC |    2 +-
 gui/themes/scummmodern.zip      |  Bin 198479 -> 198479 bytes
 gui/themes/scummmodern/THEMERC  |    2 +-
 5 files changed, 1416 insertions(+), 1416 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 62a796a6f9..2716e6ca72 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,592 +1,448 @@
  "<?xml version = '1.0'?>"
-"<render_info> "
-"<palette> "
-"<color name='black' "
-"rgb='0,0,0' "
+"<layout_info resolution='y>399'> "
+"<globals> "
+"<def var='Line.Height' value='16' /> "
+"<def var='Font.Height' value='16' /> "
+"<def var='About.OuterBorder' value='80'/> "
+"<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='1'/> "
+"<def var='KeyMapper.Spacing' value='10'/> "
+"<def var='KeyMapper.LabelWidth' value='100'/> "
+"<def var='KeyMapper.ButtonWidth' value='80'/> "
+"<def var='Tooltip.MaxWidth' value='200'/> "
+"<def var='Tooltip.XDelta' value='16'/> "
+"<def var='Tooltip.YDelta' value='16'/> "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<color name='lightgrey' "
-"rgb='104,104,104' "
+"<widget name='SmallLabel' "
+"size='24,Globals.Line.Height' "
 "/> "
-"<color name='darkgrey' "
-"rgb='64,64,64' "
+"<widget name='ShortOptionsLabel' "
+"size='60,Globals.Line.Height' "
 "/> "
-"<color name='green' "
-"rgb='32,160,32' "
+"<widget name='Button' "
+"size='108,24' "
 "/> "
-"<color name='green2' "
-"rgb='0,255,0' "
+"<widget name='Slider' "
+"size='128,18' "
 "/> "
-"</palette> "
-"<fonts> "
-"<font id='text_default' "
-"file='helvb12.bdf' "
+"<widget name='PopUp' "
+"size='-1,19' "
 "/> "
-"<font resolution='y<400' "
-"id='text_default' "
-"file='clR6x12.bdf' "
+"<widget name='Checkbox' "
+"size='-1,14' "
 "/> "
-"<font id='text_button' "
-"file='helvb12.bdf' "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
 "/> "
-"<font resolution='y<400' "
-"id='text_button' "
-"file='clR6x12.bdf' "
+"<widget name='ListWidget' "
+"padding='5,0,8,0' "
 "/> "
-"<font id='text_normal' "
-"file='helvb12.bdf' "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
 "/> "
-"<font resolution='y<400' "
-"id='text_normal' "
-"file='clR6x12.bdf' "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
 "/> "
-"<font id='tooltip_normal' "
-"file='fixed5x8.bdf' "
+"<widget name='Console' "
+"padding='7,5,5,5' "
 "/> "
-"<text_color id='color_normal' "
-"color='green' "
+"<widget name='Scrollbar' "
+"size='15,0' "
 "/> "
-"<text_color id='color_normal_inverted' "
-"color='black' "
+"<widget name='TabWidget.Tab' "
+"size='75,27' "
+"padding='0,0,8,0' "
 "/> "
-"<text_color id='color_normal_hover' "
-"color='green2' "
+"<widget name='TabWidget.Body' "
+"padding='0,0,0,0' "
 "/> "
-"<text_color id='color_normal_disabled' "
-"color='lightgrey' "
+"<widget name='TabWidget.NavButton' "
+"size='15,18' "
+"padding='0,3,4,0' "
 "/> "
-"<text_color id='color_alternative' "
-"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' "
 "/> "
-"<text_color id='color_alternative_inverted' "
-"color='255,255,255' "
+"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
+"<widget name='SearchDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<text_color id='color_alternative_hover' "
-"color='176,176,176' "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/> "
-"<text_color id='color_alternative_disabled' "
-"color='darkgrey' "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<text_color id='color_button' "
-"color='green' "
+"<space /> "
+"</layout> "
+"<widget name='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='LoadGameButton' "
+"height='20' "
 "/> "
-"<text_color id='color_button_hover' "
-"color='green2' "
+"<widget name='AddGameButton' "
+"height='20' "
 "/> "
-"<text_color id='color_button_disabled' "
-"color='lightgrey' "
+"<widget name='EditGameButton' "
+"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='lightgrey' "
+"<widget name='RemoveGameButton' "
+"height='20' "
 "/> "
-"</drawdata> "
-"<drawdata id='text_selection_focus' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"</layout> "
+"<space size='4'/> "
+"<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='tooltip_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='foreground' "
-"fg_color='black' "
+"<widget name='StartButton' "
+"height='20' "
 "/> "
-"</drawdata> "
-"<drawdata id='separator' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"height='2' "
-"ypos='center' "
-"fg_color='lightgrey' "
+"</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_base' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='Path' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Up' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_handle_idle' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_idle' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='auto' "
-"height='auto' "
-"xpos='center' "
-"ypos='center' "
-"orientation='top' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green2' "
-"fill='foreground' "
-"width='auto' "
-"height='auto' "
-"xpos='center' "
-"ypos='center' "
-"orientation='top' "
+"</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='10' center='true'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_active' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_inactive' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"</layout> "
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_background' cache='false'> "
-"</drawdata> "
-"<drawdata id='widget_slider' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='grFullscreenCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_disabled' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<widget name='grDisableDitheringCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_full' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"</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='10' center='true'> "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='auOPLPopup' "
+"type='PopUp' "
 "/> "
-"<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='10' center='true'> "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='auSampleRatePopup' "
+"type='PopUp' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='lightgrey' "
-"fill='foreground' "
-"width='height' "
-"height='auto' "
-"xpos='right' "
-"ypos='center' "
-"orientation='bottom' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
 "/> "
-"<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='10'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_textedit' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='plain_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='vcMusicText' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='caret' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='default_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_idle' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_hover' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_disabled' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_disabled' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"</layout> "
+"</layout> "
+"<layout type='vertical' padding='24,0,24,0' center='true'> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
 "/> "
-"<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' spacing='10' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_selected' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
-"/> "
-"<drawstep func='cross' "
-"fill='foreground' "
-"stroke='2' "
-"fg_color='green' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<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='radiobutton_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fill='background' "
-"bg_color='darkgrey' "
-"xpos='0' "
-"ypos='0' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_selected' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fg_color='darkgrey' "
-"fill='none' "
-"xpos='0' "
-"ypos='0' "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='5' "
-"fg_color='green' "
-"fill='foreground' "
-"xpos='2' "
-"ypos='2' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auPrefMt32PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"bg_color='lightgrey' "
-"fill='background' "
-"xpos='0' "
-"ypos='0' "
+"</layout> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_default' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_small' cache='false'> "
-"<drawstep func='square' "
-"stroke='0' "
+"</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='10' center='true'> "
+"<widget name='SaveButton' "
+"type='Button' "
 "/> "
-"</drawdata> "
-"</render_info> "
-"<layout_info resolution='y>399'> "
-"<globals> "
-"<def var='Line.Height' value='16' /> "
-"<def var='Font.Height' value='16' /> "
-"<def var='About.OuterBorder' value='80'/> "
-"<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='1'/> "
-"<def var='KeyMapper.Spacing' value='10'/> "
-"<def var='KeyMapper.LabelWidth' value='100'/> "
-"<def var='KeyMapper.ButtonWidth' value='80'/> "
-"<def var='Tooltip.MaxWidth' value='200'/> "
-"<def var='Tooltip.XDelta' value='16'/> "
-"<def var='Tooltip.YDelta' value='16'/> "
-"<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
-"textalign='right' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='SmallLabel' "
-"size='24,Globals.Line.Height' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ThemeButton' "
+"type='Button' "
 "/> "
-"<widget name='ShortOptionsLabel' "
-"size='60,Globals.Line.Height' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='Button' "
-"size='108,24' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ExtraButton' "
+"type='Button' "
 "/> "
-"<widget name='Slider' "
-"size='128,18' "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='PopUp' "
-"size='-1,19' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
+"type='Button' "
 "/> "
-"<widget name='Checkbox' "
-"size='-1,14' "
+"<widget name='PluginsPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='Radiobutton' "
-"size='-1,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='10' center='true'> "
+"<widget name='ThemeButton' "
+"type='Button' "
 "/> "
-"<widget name='ListWidget' "
-"padding='5,0,8,0' "
+"<widget name='CurTheme' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='PopUpWidget' "
-"padding='7,5,0,0' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='EditTextWidget' "
-"padding='5,5,0,0' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='Console' "
-"padding='7,5,5,5' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Scrollbar' "
-"size='15,0' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='TabWidget.Tab' "
-"size='75,27' "
-"padding='0,0,8,0' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,0' "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/> "
-"<widget name='TabWidget.NavButton' "
-"size='15,18' "
-"padding='0,3,4,0' "
+"</layout> "
+"<widget name='KeysButton' "
+"type='Button' "
 "/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='16,16,8,8'> "
-"<widget name='Version' "
+"</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' "
 "/> "
-"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='60' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
 "height='Globals.Line.Height' "
-"textalign='right' "
 "/> "
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
+"<space size='Globals.Line.Height'/> "
+"<layout type='horizontal'> "
+"<widget name='Map' "
+"type='Button' "
 "/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<space /> "
-"</layout> "
-"<widget name='GameList'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='LoadGameButton' "
-"height='20' "
-"/> "
-"<widget name='AddGameButton' "
-"height='20' "
-"/> "
-"<widget name='EditGameButton' "
-"height='20' "
-"/> "
-"<widget name='RemoveGameButton' "
-"height='20' "
-"/> "
-"</layout> "
-"<space size='4'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='QuitButton' "
-"height='20' "
-"/> "
-"<widget name='AboutButton' "
-"height='20' "
-"/> "
-"<widget name='OptionsButton' "
-"height='20' "
-"/> "
-"<widget name='StartButton' "
-"height='20' "
-"/> "
-"</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' "
-"/> "
-"<widget name='Path' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Up' "
-"type='Button' "
-"/> "
-"<space/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
+"<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,16'> "
+"<layout type='horizontal' padding='16,16,16,4'> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
@@ -597,92 +453,162 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
 "<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grModePopup' "
-"type='PopUp' "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Graphics' /> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"</dialog> "
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/> "
+"<import layout='Dialog.GlobalOptions_Audio' /> "
 "</layout> "
-"<widget name='grAspectCheckbox' "
+"</dialog> "
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grFullscreenCheckbox' "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grDisableDitheringCheckbox' "
+"<import layout='Dialog.GlobalOptions_MT32' /> "
+"</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> "
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<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='10' center='true'> "
-"<widget name='auMidiPopupDesc' "
+"<widget name='Id' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auMidiPopup' "
+"<widget name='Domain' "
 "type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auOPLPopupDesc' "
+"<widget name='Name' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auOPLPopup' "
+"<widget name='Desc' "
 "type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
+"<widget name='LangPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auSampleRatePopup' "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PlatformPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"</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='10' center='true'> "
+"<widget name='Savepath' "
+"type='Button' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Extrapath' "
+"type='Button' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
+"/> "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='horizontal' padding='16,16,16,16' spacing='8'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='8'> "
+"<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' "
+"/> "
+"<widget name='Save' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<space size='10'/> "
+"<widget name='Options' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<widget name='Help' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<widget name='About' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<space size='10'/> "
+"<widget name='RTL' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"<widget name='Quit' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/> "
+"</layout> "
+"</dialog> "
+"<dialog name='GlobalConfig' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8'> "
 "<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='vertical' padding='0,0,0,0' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
 "/> "
@@ -693,7 +619,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/> "
@@ -704,7 +630,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/> "
@@ -716,398 +642,377 @@
 "/> "
 "</layout> "
 "</layout> "
-"<layout type='vertical' padding='24,0,24,0' center='true'> "
+"<layout type='vertical' padding='24,24,24,24' center='true'> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
+"width='80'  "
 "/> "
 "</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='10' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
+"<space size='8' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='100' "
 "/> "
 "</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='mcMidiGainText' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='mcMidiGainSlider' "
+"<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
 "/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<space size='60'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<widget name='Keys' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
 "</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='10' center='true'> "
-"<widget name='SaveButton' "
-"type='Button' "
-"/> "
-"<widget name='SavePath' "
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,32' center='true'> "
+"<widget name='Title' "
 "height='Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ThemeButton' "
-"type='Button' "
-"/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
+"<widget name='List' /> "
+"<widget name='Thumbnail' "
+"width='180' "
+"height='200' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ExtraButton' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<space/> "
+"<widget name='Delete' "
 "type='Button' "
 "/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
+"<space size='32'/> "
+"<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
 "</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='10' center='true'> "
-"<widget name='ThemeButton' "
-"type='Button' "
-"/> "
-"<widget name='CurTheme' "
+"<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' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='RendererPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='RendererPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<widget name='HelpText' "
+"height='200' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Prev' "
+"type='Button' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='Next' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='KeysButton' "
+"<space size='32'/> "
+"<widget name='Close' "
 "type='Button' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<dialog name='MassAdd' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' center='true'> "
+"<widget name='DirProgressText' "
+"width='480' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<widget name='Mapping' "
+"<widget name='GameProgressText' "
+"width='480' "
 "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='GameList' "
+"width='480' "
+"height='250' "
 "/> "
+"<layout type='horizontal' padding='8,8,8,8'> "
 "<widget name='Ok' "
 "type='Button' "
 "/> "
-"</layout> "
-"</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='Ok' "
-"type='Button' "
-"/> "
 "</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' "
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
+"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<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='Popup' "
+"type='PopUp' "
+"width='400' "
+"height='Globals.Line.Height' "
 "/> "
-"<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' "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<widget name='Close' "
+"type='Button' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
 "</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' "
+"</layout_info> "
+"<layout_info resolution='y<400'> "
+"<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' "
 "/> "
-"<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='10' center='true'> "
-"<widget name='Id' "
-"type='OptionsLabel' "
+"<widget name='Slider' "
+"size='85,12' "
 "/> "
-"<widget name='Domain' "
-"type='PopUp' "
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Name' "
-"type='OptionsLabel' "
+"<widget name='SmallLabel' "
+"size='18,Globals.Line.Height' "
 "/> "
-"<widget name='Desc' "
-"type='PopUp' "
+"<widget name='PopUp' "
+"size='-1,15' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='LangPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Checkbox' "
+"size='-1,Globals.Line.Height' "
 "/> "
-"<widget name='LangPopup' "
-"type='PopUp' "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='ListWidget' "
+"padding='5,0,0,0' "
 "/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
 "/> "
-"</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='10' center='true'> "
-"<widget name='Savepath' "
-"type='Button' "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
 "/> "
-"<widget name='SavepathText' "
+"<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,-8' "
+"/> "
+"<widget name='TabWidget.NavButton' "
+"size='32,18' "
+"padding='0,0,1,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> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
+"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
+"<widget name='SearchDesc' "
+"width='50' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='ExtrapathText' "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='SearchClearButton' "
 "height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
+"<space /> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<widget name='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='LoadGameButton' "
+"height='12' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<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='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='16,16,16,16' center='true'> "
-"<widget name='Title' "
-"width='210' "
+"<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='Version' "
-"width='210' "
+"<widget name='Path' "
 "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' "
-"/> "
-"<widget name='Save' "
-"width='150' "
-"height='Globals.Button.Height' "
-"/> "
-"<space size='10'/> "
-"<widget name='Options' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,8,0'> "
+"<widget name='Up' "
+"type='Button' "
 "/> "
-"<widget name='Help' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<space/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<widget name='About' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
-"<space size='10'/> "
-"<widget name='RTL' "
-"width='150' "
-"height='Globals.Button.Height' "
+"</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='Quit' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<layout type='vertical' padding='0,0,0,0' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='vcMusicText' "
+"<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='vcMusicSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='vcSfxText' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grRenderPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
-"/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"<widget name='grFullscreenCheckbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"<widget name='grDisableDitheringCheckbox' "
+"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='vertical' padding='24,24,24,24' center='true'> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80'  "
+"<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> "
-"<space size='8' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/> "
 "<widget name='subToggleSpeechOnly' "
 "type='Radiobutton' "
-"width='100' "
 "/> "
 "<widget name='subToggleSubOnly' "
 "type='Radiobutton' "
-"width='100' "
 "/> "
 "<widget name='subToggleSubBoth' "
 "type='Radiobutton' "
-"width='100' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
 "/> "
@@ -1118,259 +1023,215 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<space size='60'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<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,32' center='true'> "
-"<widget name='Title' "
-"height='Globals.Line.Height' "
+"<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' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
-"<widget name='List' /> "
-"<widget name='Thumbnail' "
-"width='180' "
-"height='200' "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
+"/> "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<space/> "
-"<widget name='Delete' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
 "/> "
-"<space size='32'/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
 "/> "
 "</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' "
-"/> "
-"<widget name='HelpText' "
-"height='200' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
 "/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Prev' "
-"type='Button' "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
 "/> "
-"<widget name='Next' "
-"type='Button' "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
+"</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='MassAdd' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' center='true'> "
-"<widget name='DirProgressText' "
-"width='480' "
+"<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='6' center='true'> "
+"<widget name='auPrefGmPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
+"/> "
+"</layout> "
+"<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='GameProgressText' "
-"width='480' "
+"<widget name='mcFontClearButton' "
 "height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<widget name='GameList' "
-"width='480' "
-"height='250' "
+"</layout> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
 "/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<widget name='Ok' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
+"/> "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PopupDesc' "
+"<dialog name='GlobalOptions_MT32' 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='auPrefMt32PopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='Popup' "
+"<widget name='auPrefMt32Popup' "
 "type='PopUp' "
-"width='400' "
-"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<widget name='KeymapArea' "
-"width='600' "
-"height='280' "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
 "/> "
-"<widget name='Close' "
-"type='Button' "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
 "/> "
 "</layout> "
 "</dialog> "
-"</layout_info> "
-"<layout_info resolution='y<400'> "
-"<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' "
+"<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='ListWidget' "
-"padding='5,0,0,0' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='PopUpWidget' "
-"padding='7,5,0,0' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
+"type='Button' "
 "/> "
-"<widget name='EditTextWidget' "
-"padding='5,5,0,0' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='Console' "
-"padding='7,5,5,5' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ExtraButton' "
+"type='Button' "
 "/> "
-"<widget name='Scrollbar' "
-"size='9,0' "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='TabWidget.Tab' "
-"size='45,16' "
-"padding='0,0,2,0' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
+"type='Button' "
 "/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,-8' "
+"<widget name='PluginsPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='TabWidget.NavButton' "
-"size='32,18' "
-"padding='0,0,1,0' "
+"</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' "
 "/> "
-"</globals> "
-"<dialog name='Launcher' overlays='screen'> "
-"<layout type='vertical' center='true' padding='6,6,2,2'> "
-"<widget name='Version' "
+"<widget name='CurTheme' "
 "height='Globals.Line.Height' "
 "/> "
-"<layout type='horizontal' spacing='5' padding='0,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='50' "
+"</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='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<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' "
+"<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='RemoveGameButton' "
-"height='12' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
 "/> "
 "</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' "
+"<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='StartButton' "
-"height='12' "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/> "
 "</layout> "
+"<widget name='KeysButton' "
+"type='Button' "
+"/> "
 "</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' "
+"<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'/> "
-"<layout type='horizontal' padding='0,0,8,0'> "
-"<widget name='Up' "
+"<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='Choose' "
+"<widget name='Ok' "
 "type='Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0'> "
+"<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/> "
@@ -1383,90 +1244,168 @@
 "</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' "
+"<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> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"</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> "
-"<widget name='grAspectCheckbox' "
+"</dialog> "
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grFullscreenCheckbox' "
+"<import layout='Dialog.GlobalOptions_MIDI' /> "
+"</layout> "
+"</dialog> "
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
+"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/> "
-"<widget name='grDisableDitheringCheckbox' "
+"<import layout='Dialog.GlobalOptions_MT32' /> "
+"</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='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<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='auMidiPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Id' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auMidiPopup' "
+"<widget name='Domain' "
 "type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auOPLPopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Name' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auOPLPopup' "
+"<widget name='Desc' "
 "type='PopUp' "
 "/> "
 "</layout> "
+"<space size='8'/> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
+"<widget name='LangPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auSampleRatePopup' "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"<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='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"</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='subToggleSubBoth' "
-"type='Radiobutton' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Extrapath' "
+"type='Button' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<widget name='ExtrapathText' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"</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='GlobalOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<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' "
@@ -1504,519 +1443,580 @@
 "<space size='110' /> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
+"width='80' "
 "/> "
 "</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='6' center='true'> "
-"<widget name='auPrefGmPopupDesc' "
+"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
+"<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='mcFontButton' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='90' "
 "/> "
 "</layout> "
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/> "
+"</layout> "
+"<space size='2' /> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='mcMidiGainText' "
+"<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='mcMidiGainSlider' "
+"<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
 "/> "
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalOptions_MT32' 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='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<space size='16'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
+"<widget name='Keys' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
+"<space size='Globals.Button.Width' /> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
 "</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' "
+"<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' "
 "/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ExtraButton' "
+"<space size='16'/> "
+"<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
+"<widget name='Choose' "
 "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' "
+"<dialog name='ScummHelp' overlays='screen'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<widget name='Title' "
+"width='180' "
 "height='Globals.Line.Height' "
-"textalign='right' "
 "/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<widget name='HelpText' "
+"height='140' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='Prev' "
+"type='Button' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='Next' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='KeysButton' "
+"<space size='32'/> "
+"<widget name='Close' "
 "type='Button' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<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='List'/> "
-"<widget name='Mapping' "
+"<widget name='GameProgressText' "
+"width='280' "
 "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='GameList' "
+"width='280' "
+"height='100' "
 "/> "
+"<layout type='horizontal' padding='4,4,4,4'> "
 "<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' "
+"<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' "
 "/> "
-"<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' "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/> "
-"<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' "
+"<widget name='KeymapArea' "
+"width='300' "
+"height='120' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='6'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<widget name='Close' "
+"type='Button' "
 "/> "
-"<import layout='Dialog.GlobalOptions_MT32' /> "
 "</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' "
+"</layout_info> "
+"<render_info> "
+"<palette> "
+"<color name='black' "
+"rgb='0,0,0' "
 "/> "
-"<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' "
+"<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='6' center='true'> "
-"<widget name='Name' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<color name='green' "
+"rgb='32,160,32' "
 "/> "
-"<widget name='Desc' "
-"type='PopUp' "
+"<color name='green2' "
+"rgb='0,255,0' "
 "/> "
-"</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' "
+"</palette> "
+"<fonts> "
+"<font id='text_default' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='LangPopup' "
-"type='PopUp' "
+"<font resolution='y<400' "
+"id='text_default' "
+"file='clR6x12.bdf' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<font id='text_button' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<font resolution='y<400' "
+"id='text_button' "
+"file='clR6x12.bdf' "
 "/> "
-"</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' "
+"<font id='text_normal' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"<font resolution='y<400' "
+"id='text_normal' "
+"file='clR6x12.bdf' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
+"<font id='tooltip_normal' "
+"file='fixed5x8.bdf' "
 "/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
+"<text_color id='color_normal' "
+"color='green' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<text_color id='color_normal_inverted' "
+"color='black' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<text_color id='color_normal_hover' "
+"color='green2' "
 "/> "
-"</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' "
+"<text_color id='color_normal_disabled' "
+"color='lightgrey' "
 "/> "
-"<widget name='Version' "
-"width='160' "
-"height='4' "
+"<text_color id='color_alternative' "
+"color='lightgrey' "
 "/> "
-"<space size='1'/> "
-"<widget name='Load' "
-"width='120' "
-"height='12' "
+"<text_color id='color_alternative_inverted' "
+"color='255,255,255' "
 "/> "
-"<widget name='Save' "
-"width='120' "
-"height='12' "
+"<text_color id='color_alternative_hover' "
+"color='176,176,176' "
 "/> "
-"<space size='1'/> "
-"<widget name='Options' "
-"width='120' "
-"height='12' "
+"<text_color id='color_alternative_disabled' "
+"color='darkgrey' "
 "/> "
-"<widget name='Help' "
-"width='120' "
-"height='12' "
+"<text_color id='color_button' "
+"color='green' "
 "/> "
-"<widget name='About' "
-"width='120' "
-"height='12' "
+"<text_color id='color_button_hover' "
+"color='green2' "
 "/> "
-"<space size='1'/> "
-"<widget name='Resume' "
-"width='120' "
-"height='12' "
+"<text_color id='color_button_disabled' "
+"color='lightgrey' "
 "/> "
-"<widget name='RTL' "
-"width='120' "
-"height='12' "
+"</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='lightgrey' "
 "/> "
-"<widget name='Quit' "
-"width='120' "
-"height='12' "
+"</drawdata> "
+"<drawdata id='text_selection_focus' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id='mainmenu_bg' cache='false'> "
+"<drawstep func='fill' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='special_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='tooltip_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSfxText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='separator' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"height='2' "
+"ypos='center' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='scrollbar_base' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_idle' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='auto' "
+"height='auto' "
+"xpos='center' "
+"ypos='center' "
+"orientation='top' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<space size='110' /> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"<drawstep func='triangle' "
+"fg_color='green2' "
+"fill='foreground' "
+"width='auto' "
+"height='auto' "
+"xpos='center' "
+"ypos='center' "
+"orientation='top' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='90' "
+"</drawdata> "
+"<drawdata id='tab_active' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='90' "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='90' "
+"</drawdata> "
+"<drawdata id='tab_inactive' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</layout> "
-"</layout> "
-"<space size='2' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='tab_background' cache='false'> "
+"</drawdata> "
+"<drawdata id='widget_slider' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='slider_disabled' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"</layout> "
-"<space size='16'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
-"<widget name='Keys' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='slider_full' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='slider_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"<widget name='Ok' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<space size='16'/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='HelpText' "
-"height='140' "
+"<drawstep func='triangle' "
+"fg_color='lightgrey' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='Prev' "
-"type='Button' "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='Next' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
+"<drawstep func='triangle' "
+"fg_color='green2' "
+"fill='foreground' "
+"width='height' "
+"height='auto' "
+"xpos='right' "
+"ypos='center' "
+"orientation='bottom' "
 "/> "
-"</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' "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='GameProgressText' "
-"width='280' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='widget_textedit' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<widget name='GameList' "
-"width='280' "
-"height='100' "
+"</drawdata> "
+"<drawdata id='plain_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<layout type='horizontal' padding='4,4,4,4'> "
-"<widget name='Ok' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='caret' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='default_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id='button_idle' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='150' "
-"height='Globals.Line.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<widget name='KeymapArea' "
-"width='300' "
-"height='120' "
+"</drawdata> "
+"<drawdata id='button_hover' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"<widget name='Close' "
-"type='Button' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
+"</drawdata> "
+"<drawdata id='button_disabled' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_disabled' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='checkbox_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='top' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='checkbox_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='cross' "
+"fill='foreground' "
+"stroke='2' "
+"fg_color='green' "
+"/> "
+"</drawdata> "
+"<drawdata id='checkbox_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='radiobutton_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fill='background' "
+"bg_color='darkgrey' "
+"xpos='0' "
+"ypos='0' "
+"/> "
+"</drawdata> "
+"<drawdata id='radiobutton_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fg_color='darkgrey' "
+"fill='none' "
+"xpos='0' "
+"ypos='0' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='5' "
+"fg_color='green' "
+"fill='foreground' "
+"xpos='2' "
+"ypos='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='radiobutton_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"bg_color='lightgrey' "
+"fill='background' "
+"xpos='0' "
+"ypos='0' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_default' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='square' "
+"stroke='0' "
+"/> "
+"</drawdata> "
+"</render_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index ecc2ebb4dc..4dbedd4f14 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index f0276969fe..17e934d5ef 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.2:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.3:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 6fd88c117a..77951475e6 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index b8f41fc207..f947a5685a 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.2:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.3:ScummVM Modern Theme:No Author]
-- 
cgit v1.2.3


From 6f59d02db7c591d0efc062948d032e4d94677404 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 22 Mar 2011 08:44:22 +0000
Subject: I18N: Regenerate translation data file

---
 gui/themes/translations.dat | Bin 174729 -> 187002 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 69e4c80804..509f6e7cbf 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From ca772d14608e7fc3348e8d37c38ccb52ca566202 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 22 Mar 2011 22:19:31 +0000
Subject: I18N: Update translation data file

---
 gui/themes/translations.dat | Bin 187002 -> 185526 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 509f6e7cbf..4db0d8adcc 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 1383aed468a2159f07d0fca568d43abbca510283 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 5 Apr 2011 19:55:40 +0100
Subject: I18N: Update Ukrainian translation

---
 gui/themes/translations.dat | Bin 185526 -> 189132 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 4db0d8adcc..e488b45347 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 42408c0d95d59666ee3bf9f915eaf512aee1ad0d Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Fri, 22 Apr 2011 20:01:22 +0100
Subject: I18N: Update translation data file.

---
 gui/themes/translations.dat | Bin 189132 -> 186884 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index e488b45347..217df41691 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 7a9157bb567e5fa96e55332f954b1af31bc5668e Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 24 Apr 2011 10:38:57 +0100
Subject: I18N: Update translations data file.

---
 gui/themes/translations.dat | Bin 186884 -> 188134 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 217df41691..e92251048b 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 9b47a42ebdfb9d56463fba552a30d0749b1f131e Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 24 Apr 2011 14:56:18 +0100
Subject: I18N: Update translations data file.

---
 gui/themes/translations.dat | Bin 188134 -> 193252 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index e92251048b..7b61dc0a83 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 34ec9f6439f7cd0b5e23a209d01629d27197f928 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 25 Apr 2011 20:29:09 +0200
Subject: GUI: Make git revision string fit in the modern theme's launcher
 again.

---
 gui/themes/scummmodern.zip                    | Bin 198479 -> 198479 bytes
 gui/themes/scummmodern/scummmodern_layout.stx |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/themes')

diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 77951475e6..1e44442933 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 32d6d19d1a..c0433ceb9a 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -128,7 +128,7 @@
 				/>
 				<space />
 				<widget name = 'Version'
-						width = '247'
+						width = '310'
 						height = 'Globals.Line.Height'
 						textalign = 'center'
 				/>
-- 
cgit v1.2.3


From ff0f391a9cc90fa4600cc5c20935fb91e7bfaac5 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 25 Apr 2011 23:03:00 +0100
Subject: I18N: Update translations data file.

---
 gui/themes/translations.dat | Bin 193252 -> 194830 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 7b61dc0a83..0844880f28 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 836ca2b4e2ed1f8eb03cdbbe65e0385717bb0fec Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 27 Apr 2011 20:40:30 +0100
Subject: I18N: Update translations data file.

---
 gui/themes/translations.dat | Bin 194830 -> 198996 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 0844880f28..4a97d01c34 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 9360ec73547e67d02625d441d8b9464d145e1aec Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 1 May 2011 23:50:39 +0100
Subject: I18N: Update translations data file.

---
 gui/themes/translations.dat | Bin 198996 -> 199536 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 4a97d01c34..ea7c46a74f 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 1aff380a15f12e53bd380fc2a189882e2d6172c0 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 2 May 2011 20:13:51 +0100
Subject: I18N: Update translations data file

---
 gui/themes/translations.dat | Bin 199536 -> 200685 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index ea7c46a74f..86de121d1a 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3