From 95cabb0ffd43e6bdd2c600c5baa459cab89f068d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 24 Dec 2011 21:09:46 +0100
Subject: SCUMM: Add a difficulty selection dialog for Loom FM-Towns.

It is in spirit of the DOS version's selection dialog, but it has the
description above the buttons instead of below it.
---
 gui/themes/default.inc                             | 3208 ++++++++++----------
 gui/themes/scummclassic.zip                        |  Bin 96043 -> 97041 bytes
 gui/themes/scummclassic/THEMERC                    |    2 +-
 gui/themes/scummclassic/classic_layout.stx         |   21 +
 gui/themes/scummclassic/classic_layout_lowres.stx  |   21 +
 gui/themes/scummmodern.zip                         |  Bin 204887 -> 205885 bytes
 gui/themes/scummmodern/THEMERC                     |    2 +-
 gui/themes/scummmodern/scummmodern_layout.stx      |   21 +
 .../scummmodern/scummmodern_layout_lowres.stx      |   21 +
 9 files changed, 1710 insertions(+), 1586 deletions(-)

(limited to 'gui/themes')

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index ce670b55f0..3204620ee3 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,748 +1,460 @@
  "<?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' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Choose' "
+"type='Button' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='10' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,3,0' "
-"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_idle' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Ok' "
+"type='Button' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='5' "
-"height='5' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,2,0' "
-"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' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='10' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='5' "
-"height='5' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,2,0' "
-"orientation='top' "
+"</layout> "
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_active' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"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_inactive' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</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' "
 "/> "
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
 "/> "
-"</drawdata> "
-"<drawdata id='tab_background' cache='false'> "
-"</drawdata> "
-"<drawdata id='widget_slider' 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='slider_disabled' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<widget name='auOPLPopup' "
+"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='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='slider_hover' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"<widget name='auSampleRatePopup' "
+"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'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_idle' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,7,0' "
-"orientation='top' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"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_idle' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"</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' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='vcMusicSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false' resolution='y>399'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='vcMusicLabel' "
+"type='SmallLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='vcSfxText' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,7,0' "
-"orientation='top' "
+"<widget name='vcSfxSlider' "
+"type='Slider' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_disabled' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='vcSpeechText' "
+"type='OptionsLabel' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"<widget name='vcSpeechLabel' "
+"type='SmallLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout> "
+"</layout> "
+"<layout type='vertical' padding='24,0,24,0' center='true'> "
+"<widget name='vcMuteCheckbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false' resolution='y>399'> "
-"<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' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='5' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,7,0' "
-"orientation='top' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='popup_hover' cache='false' resolution='y<400'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"</layout> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
 "/> "
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='7' "
-"height='4' "
-"xpos='right' "
-"ypos='4' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
 "/> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
 "/> "
-"</drawdata> "
-"<drawdata id='widget_textedit' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='plain_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='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='caret' cache='false'> "
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/> "
-"</drawdata> "
-"<drawdata id='default_bg' cache='false'> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"</layout> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_idle' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</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> "
-"<drawdata id='button_hover' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='button_disabled' cache='false'> "
-"<text font='text_button' "
-"text_color='color_button_disabled' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ThemeButton' "
+"type='Button' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='ThemePath' "
+"height='Globals.Line.Height' "
 "/> "
-"</drawdata> "
-"<drawdata id='checkbox_disabled' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='top' "
-"horizontal_align='left' "
+"<widget name='ThemePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='ExtraButton' "
+"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='ExtraPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<drawstep func='cross' "
-"fill='foreground' "
-"stroke='2' "
-"fg_color='green' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='PluginsButton' "
+"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='PluginsPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</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' "
 "/> "
-"</drawdata> "
-"<drawdata id='radiobutton_default' cache='false'> "
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='CurTheme' "
+"height='Globals.Line.Height' "
 "/> "
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fill='background' "
-"bg_color='darkgrey' "
-"xpos='0' "
-"ypos='0' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"</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> "
-"<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' "
-"/> "
-"<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' "
+"<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='10' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<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='10' center='true'> "
+"<widget name='GuiLanguagePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<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' "
+"<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='Path' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,8,0'> "
-"<widget name='Up' "
+"<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='Dialog.Launcher.GameList' shading='dim'> "
+"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
 "<widget name='TabWidget'/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='16,16,16,4'> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
@@ -753,91 +465,170 @@
 "</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='6' 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='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='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'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auMidiPopupDesc' "
+"<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='auMidiPopup' "
+"<widget name='Domain' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auOPLPopupDesc' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='Name' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auOPLPopup' "
+"<widget name='Desc' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='LangPopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='auSampleRatePopup' "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
-"<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' "
+"/> "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='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='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' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</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='vertical' padding='16,16,16,16' spacing='8'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<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' "
 "/> "
@@ -848,7 +639,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' "
 "/> "
@@ -859,7 +650,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' "
 "/> "
@@ -870,190 +661,316 @@
 "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' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' 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' 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' "
+"<widget name='subSubtitleSpeedLabel' "
+"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='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' "
+"<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' "
 "/> "
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
+"<widget name='List' /> "
+"<widget name='Thumbnail' "
+"width='180' "
+"height='200' "
 "/> "
 "</layout> "
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<space/> "
+"<widget name='Delete' "
+"type='Button' "
 "/> "
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
+"<space size='32'/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</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' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
-"<widget name='SavePath' "
+"</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='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='HelpText' "
+"height='200' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ThemeButton' "
+"<layout type='horizontal' padding='0,0,16,0'> "
+"<widget name='Prev' "
 "type='Button' "
 "/> "
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='ThemePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='Next' "
+"type='Button' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='ExtraButton' "
+"<space size='32'/> "
+"<widget name='Close' "
 "type='Button' "
 "/> "
-"<widget name='ExtraPath' "
+"</layout> "
+"</layout> "
+"</dialog> "
+"<dialog name='LoomTownsDifficultyDialog' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Description1' "
+"width='320' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='ExtraPathClearButton' "
+"<widget name='Description2' "
 "height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
+"<widget name='Standard' "
 "type='Button' "
 "/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
+"<widget name='Practice' "
+"type='Button' "
+"/> "
+"<widget name='Expert' "
+"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='16'> "
-"<widget name='ThemeButton' "
-"type='Button' "
+"<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='CurTheme' "
+"<widget name='GameProgressText' "
+"width='480' "
 "height='Globals.Line.Height' "
 "/> "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
+"/> "
+"<layout type='horizontal' padding='8,8,8,8'> "
+"<widget name='Ok' "
+"type='Button' "
+"/> "
+"<widget name='Cancel' "
+"type='Button' "
+"/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='RendererPopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"</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='RendererPopup' "
+"<widget name='Popup' "
 "type='PopUp' "
+"width='400' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='AutosavePeriodPopupDesc' "
-"width='80' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
 "/> "
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<widget name='Close' "
+"type='Button' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"width='80' "
+"</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' "
+"/> "
+"<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='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
+"<space /> "
 "</layout> "
-"<widget name='KeysButton' "
-"type='Button' "
+"<widget name='GameList'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='LoadGameButton' "
+"height='12' "
+"/> "
+"<widget name='AddGameButton' "
+"height='12' "
+"/> "
+"<widget name='EditGameButton' "
+"height='12' "
+"/> "
+"<widget name='RemoveGameButton' "
+"height='12' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<widget name='QuitButton' "
+"height='12' "
 "/> "
+"<widget name='AboutButton' "
+"height='12' "
+"/> "
+"<widget name='OptionsButton' "
+"height='12' "
+"/> "
+"<widget name='StartButton' "
+"height='12' "
+"/> "
+"</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<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='List'/> "
-"<widget name='Mapping' "
+"<widget name='Path' "
 "height='Globals.Line.Height' "
 "/> "
-"<space size='Globals.Line.Height'/> "
-"<layout type='horizontal'> "
-"<widget name='Map' "
+"<widget name='List'/> "
+"<layout type='horizontal' padding='0,0,8,0'> "
+"<widget name='Up' "
 "type='Button' "
 "/> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<widget name='Ok' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions' overlays='screen' inset='16' shading='dim'> "
-"<layout type='vertical' padding='0,0,0,0' spacing='16'> "
+"<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/> "
@@ -1066,176 +983,90 @@
 "</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='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' "
 "/> "
-"<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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/> "
-"<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' "
+"<widget name='grAspectCheckbox' "
 "type='Checkbox' "
 "/> "
-"<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' "
+"<widget name='grFullscreenCheckbox' "
 "type='Checkbox' "
 "/> "
-"<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' "
+"<widget name='grDisableDitheringCheckbox' "
 "type='Checkbox' "
 "/> "
-"<import layout='Dialog.GlobalOptions_Volume' /> "
 "</layout> "
 "</dialog> "
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"<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='Id' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Domain' "
+"<widget name='auMidiPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='Name' "
-"width='35' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='Desc' "
+"<widget name='auOPLPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<space size='8'/> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='LangPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
 "/> "
-"<widget name='LangPopup' "
+"<widget name='auSampleRatePopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"width='60' "
-"height='Globals.Line.Height' "
-"textalign='right' "
-"/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='3' center='true'> "
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/> "
-"</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='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
-"/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='GlobalMenu' overlays='screen_center'> "
-"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'> "
-"<widget name='Title' "
-"width='160' "
-"height='4' "
-"/> "
-"<widget name='Version' "
-"width='160' "
-"height='4' "
-"/> "
-"<space size='1'/> "
-"<widget name='Load' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Save' "
-"width='120' "
-"height='12' "
-"/> "
-"<space size='1'/> "
-"<widget name='Options' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Help' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='About' "
-"width='120' "
-"height='12' "
-"/> "
-"<space size='1'/> "
-"<widget name='Resume' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='RTL' "
-"width='120' "
-"height='12' "
-"/> "
-"<widget name='Quit' "
-"width='120' "
-"height='12' "
-"/> "
-"</layout> "
-"</dialog> "
-"<dialog name='GlobalConfig' overlays='screen_center'> "
-"<layout type='vertical' padding='8,8,8,8'> "
+"<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' "
@@ -1273,291 +1104,188 @@
 "<space size='110' /> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
-"width='80' "
 "/> "
 "</layout> "
-"<layout type='vertical' padding='0,0,0,0' spacing='1' center='true'> "
-"<widget name='subToggleDesc' "
+"</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' "
 "type='OptionsLabel' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='90' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='90' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='mcFontButton' "
+"type='Button' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='90' "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
+"/> "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"</layout> "
-"<space size='2' /> "
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
+"/> "
 "<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
-"<widget name='subSubtitleSpeedDesc' "
+"<widget name='mcMidiGainText' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
+"<widget name='mcMidiGainSlider' "
 "type='Slider' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<space size='16'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='4'> "
-"<widget name='Keys' "
-"type='Button' "
-"/> "
-"<space size='Globals.Button.Width' /> "
-"<widget name='Cancel' "
-"type='Button' "
+"</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='Ok' "
-"type='Button' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/> "
 "</layout> "
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
+"/> "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
+"/> "
 "</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' "
+"<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' "
 "/> "
-"<space size='16'/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<widget name='SavePath' "
+"height='Globals.Line.Height' "
 "/> "
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name='ScummHelp' overlays='screen'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<widget name='Title' "
-"width='180' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ThemeButton' "
+"type='Button' "
+"/> "
+"<widget name='ThemePath' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='HelpText' "
-"height='140' "
+"<widget name='ThemePathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<widget name='Prev' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<widget name='ExtraButton' "
 "type='Button' "
 "/> "
-"<widget name='Next' "
-"type='Button' "
+"<widget name='ExtraPath' "
+"height='Globals.Line.Height' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='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='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' "
+"<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='GameProgressText' "
-"width='280' "
+"<widget name='CurTheme' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='GameList' "
-"width='280' "
-"height='100' "
-"/> "
-"<layout type='horizontal' padding='4,4,4,4'> "
-"<widget name='Ok' "
-"type='Button' "
-"/> "
-"<widget name='Cancel' "
-"type='Button' "
-"/> "
-"</layout> "
 "</layout> "
-"</dialog> "
-"<dialog name='KeyMapper' overlays='screen_center' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' spacing='10' center='true'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='150' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='RendererPopupDesc' "
+"width='80' "
 "height='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<widget name='KeymapArea' "
-"width='300' "
-"height='120' "
-"/> "
-"<widget name='Close' "
-"type='Button' "
-"/> "
-"</layout> "
-"</dialog> "
-"</layout_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='SmallLabel' "
-"size='24,Globals.Line.Height' "
-"/> "
-"<widget name='ShortOptionsLabel' "
-"size='60,Globals.Line.Height' "
-"/> "
-"<widget name='Button' "
-"size='108,24' "
-"/> "
-"<widget name='Slider' "
-"size='128,18' "
-"/> "
-"<widget name='PopUp' "
-"size='-1,19' "
-"/> "
-"<widget name='Checkbox' "
-"size='-1,14' "
-"/> "
-"<widget name='Radiobutton' "
-"size='-1,Globals.Line.Height' "
-"/> "
-"<widget name='ListWidget' "
-"padding='5,0,8,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='15,0' "
-"/> "
-"<widget name='TabWidget.Tab' "
-"size='75,27' "
-"padding='0,0,8,0' "
-"/> "
-"<widget name='TabWidget.Body' "
-"padding='0,0,0,0' "
-"/> "
-"<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' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/> "
-"<layout type='horizontal' spacing='5' padding='10,0,0,0'> "
-"<widget name='SearchDesc' "
-"width='60' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"width='80' "
 "height='Globals.Line.Height' "
 "textalign='right' "
 "/> "
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='SearchClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
 "/> "
-"<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' "
+"<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='RemoveGameButton' "
-"height='20' "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/> "
 "</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' "
+"<widget name='KeysButton' "
+"type='Button' "
 "/> "
 "</layout> "
-"</layout> "
 "</dialog> "
-"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8'> "
-"<widget name='Headline' "
+"<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='Path' "
+"<widget name='List'/> "
+"<widget name='Mapping' "
 "height='Globals.Line.Height' "
 "/> "
-"<widget name='List'/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Up' "
+"<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='Dialog.Launcher.GameList' 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='16,16,16,16'> "
+"<layout type='horizontal' padding='8,8,8,8'> "
 "<space/> "
 "<widget name='Cancel' "
 "type='Button' "
@@ -1568,92 +1296,177 @@
 "</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' "
-"/> "
-"<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='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='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'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auMidiPopupDesc' "
-"type='OptionsLabel' "
+"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
+"<layout type='vertical' padding='8,8,8,8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='Id' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auMidiPopup' "
+"<widget name='Domain' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auOPLPopupDesc' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='Name' "
+"width='35' "
+"height='Globals.Line.Height' "
+"textalign='right' "
 "/> "
-"<widget name='auOPLPopup' "
+"<widget name='Desc' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='auSampleRatePopupDesc' "
-"type='OptionsLabel' "
-"/> "
-"<widget name='auSampleRatePopup' "
+"<space size='8'/> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='LangPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<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' "
+"/> "
+"<widget name='SavePathClearButton' "
+"height='Globals.Line.Height' "
+"width='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='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' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
+"/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<widget name='Gamepath' "
+"type='Button' "
+"/> "
+"<widget name='GamepathText' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name='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'> "
+"<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' "
 "/> "
@@ -1664,7 +1477,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/> "
@@ -1675,7 +1488,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/> "
@@ -1686,537 +1499,764 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,0,24,0' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<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='10' 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='10' 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 type='horizontal' padding='0,0,0,0'> "
-"<widget name='mcMidiGainText' "
+"</layout> "
+"<space size='2' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<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='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='10' center='true'> "
-"<widget name='SaveButton' "
+"<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='SavePath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<space size='16'/> "
+"<widget name='Cancel' "
+"type='Button' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ThemeButton' "
+"<widget name='Choose' "
 "type='Button' "
 "/> "
-"<widget name='ThemePath' "
+"</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='ThemePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='HelpText' "
+"height='140' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='ExtraButton' "
+"<layout type='horizontal' padding='0,0,0,0'> "
+"<widget name='Prev' "
 "type='Button' "
 "/> "
-"<widget name='ExtraPath' "
-"height='Globals.Line.Height' "
-"/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
-"/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
-"<widget name='PluginsButton' "
+"<widget name='Next' "
 "type='Button' "
 "/> "
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
+"<space size='32'/> "
+"<widget name='Close' "
+"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='LoomTownsDifficultyDialog' overlays='screen_center'> "
+"<layout type='vertical' padding='8,8,8,8' center='true'> "
+"<widget name='Description1' "
+"width='280' "
 "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='Description2' "
+"height='Globals.Line.Height' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='GuiLanguagePopupDesc' "
-"type='OptionsLabel' "
+"<widget name='Standard' "
+"type='Button' "
 "/> "
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
+"<widget name='Practice' "
+"type='Button' "
 "/> "
-"</layout> "
-"<widget name='KeysButton' "
+"<widget name='Expert' "
 "type='Button' "
 "/> "
 "</layout> "
 "</dialog> "
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Action' "
+"<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='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' "
-"/> "
-"<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' "
-"/> "
-"<import layout='Dialog.GlobalOptions_Audio' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<import layout='Dialog.GlobalOptions_MIDI' /> "
-"</layout> "
-"</dialog> "
-"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'> "
-"<layout type='vertical' padding='16,16,16,16' spacing='8'> "
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/> "
-"<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='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
-"<layout type='vertical' padding='16,16,16,16'> "
+"<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='Id' "
+"<widget name='PopupDesc' "
 "type='OptionsLabel' "
 "/> "
-"<widget name='Domain' "
+"<widget name='Popup' "
 "type='PopUp' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Name' "
-"type='OptionsLabel' "
+"<widget name='KeymapArea' "
+"width='300' "
+"height='120' "
 "/> "
-"<widget name='Desc' "
-"type='PopUp' "
+"<widget name='Close' "
+"type='Button' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='LangPopupDesc' "
-"type='OptionsLabel' "
+"</dialog> "
+"</layout_info> "
+"<render_info> "
+"<palette> "
+"<color name='black' "
+"rgb='0,0,0' "
 "/> "
-"<widget name='LangPopup' "
-"type='PopUp' "
+"<color name='lightgrey' "
+"rgb='104,104,104' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='PlatformPopupDesc' "
-"type='OptionsLabel' "
+"<color name='darkgrey' "
+"rgb='64,64,64' "
 "/> "
-"<widget name='PlatformPopup' "
-"type='PopUp' "
+"<color name='green' "
+"rgb='32,160,32' "
 "/> "
-"</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' "
+"<color name='green2' "
+"rgb='0,255,0' "
 "/> "
-"<widget name='SavepathText' "
-"height='Globals.Line.Height' "
+"</palette> "
+"<fonts> "
+"<font id='text_default' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='SavePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<font resolution='y<400' "
+"id='text_default' "
+"file='clR6x12.bdf' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Extrapath' "
-"type='Button' "
+"<font id='text_button' "
+"file='helvb12.bdf' "
 "/> "
-"<widget name='ExtrapathText' "
-"height='Globals.Line.Height' "
+"<font resolution='y<400' "
+"id='text_button' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='ExtraPathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<font id='text_normal' "
+"file='helvb12.bdf' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
-"<widget name='Gamepath' "
-"type='Button' "
+"<font resolution='y<400' "
+"id='text_normal' "
+"file='clR6x12.bdf' "
 "/> "
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<font id='tooltip_normal' "
+"file='fixed5x8.bdf' "
 "/> "
-"</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' "
+"<text_color id='color_normal' "
+"color='green' "
 "/> "
-"<widget name='Version' "
-"width='210' "
-"height='Globals.Line.Height' "
+"<text_color id='color_normal_inverted' "
+"color='black' "
 "/> "
-"<widget name='Resume' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_normal_hover' "
+"color='green2' "
 "/> "
-"<space size='10'/> "
-"<widget name='Load' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_normal_disabled' "
+"color='lightgrey' "
 "/> "
-"<widget name='Save' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_alternative' "
+"color='lightgrey' "
 "/> "
-"<space size='10'/> "
-"<widget name='Options' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_alternative_inverted' "
+"color='255,255,255' "
 "/> "
-"<widget name='Help' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_alternative_hover' "
+"color='176,176,176' "
 "/> "
-"<widget name='About' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_alternative_disabled' "
+"color='darkgrey' "
 "/> "
-"<space size='10'/> "
-"<widget name='RTL' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_button' "
+"color='green' "
 "/> "
-"<widget name='Quit' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<text_color id='color_button_hover' "
+"color='green2' "
 "/> "
-"</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' "
+"<text_color id='color_button_disabled' "
+"color='lightgrey' "
 "/> "
-"<widget name='vcMusicSlider' "
-"type='Slider' "
+"</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='vcMusicLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='text_selection_focus' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
-"<widget name='vcSfxText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='mainmenu_bg' cache='false'> "
+"<drawstep func='fill' "
+"fill='foreground' "
+"fg_color='black' "
 "/> "
-"<widget name='vcSfxSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='special_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='vcSfxLabel' "
-"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='8'> "
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='separator' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"height='2' "
+"ypos='center' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='scrollbar_base' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/> "
-"</layout> "
-"</layout> "
-"<layout type='vertical' padding='24,24,24,24' center='true'> "
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80'  "
+"</drawdata> "
+"<drawdata id='scrollbar_handle_idle' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/> "
-"</layout> "
-"</layout> "
-"<space size='8' /> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='10' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,3,0' "
+"orientation='top' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='5' "
+"height='5' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,2,0' "
+"orientation='top' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='10' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,3,0' "
+"orientation='top' "
+"/> "
+"</drawdata> "
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='5' "
+"height='5' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,2,0' "
+"orientation='top' "
+"/> "
+"</drawdata> "
+"<drawdata id='tab_active' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='tab_inactive' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='center' "
+"/> "
+"<drawstep func='tab' "
+"bevel='2' "
+"radius='0' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='tab_background' cache='false'> "
+"</drawdata> "
+"<drawdata id='widget_slider' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='slider_disabled' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id='slider_full' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
+"/> "
+"</drawdata> "
+"<drawdata id='slider_hover' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
+"/> "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='10' "
+"padding='0,0,7,0' "
+"orientation='bottom' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,7,0' "
+"orientation='top' "
+"/> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_idle' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='9' "
+"padding='0,0,3,0' "
+"orientation='bottom' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,3,0' "
+"orientation='top' "
+"/> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='10' "
+"padding='0,0,7,0' "
+"orientation='bottom' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,7,0' "
+"orientation='top' "
+"/> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_disabled' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='9' "
+"padding='0,0,3,0' "
+"orientation='bottom' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,3,0' "
+"orientation='top' "
+"/> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false' resolution='y>399'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='10' "
+"padding='0,0,7,0' "
+"orientation='bottom' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='5' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,7,0' "
+"orientation='top' "
+"/> "
+"<text font='text_default' "
+"text_color='color_normal_hover' "
+"vertical_align='center' "
+"horizontal_align='left' "
+"/> "
+"</drawdata> "
+"<drawdata id='popup_hover' cache='false' resolution='y<400'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
+"/> "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='9' "
+"padding='0,0,3,0' "
+"orientation='bottom' "
 "/> "
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='100' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='7' "
+"height='4' "
+"xpos='right' "
+"ypos='4' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/> "
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='100' "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='100' "
+"</drawdata> "
+"<drawdata id='widget_textedit' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
+"</drawdata> "
+"<drawdata id='plain_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"</drawdata> "
+"<drawdata id='caret' cache='false'> "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/> "
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"</drawdata> "
+"<drawdata id='default_bg' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"</layout> "
-"<space size='60'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
-"<widget name='Keys' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='button_idle' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button' "
+"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='button_hover' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_hover' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</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' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'> "
-"<widget name='List' /> "
-"<widget name='Thumbnail' "
-"width='180' "
-"height='200' "
+"</drawdata> "
+"<drawdata id='button_disabled' cache='false'> "
+"<text font='text_button' "
+"text_color='color_button_disabled' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/> "
-"</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
-"<space/> "
-"<widget name='Delete' "
-"type='Button' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<space size='32'/> "
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='checkbox_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"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_center'> "
-"<layout type='vertical' padding='8,8,8,8' center='true'> "
-"<widget name='Title' "
-"width='320' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='checkbox_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"<widget name='HelpText' "
-"height='200' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"<layout type='horizontal' padding='0,0,16,0'> "
-"<widget name='Prev' "
-"type='Button' "
+"<drawstep func='cross' "
+"fill='foreground' "
+"stroke='2' "
+"fg_color='green' "
 "/> "
-"<widget name='Next' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='checkbox_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/> "
-"<space size='32'/> "
-"<widget name='Close' "
-"type='Button' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/> "
-"</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' "
-"height='Globals.Line.Height' "
+"</drawdata> "
+"<drawdata id='radiobutton_default' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='GameProgressText' "
-"width='480' "
-"height='Globals.Line.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fill='background' "
+"bg_color='darkgrey' "
+"xpos='0' "
+"ypos='0' "
 "/> "
-"<widget name='GameList' "
-"width='480' "
-"height='250' "
+"</drawdata> "
+"<drawdata id='radiobutton_selected' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<layout type='horizontal' padding='8,8,8,8'> "
-"<widget name='Ok' "
-"type='Button' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fg_color='darkgrey' "
+"fill='none' "
+"xpos='0' "
+"ypos='0' "
 "/> "
-"<widget name='Cancel' "
-"type='Button' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='5' "
+"fg_color='green' "
+"fill='foreground' "
+"xpos='2' "
+"ypos='2' "
 "/> "
-"</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' "
+"</drawdata> "
+"<drawdata id='radiobutton_disabled' cache='false'> "
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/> "
-"<widget name='Popup' "
-"type='PopUp' "
-"width='400' "
-"height='Globals.Line.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"bg_color='lightgrey' "
+"fill='background' "
+"xpos='0' "
+"ypos='0' "
 "/> "
-"</layout> "
-"<widget name='KeymapArea' "
-"width='600' "
-"height='280' "
+"</drawdata> "
+"<drawdata id='widget_default' cache='false'> "
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/> "
-"<widget name='Close' "
-"type='Button' "
+"</drawdata> "
+"<drawdata id='widget_small' cache='false'> "
+"<drawstep func='square' "
+"stroke='0' "
 "/> "
-"</layout> "
-"</dialog> "
-"</layout_info> "
+"</drawdata> "
+"</render_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 54d1fc92b0..219c79a570 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 f6a46692a0..7ac9720efb 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.5:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.6:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 3d916e28e9..9da42635a7 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -818,6 +818,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '320'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					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'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7d4077dbe2..dc528a4c00 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -820,6 +820,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '280'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'>
 			<widget name = 'DirProgressText'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 83229184ba..fa1a3e512f 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 1d288adffd..dfa0c5b697 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.5:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.6:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index a3fc013a08..69ad9c79fa 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -833,6 +833,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '320'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					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'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 67a02dc2d5..0bfd16c1d9 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -819,6 +819,27 @@
 		</layout>
 	</dialog>
 
+	<dialog name = 'LoomTownsDifficultyDialog' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Description1'
+					width = '280'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Description2'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Standard'
+					type = 'Button'
+			/>
+			<widget name = 'Practice'
+					type = 'Button'
+			/>
+			<widget name = 'Expert'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
 	<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'>
 		<layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'>
 			<widget name = 'DirProgressText'
-- 
cgit v1.2.3