[Scummvm-cvs-logs] scummvm master -> 9957965257b6781d34ac2c71e9773ebd972e3d73

[zeldin]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9957965257 GUI: Fix menu layout for low-res classic theme


Commit: 9957965257b6781d34ac2c71e9773ebd972e3d73
    https://github.com/scummvm/scummvm/commit/9957965257b6781d34ac2c71e9773ebd972e3d73
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2014-01-11T08:48:34-08:00

Commit Message:
GUI: Fix menu layout for low-res classic theme

Since clipping is now in place for strings, having text widgets which
are 4 pixels high will no longer work.  Remade the layout to set better
heights, and remove some spacing instead.

Changed paths:
    gui/themes/default.inc
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout_lowres.stx



diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 352cc86..fe1bf04 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,780 +1,478 @@
  "<?xml version = '1.0'?>"
-"<render_info>"
-"<palette>"
-"<color name='black' "
-"rgb='0,0,0' "
-"/>"
-"<color name='lightgrey' "
-"rgb='104,104,104' "
+"<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='ShowChooserPics' value='0'/>"
+"<def var='ShowChooserPageDisplay' value='1'/>"
+"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/>"
+"<def var='RecorderDialog.ExtInfo.Visible' value='1'/>"
+"<def var='OnScreenDialog.ShowPics' value='0'/>"
+"<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'/>"
+"<def var='Predictive.Button.Width' value='60' />"
+"<widget name='OptionsLabel' "
+"size='110,Globals.Line.Height' "
+"textalign='right' "
 "/>"
-"<color name='darkgrey' "
-"rgb='64,64,64' "
+"<widget name='SmallLabel' "
+"size='24,Globals.Line.Height' "
 "/>"
-"<color name='green' "
-"rgb='32,160,32' "
+"<widget name='ShortOptionsLabel' "
+"size='60,Globals.Line.Height' "
 "/>"
-"<color name='green2' "
-"rgb='0,255,0' "
+"<widget name='Button' "
+"size='108,24' "
 "/>"
-"</palette>"
-"<fonts>"
-"<font id='text_default' "
-"file='helvb12.bdf' "
+"<widget name='Slider' "
+"size='128,18' "
 "/>"
-"<font resolution='y<400' "
-"id='text_default' "
-"file='clR6x12.bdf' "
+"<widget name='PopUp' "
+"size='-1,19' "
 "/>"
-"<font id='text_button' "
-"file='helvb12.bdf' "
+"<widget name='Checkbox' "
+"size='-1,14' "
 "/>"
-"<font resolution='y<400' "
-"id='text_button' "
-"file='clR6x12.bdf' "
+"<widget name='Radiobutton' "
+"size='-1,Globals.Line.Height' "
 "/>"
-"<font id='text_normal' "
-"file='helvb12.bdf' "
+"<widget name='ListWidget' "
+"padding='5,0,8,0' "
 "/>"
-"<font resolution='y<400' "
-"id='text_normal' "
-"file='clR6x12.bdf' "
+"<widget name='PopUpWidget' "
+"padding='7,5,0,0' "
 "/>"
-"<font id='tooltip_normal' "
-"file='fixed5x8.bdf' "
+"<widget name='EditTextWidget' "
+"padding='5,5,0,0' "
 "/>"
-"<text_color id='color_normal' "
-"color='green' "
+"<widget name='Console' "
+"padding='7,5,5,5' "
 "/>"
-"<text_color id='color_normal_inverted' "
-"color='black' "
+"<widget name='Scrollbar' "
+"size='15,0' "
 "/>"
-"<text_color id='color_normal_hover' "
-"color='green2' "
+"<widget name='TabWidget.Tab' "
+"size='75,27' "
+"padding='0,0,8,0' "
 "/>"
-"<text_color id='color_normal_disabled' "
-"color='lightgrey' "
+"<widget name='TabWidget.Body' "
+"padding='0,0,0,0' "
 "/>"
-"<text_color id='color_alternative' "
-"color='lightgrey' "
+"<widget name='TabWidget.NavButton' "
+"size='15,18' "
+"padding='0,3,4,0' "
 "/>"
-"<text_color id='color_alternative_inverted' "
-"color='255,255,255' "
+"<widget name='EditRecordLabel' "
+"size='60,25' "
 "/>"
-"<text_color id='color_alternative_hover' "
-"color='176,176,176' "
+"<widget name='EditRecord' "
+"size='240,25' "
 "/>"
-"<text_color id='color_alternative_disabled' "
-"color='darkgrey' "
+"</globals>"
+"<dialog name='Launcher' overlays='screen'>"
+"<layout type='vertical' center='true' padding='16,16,8,8'>"
+"<widget name='Version' "
+"height='Globals.Line.Height' "
+"textalign='center' "
 "/>"
-"<text_color id='color_button' "
-"color='green' "
+"<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_button_hover' "
-"color='green2' "
+"<widget name='Search' "
+"width='150' "
+"height='Globals.Line.Height' "
 "/>"
-"<text_color id='color_button_disabled' "
-"color='lightgrey' "
+"<widget name='SearchClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/>"
-"</fonts>"
-"<defaults fill='foreground' fg_color='darkgrey' bg_color='black' shadow='0' bevel_color='lightgrey'/>"
-"<drawdata id='text_selection' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<space />"
+"</layout>"
+"<widget name='GameList'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
+"<widget name='LoadGameButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='text_selection_focus' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"<widget name='AddGameButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='mainmenu_bg' cache='false'>"
-"<drawstep func='fill' "
-"fill='foreground' "
-"fg_color='black' "
+"<widget name='EditGameButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='special_bg' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='RemoveGameButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='tooltip_bg' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='foreground' "
-"fg_color='black' "
+"</layout>"
+"<space size='4'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
+"<widget name='QuitButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='separator' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"height='2' "
-"ypos='center' "
-"fg_color='lightgrey' "
+"<widget name='AboutButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='scrollbar_base' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='OptionsButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='scrollbar_handle_hover' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"<widget name='StartButton' "
+"height='20' "
 "/>"
-"</drawdata>"
-"<drawdata id='scrollbar_handle_idle' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"</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_button_idle' cache='false' resolution='y>399'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='Path' "
+"height='Globals.Line.Height' "
 "/>"
-"<drawstep func='triangle' "
-"fg_color='green' "
-"fill='foreground' "
-"width='10' "
-"height='10' "
-"xpos='right' "
-"ypos='center' "
-"padding='0,0,3,0' "
-"orientation='top' "
+"<widget name='List'/>"
+"<layout type='vertical' padding='0,0,16,0'>"
+"<widget name='Hidden' "
+"type='Checkbox' "
 "/>"
-"</drawdata>"
-"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='Up' "
+"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' "
+"<space/>"
+"<widget name='Cancel' "
+"type='Button' "
 "/>"
-"</drawdata>"
-"<drawdata id='scrollbar_button_hover' 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>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='16,16,16,16'>"
+"<space/>"
+"<widget name='Cancel' "
+"type='Button' "
 "/>"
-"</drawdata>"
-"<drawdata id='scrollbar_button_hover' cache='false' 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='tab_active' cache='false'>"
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='grModePopup' "
+"type='PopUp' "
 "/>"
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"</drawdata>"
-"<drawdata id='tab_inactive' cache='false'>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='grRenderPopup' "
+"type='PopUp' "
 "/>"
-"<drawstep func='tab' "
-"bevel='2' "
-"radius='0' "
-"fill='none' "
+"</layout>"
+"<widget name='grAspectCheckbox' "
+"type='Checkbox' "
 "/>"
-"</drawdata>"
-"<drawdata id='tab_background' cache='false'>"
-"</drawdata>"
-"<drawdata id='widget_slider' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='grFullscreenCheckbox' "
+"type='Checkbox' "
 "/>"
-"</drawdata>"
-"<drawdata id='slider_disabled' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"</drawdata>"
-"<drawdata id='slider_full' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"<widget name='auMidiPopup' "
+"type='PopUp' "
 "/>"
-"</drawdata>"
-"<drawdata id='slider_hover' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green2' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"</drawdata>"
-"<drawdata id='widget_small' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='auOPLPopup' "
+"type='PopUp' "
 "/>"
-"</drawdata>"
-"<drawdata id='popup_idle' cache='false' resolution='y>399'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"<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='auSampleRatePopup' "
+"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'>"
+"<widget name='subToggleDesc' "
+"type='OptionsLabel' "
 "/>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
 "/>"
-"</drawdata>"
-"<drawdata id='popup_idle' cache='false' resolution='y<400'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
 "/>"
-"<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='subToggleSubBoth' "
+"type='Radiobutton' "
 "/>"
-"<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 type='horizontal' padding='0,0,0,0' spacing='10'>"
+"<widget name='subSubtitleSpeedDesc' "
+"type='OptionsLabel' "
 "/>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='subSubtitleSpeedSlider' "
+"type='Slider' "
 "/>"
-"</drawdata>"
-"<drawdata id='popup_disabled' cache='false' resolution='y>399'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='subSubtitleSpeedLabel' "
+"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>"
+"</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' "
 "/>"
-"<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='vcMusicSlider' "
+"type='Slider' "
 "/>"
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='vcMusicLabel' "
+"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='vcSfxText' "
+"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='vcSfxSlider' "
+"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' "
-"/>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='vcSfxLabel' "
+"type='SmallLabel' "
 "/>"
-"</drawdata>"
-"<drawdata id='popup_hover' cache='false' resolution='y>399'>"
-"<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='10' "
-"height='5' "
-"xpos='right' "
-"ypos='10' "
-"padding='0,0,7,0' "
-"orientation='bottom' "
+"<widget name='vcSpeechSlider' "
+"type='Slider' "
 "/>"
-"<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='vcSpeechLabel' "
+"type='SmallLabel' "
 "/>"
-"<text font='text_default' "
-"text_color='color_normal_hover' "
-"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<400'>"
-"<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='7' "
-"height='4' "
-"xpos='right' "
-"ypos='9' "
-"padding='0,0,3,0' "
-"orientation='bottom' "
+"<widget name='auPrefGmPopup' "
+"type='PopUp' "
 "/>"
-"<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 type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='mcFontButton' "
+"type='Button' "
 "/>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"<widget name='mcFontPath' "
+"height='Globals.Line.Height' "
 "/>"
-"</drawdata>"
-"<drawdata id='widget_textedit' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='mcFontClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/>"
-"</drawdata>"
-"<drawdata id='plain_bg' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"</layout>"
+"<widget name='mcMixedCheckbox' "
+"type='Checkbox' "
 "/>"
-"</drawdata>"
-"<drawdata id='caret' cache='false'>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='lightgrey' "
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='mcMidiGainText' "
+"type='OptionsLabel' "
 "/>"
-"</drawdata>"
-"<drawdata id='default_bg' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
+"<widget name='mcMidiGainSlider' "
+"type='Slider' "
 "/>"
-"</drawdata>"
-"<drawdata id='button_pressed' cache='false'>"
-"<text font='text_button' "
-"text_color='color_alternative_inverted' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"<widget name='mcMidiGainLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
-"<drawstep func='square' "
-"fill='foreground' "
-"fg_color='green' "
+"</layout>"
+"<widget name='mcFluidSynthSettings' "
+"width='200' "
+"height='Globals.Button.Height' "
 "/>"
-"</drawdata>"
-"<drawdata id='button_idle' cache='false'>"
-"<text font='text_button' "
-"text_color='color_button' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</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' "
 "/>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='auPrefMt32Popup' "
+"type='PopUp' "
 "/>"
-"</drawdata>"
-"<drawdata id='button_hover' cache='false'>"
-"<text font='text_button' "
-"text_color='color_button_hover' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</layout>"
+"<widget name='mcMt32Checkbox' "
+"type='Checkbox' "
 "/>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='mcGSCheckbox' "
+"type='Checkbox' "
 "/>"
-"</drawdata>"
-"<drawdata id='button_disabled' cache='false'>"
-"<text font='text_button' "
-"text_color='color_button_disabled' "
-"vertical_align='center' "
-"horizontal_align='center' "
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='SaveButton' "
+"type='Button' "
 "/>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='SavePath' "
+"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='SavePathClearButton' "
+"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='ThemeButton' "
+"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='ThemePath' "
+"height='Globals.Line.Height' "
 "/>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='ThemePathClearButton' "
+"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='10' center='true'>"
+"<widget name='ExtraButton' "
+"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='ExtraPath' "
+"height='Globals.Line.Height' "
 "/>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"fill='none' "
+"<widget name='ExtraPathClearButton' "
+"height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/>"
-"</drawdata>"
-"<drawdata id='radiobutton_default' cache='false'>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='16'>"
+"<widget name='PluginsButton' "
+"type='Button' "
 "/>"
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fill='background' "
-"bg_color='darkgrey' "
-"xpos='0' "
-"ypos='0' "
-"/>"
-"</drawdata>"
-"<drawdata id='radiobutton_selected' cache='false'>"
-"<text font='text_default' "
-"text_color='color_normal' "
-"vertical_align='center' "
-"horizontal_align='left' "
-"/>"
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"fg_color='darkgrey' "
-"fill='none' "
-"xpos='0' "
-"ypos='0' "
-"/>"
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='5' "
-"fg_color='green' "
-"fill='foreground' "
-"xpos='2' "
-"ypos='2' "
-"/>"
-"</drawdata>"
-"<drawdata id='radiobutton_disabled' cache='false'>"
-"<text font='text_default' "
-"text_color='color_normal_disabled' "
-"vertical_align='center' "
-"horizontal_align='left' "
-"/>"
-"<drawstep func='circle' "
-"width='7' "
-"height='7' "
-"radius='7' "
-"bg_color='lightgrey' "
-"fill='background' "
-"xpos='0' "
-"ypos='0' "
-"/>"
-"</drawdata>"
-"<drawdata id='widget_default' cache='false'>"
-"<drawstep func='bevelsq' "
-"bevel='2' "
-"/>"
-"</drawdata>"
-"<drawdata id='widget_small' cache='false'>"
-"<drawstep func='square' "
-"stroke='0' "
-"/>"
-"</drawdata>"
-"</render_info>"
-"<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='ShowChooserPics' value='0'/>"
-"<def var='ShowChooserPageDisplay' value='1'/>"
-"<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/>"
-"<def var='RecorderDialog.ExtInfo.Visible' value='1'/>"
-"<def var='OnScreenDialog.ShowPics' value='0'/>"
-"<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'/>"
-"<def var='Predictive.Button.Width' value='60' />"
-"<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' "
-"/>"
-"<widget name='EditRecordLabel' "
-"size='60,25' "
-"/>"
-"<widget name='EditRecord' "
-"size='240,25' "
-"/>"
-"</globals>"
-"<dialog name='Launcher' overlays='screen'>"
-"<layout type='vertical' center='true' padding='16,16,8,8'>"
-"<widget name='Version' "
-"height='Globals.Line.Height' "
-"textalign='center' "
-"/>"
-"<layout type='horizontal' spacing='5' padding='10,0,0,0'>"
-"<widget name='SearchDesc' "
-"width='60' "
+"<widget name='PluginsPath' "
 "height='Globals.Line.Height' "
-"textalign='right' "
 "/>"
-"<widget name='Search' "
-"width='150' "
-"height='Globals.Line.Height' "
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='ThemeButton' "
+"type='Button' "
 "/>"
-"<widget name='SearchClearButton' "
+"<widget name='CurTheme' "
 "height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
 "/>"
-"<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='10' center='true'>"
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"<widget name='RemoveGameButton' "
-"height='20' "
+"<widget name='RendererPopup' "
+"type='PopUp' "
 "/>"
 "</layout>"
-"<space size='4'/>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
-"<widget name='QuitButton' "
-"height='20' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"<widget name='AboutButton' "
-"height='20' "
+"<widget name='AutosavePeriodPopup' "
+"type='PopUp' "
 "/>"
-"<widget name='OptionsButton' "
-"height='20' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='GuiLanguagePopupDesc' "
+"type='OptionsLabel' "
 "/>"
-"<widget name='StartButton' "
-"height='20' "
+"<widget name='GuiLanguagePopup' "
+"type='PopUp' "
 "/>"
 "</layout>"
+"<widget name='KeysButton' "
+"type='Button' "
+"/>"
 "</layout>"
 "</dialog>"
-"<dialog name='Browser' overlays='Dialog.Launcher.GameList' shading='dim'>"
-"<layout type='vertical' padding='8,8,8,8'>"
-"<widget name='Headline' "
-"height='Globals.Line.Height' "
-"/>"
-"<widget name='Path' "
+"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
+"<widget name='Action' "
 "height='Globals.Line.Height' "
 "/>"
 "<widget name='List'/>"
-"<layout type='vertical' padding='0,0,16,0'>"
-"<widget name='Hidden' "
-"type='Checkbox' "
+"<widget name='Mapping' "
+"height='Globals.Line.Height' "
 "/>"
-"<layout type='horizontal' padding='0,0,0,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>"
-"</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
-"<layout type='vertical' padding='0,0,0,0'>"
+"<dialog name='GameOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='16'>"
 "<widget name='TabWidget'/>"
-"<layout type='horizontal' padding='16,16,16,16'>"
+"<layout type='horizontal' padding='16,16,16,4'>"
 "<space/>"
 "<widget name='Cancel' "
 "type='Button' "
@@ -785,89 +483,195 @@
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<dialog name='GameOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
 "<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='grModePopupDesc' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='grModePopup' "
-"type='PopUp' "
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/>"
+"<import layout='Dialog.GlobalOptions_Graphics' />"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='grRenderPopupDesc' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='grRenderPopup' "
-"type='PopUp' "
+"</dialog>"
+"<dialog name='GameOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
 "/>"
+"<import layout='Dialog.GlobalOptions_Audio' />"
 "</layout>"
-"<widget name='grAspectCheckbox' "
+"</dialog>"
+"<dialog name='GameOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/>"
-"<widget name='grFullscreenCheckbox' "
+"<import layout='Dialog.GlobalOptions_MIDI' />"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_MT32' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<widget name='EnableTabCheckbox' "
 "type='Checkbox' "
 "/>"
+"<import layout='Dialog.GlobalOptions_MT32' />"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<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'>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='auMidiPopupDesc' "
+"<widget name='Id' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='auMidiPopup' "
+"<widget name='Domain' "
 "type='PopUp' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='auOPLPopupDesc' "
+"<widget name='Name' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='auOPLPopup' "
+"<widget name='Desc' "
 "type='PopUp' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='auSampleRatePopupDesc' "
+"<widget name='LangPopupDesc' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='auSampleRatePopup' "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
-"<widget name='subToggleDesc' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='PlatformPopupDesc' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
+"<widget name='PlatformPopup' "
+"type='PopUp' "
 "/>"
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='Savepath' "
+"type='Button' "
 "/>"
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
+"<widget name='SavepathText' "
+"height='Globals.Line.Height' "
+"/>"
+"<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='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='horizontal' padding='16,16,16,16' spacing='8'>"
-"<layout type='vertical' padding='0,0,0,0' spacing='8'>"
+"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
+"<layout type='vertical' padding='16,16,16,16'>"
+"<widget name='customOption1Checkbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='customOption2Checkbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='customOption3Checkbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='customOption4Checkbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='customOption5Checkbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='customOption6Checkbox' "
+"type='Checkbox' "
+"/>"
+"<widget name='customOption7Checkbox' "
+"type='Checkbox' "
+"/>"
+"</layout>"
+"</dialog>"
+"<dialog name='GlobalMenu' overlays='screen_center'>"
+"<layout type='vertical' padding='16,16,16,16' center='true'>"
+"<widget name='Title' "
+"width='210' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Version' "
+"width='210' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Resume' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/>"
+"<space size='10'/>"
+"<widget name='Load' "
+"width='150' "
+"height='Globals.Button.Height' "
+"/>"
+"<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' "
 "/>"
@@ -878,7 +682,7 @@
 "type='SmallLabel' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/>"
@@ -889,7 +693,7 @@
 "type='SmallLabel' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/>"
@@ -901,978 +705,1174 @@
 "/>"
 "</layout>"
 "</layout>"
-"<layout type='vertical' padding='24,0,24,0' center='true'>"
+"<layout type='vertical' padding='24,24,24,24' center='true'>"
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
+"width='80'  "
 "/>"
 "</layout>"
 "</layout>"
-"</dialog>"
-"<dialog name='GlobalOptions_MIDI' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='auPrefGmPopupDesc' "
+"<space size='8' />"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
+"<widget name='subToggleDesc' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='auPrefGmPopup' "
-"type='PopUp' "
-"/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='mcFontButton' "
-"type='Button' "
+"<widget name='subToggleSpeechOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/>"
-"<widget name='mcFontPath' "
-"height='Globals.Line.Height' "
+"<widget name='subToggleSubOnly' "
+"type='Radiobutton' "
+"width='100' "
 "/>"
-"<widget name='mcFontClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='subToggleSubBoth' "
+"type='Radiobutton' "
+"width='100' "
 "/>"
 "</layout>"
-"<widget name='mcMixedCheckbox' "
-"type='Checkbox' "
-"/>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='mcMidiGainText' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
+"<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='mcMidiGainSlider' "
+"<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
 "/>"
-"<widget name='mcMidiGainLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='subSubtitleSpeedLabel' "
+"type='SmallLabel' "
 "/>"
 "</layout>"
-"<widget name='mcFluidSynthSettings' "
-"width='200' "
-"height='Globals.Button.Height' "
+"<space size='60'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
+"<widget name='Keys' "
+"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='10' center='true'>"
-"<widget name='auPrefMt32PopupDesc' "
-"type='OptionsLabel' "
+"<space size='Globals.Button.Width' />"
+"<widget name='Cancel' "
+"type='Button' "
 "/>"
-"<widget name='auPrefMt32Popup' "
-"type='PopUp' "
+"<widget name='Ok' "
+"type='Button' "
 "/>"
 "</layout>"
-"<widget name='mcMt32Checkbox' "
-"type='Checkbox' "
-"/>"
-"<widget name='mcGSCheckbox' "
-"type='Checkbox' "
-"/>"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Paths' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='SaveButton' "
+"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='TabWidget'/>"
+"<layout type='horizontal' padding='16,16,16,16'>"
+"<space/>"
+"<widget name='ResetSettings' "
 "type='Button' "
 "/>"
-"<widget name='SavePath' "
-"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' center='true'>"
-"<widget name='ThemeButton' "
-"type='Button' "
-"/>"
-"<widget name='ThemePath' "
-"height='Globals.Line.Height' "
-"/>"
-"<widget name='ThemePathClearButton' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
-"/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='ExtraButton' "
+"<widget name='Cancel' "
 "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='Ok' "
 "type='Button' "
 "/>"
-"<widget name='PluginsPath' "
-"height='Globals.Line.Height' "
-"/>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Misc' overlays='Dialog.GlobalOptions.TabWidget'>"
+"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'>"
 "<layout type='vertical' padding='16,16,16,16' spacing='8'>"
+"<widget name='EnableTabCheckbox' "
+"type='Checkbox' "
+"/>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='ThemeButton' "
-"type='Button' "
+"<widget name='VoiceCountText' "
+"type='OptionsLabel' "
 "/>"
-"<widget name='CurTheme' "
+"<widget name='VoiceCountSlider' "
+"type='Slider' "
+"/>"
+"<widget name='VoiceCountLabel' "
+"width='32' "
 "height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='RendererPopupDesc' "
+"<widget name='LevelText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='RendererPopup' "
-"type='PopUp' "
+"<widget name='LevelSlider' "
+"type='Slider' "
+"/>"
+"<widget name='LevelLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='AutosavePeriodPopupDesc' "
+"<widget name='SpeedText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='AutosavePeriodPopup' "
-"type='PopUp' "
+"<widget name='SpeedSlider' "
+"type='Slider' "
+"/>"
+"<widget name='SpeedLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='GuiLanguagePopupDesc' "
+"<widget name='DepthText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='GuiLanguagePopup' "
-"type='PopUp' "
-"/>"
-"</layout>"
-"<widget name='KeysButton' "
-"type='Button' "
-"/>"
-"</layout>"
-"</dialog>"
-"<dialog name='KeysDialog' overlays='Dialog.GlobalOptions' shading='dim'>"
-"<layout type='vertical' padding='8,8,8,8' center='true'>"
-"<widget name='Action' "
-"height='Globals.Line.Height' "
+"<widget name='DepthSlider' "
+"type='Slider' "
 "/>"
-"<widget name='List'/>"
-"<widget name='Mapping' "
+"<widget name='DepthLabel' "
+"width='32' "
 "height='Globals.Line.Height' "
 "/>"
-"<space size='Globals.Line.Height'/>"
-"<layout type='horizontal'>"
-"<widget name='Map' "
-"type='Button' "
-"/>"
-"<space/>"
-"<widget name='Cancel' "
-"type='Button' "
-"/>"
-"<widget name='Ok' "
-"type='Button' "
-"/>"
 "</layout>"
-"</layout>"
-"</dialog>"
-"<dialog name='GameOptions' overlays='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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='WaveFormTypeText' "
+"type='OptionsLabel' "
 "/>"
-"<widget name='Ok' "
-"type='Button' "
+"<widget name='WaveFormType' "
+"type='PopUp' "
 "/>"
 "</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'>"
+"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.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' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
+"<widget name='RoomSizeText' "
+"type='OptionsLabel' "
 "/>"
-"<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='RoomSizeSlider' "
+"type='Slider' "
 "/>"
-"<import layout='Dialog.GlobalOptions_MT32' />"
-"</layout>"
-"</dialog>"
-"<dialog name='GameOptions_Volume' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
+"<widget name='RoomSizeLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
-"<import layout='Dialog.GlobalOptions_Volume' />"
 "</layout>"
-"</dialog>"
-"<dialog name='GameOptions_Game' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
-"<layout type='vertical' padding='16,16,16,16'>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='Id' "
+"<widget name='DampingText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='Domain' "
-"type='PopUp' "
+"<widget name='DampingSlider' "
+"type='Slider' "
+"/>"
+"<widget name='DampingLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='Name' "
+"<widget name='WidthText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='Desc' "
-"type='PopUp' "
+"<widget name='WidthSlider' "
+"type='Slider' "
+"/>"
+"<widget name='WidthLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
 "</layout>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='LangPopupDesc' "
+"<widget name='LevelText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='LangPopup' "
-"type='PopUp' "
+"<widget name='LevelSlider' "
+"type='Slider' "
+"/>"
+"<widget name='LevelLabel' "
+"width='32' "
+"height='Globals.Line.Height' "
 "/>"
 "</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.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='PlatformPopupDesc' "
+"<widget name='InterpolationText' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='PlatformPopup' "
+"<widget name='Interpolation' "
 "type='PopUp' "
 "/>"
 "</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='SavepathText' "
+"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,32' center='true'>"
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='Title' "
 "height='Globals.Line.Height' "
 "/>"
-"<widget name='SavePathClearButton' "
+"<space/>"
+"<widget name='PageDisplay' "
+"width='200' "
 "height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='Extrapath' "
-"type='Button' "
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'>"
+"<widget name='List' />"
+"<widget name='Thumbnail' "
+"width='180' "
+"height='200' "
 "/>"
-"<widget name='ExtrapathText' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='ListSwitch' "
 "height='Globals.Line.Height' "
+"width='Globals.Line.Height' "
 "/>"
-"<widget name='ExtraPathClearButton' "
+"<widget name='GridSwitch' "
 "height='Globals.Line.Height' "
 "width='Globals.Line.Height' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='Gamepath' "
+"<space/>"
+"<widget name='Delete' "
 "type='Button' "
 "/>"
-"<widget name='GamepathText' "
-"height='Globals.Line.Height' "
+"<space size='32'/>"
+"<widget name='Cancel' "
+"type='Button' "
+"/>"
+"<widget name='Choose' "
+"type='Button' "
 "/>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='GameOptions_Engine' overlays='Dialog.GameOptions.TabWidget' shading='dim'>"
-"<layout type='vertical' padding='16,16,16,16'>"
-"<widget name='customOption1Checkbox' "
-"type='Checkbox' "
+"<dialog name='SavenameDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8'>"
+"<widget name='DescriptionText' "
+"width='320' "
+"height='Globals.Line.Height' "
 "/>"
-"<widget name='customOption2Checkbox' "
-"type='Checkbox' "
+"<widget name='Description' "
+"height='19' "
 "/>"
-"<widget name='customOption3Checkbox' "
-"type='Checkbox' "
-"/>"
-"<widget name='customOption4Checkbox' "
-"type='Checkbox' "
-"/>"
-"<widget name='customOption5Checkbox' "
-"type='Checkbox' "
-"/>"
-"<widget name='customOption6Checkbox' "
-"type='Checkbox' "
+"<layout type='horizontal' padding='0,0,16,0'>"
+"<widget name='Cancel' "
+"type='Button' "
 "/>"
-"<widget name='customOption7Checkbox' "
-"type='Checkbox' "
+"<space size='96'/>"
+"<widget name='Ok' "
+"type='Button' "
 "/>"
 "</layout>"
+"</layout>"
 "</dialog>"
-"<dialog name='GlobalMenu' overlays='screen_center'>"
-"<layout type='vertical' padding='16,16,16,16' center='true'>"
+"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'>"
+"<layout type='vertical' padding='8,8,8,32' center='true'>"
 "<widget name='Title' "
-"width='210' "
 "height='Globals.Line.Height' "
 "/>"
-"<widget name='Version' "
-"width='210' "
-"height='Globals.Line.Height' "
+"<layout type='horizontal' padding='0,0,0,16' spacing='16'>"
+"<widget name='List' />"
+"<layout type='vertical' padding='0,0,0,0'>"
+"<widget name='Thumbnail' "
+"width='180' "
+"height='170' "
 "/>"
-"<widget name='Resume' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='NextScreenShotButton' "
+"width='25' "
+"height='25' "
 "/>"
-"<space size='10'/>"
-"<widget name='Load' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='currentScreenshot' "
+"width='125' "
+"height='25' "
+"textalign='center' "
 "/>"
-"<widget name='Save' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='PreviousScreenShotButton' "
+"width='25' "
+"height='25' "
 "/>"
-"<space size='10'/>"
-"<widget name='Options' "
-"width='150' "
-"height='Globals.Button.Height' "
+"</layout>"
+"<widget name='Author' height='Globals.Line.Height' />"
+"<widget name='Notes' height='Globals.Line.Height' />"
+"</layout>"
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0'>"
+"<widget name='Delete' "
+"type='Button' "
 "/>"
-"<widget name='Help' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<space size='16'/>"
+"<widget name='Cancel' "
+"type='Button' "
 "/>"
-"<widget name='About' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<space size='16'/>"
+"<widget name='Edit' "
+"type='Button' "
 "/>"
-"<space size='10'/>"
-"<widget name='RTL' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='Record' "
+"type='Button' "
 "/>"
-"<widget name='Quit' "
-"width='150' "
-"height='Globals.Button.Height' "
+"<widget name='Playback' "
+"type='Button' "
 "/>"
 "</layout>"
+"</layout>"
 "</dialog>"
-"<dialog name='GlobalConfig' overlays='screen_center'>"
-"<layout type='vertical' padding='8,8,8,8'>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<layout type='vertical' padding='0,0,0,0' center='true'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
-"<widget name='vcMusicText' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='vcMusicSlider' "
-"type='Slider' "
+"<dialog name='OnScreenDialog' overlays='screen_center'>"
+"<layout type='horizontal' spacing='5' padding='5,3,5,3' center='true'>"
+"<widget name='StopButton' "
+"width='32' "
+"height='32' "
 "/>"
-"<widget name='vcMusicLabel' "
-"type='SmallLabel' "
+"<widget name='EditButton' "
+"width='32' "
+"height='32' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
-"<widget name='vcSfxText' "
-"type='OptionsLabel' "
+"<widget name='SwitchModeButton' "
+"width='32' "
+"height='32' "
 "/>"
-"<widget name='vcSfxSlider' "
-"type='Slider' "
+"<widget name='FastReplayButton' "
+"width='32' "
+"height='32' "
 "/>"
-"<widget name='vcSfxLabel' "
-"type='SmallLabel' "
+"<widget name='TimeLabel' "
+"width='50' "
+"height='30' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'>"
-"<widget name='vcSpeechText' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='vcSpeechSlider' "
-"type='Slider' "
+"</dialog>"
+"<dialog name='EditRecordDialog' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
+"<widget name='Title' "
+"width='320' "
+"height='Globals.Line.Height' "
 "/>"
-"<widget name='vcSpeechLabel' "
-"type='SmallLabel' "
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
+"<widget name='AuthorLabel' "
+"type='EditRecordLabel' "
 "/>"
-"</layout>"
-"</layout>"
-"<layout type='vertical' padding='24,24,24,24' center='true'>"
-"<widget name='vcMuteCheckbox' "
-"type='Checkbox' "
-"width='80'  "
+"<widget name='AuthorEdit' "
+"type='EditRecord' "
 "/>"
 "</layout>"
-"</layout>"
-"<space size='8' />"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
-"<widget name='subToggleDesc' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='subToggleSpeechOnly' "
-"type='Radiobutton' "
-"width='100' "
-"/>"
-"<widget name='subToggleSubOnly' "
-"type='Radiobutton' "
-"width='100' "
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
+"<widget name='NameLabel' "
+"type='EditRecordLabel' "
 "/>"
-"<widget name='subToggleSubBoth' "
-"type='Radiobutton' "
-"width='100' "
+"<widget name='NameEdit' "
+"type='EditRecord' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
-"<widget name='subSubtitleSpeedDesc' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='subSubtitleSpeedSlider' "
-"type='Slider' "
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
+"<widget name='NotesLabel' "
+"type='EditRecordLabel' "
 "/>"
-"<widget name='subSubtitleSpeedLabel' "
-"type='SmallLabel' "
+"<widget name='NotesEdit' "
+"type='EditRecord' "
 "/>"
 "</layout>"
-"<space size='60'/>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10'>"
-"<widget name='Keys' "
-"type='Button' "
-"/>"
-"<space size='Globals.Button.Width' />"
+"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
 "<widget name='Cancel' "
 "type='Button' "
 "/>"
-"<widget name='Ok' "
+"<widget name='OK' "
 "type='Button' "
 "/>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>"
-"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='TabWidget'/>"
-"<layout type='horizontal' padding='16,16,16,16'>"
-"<space/>"
-"<widget name='ResetSettings' "
+"<dialog name='ScummHelp' overlays='screen_center'>"
+"<layout type='vertical' padding='8,8,8,8' center='true'>"
+"<widget name='Title' "
+"width='320' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='HelpText' "
+"height='200' "
+"/>"
+"<layout type='horizontal' padding='0,0,16,0'>"
+"<widget name='Prev' "
 "type='Button' "
 "/>"
-"<widget name='Cancel' "
+"<widget name='Next' "
 "type='Button' "
 "/>"
-"<widget name='Ok' "
+"<space size='32'/>"
+"<widget name='Close' "
 "type='Button' "
 "/>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='FluidSynthSettings_Chorus' overlays='Dialog.FluidSynthSettings.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='VoiceCountText' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='VoiceCountSlider' "
-"type='Slider' "
+"<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='VoiceCountLabel' "
-"width='32' "
+"<widget name='Description2' "
 "height='Globals.Line.Height' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='LevelText' "
-"type='OptionsLabel' "
+"<widget name='Standard' "
+"type='Button' "
 "/>"
-"<widget name='LevelSlider' "
-"type='Slider' "
+"<widget name='Practice' "
+"type='Button' "
 "/>"
-"<widget name='LevelLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='Expert' "
+"type='Button' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='SpeedText' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='SpeedSlider' "
-"type='Slider' "
-"/>"
-"<widget name='SpeedLabel' "
-"width='32' "
+"</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' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='DepthText' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='DepthSlider' "
-"type='Slider' "
-"/>"
-"<widget name='DepthLabel' "
-"width='32' "
+"<widget name='GameProgressText' "
+"width='480' "
 "height='Globals.Line.Height' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='WaveFormTypeText' "
-"type='OptionsLabel' "
+"<widget name='GameList' "
+"width='480' "
+"height='250' "
 "/>"
-"<widget name='WaveFormType' "
-"type='PopUp' "
+"<layout type='horizontal' padding='8,8,8,8'>"
+"<widget name='Ok' "
+"type='Button' "
+"/>"
+"<widget name='Cancel' "
+"type='Button' "
 "/>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='FluidSynthSettings_Reverb' overlays='Dialog.FluidSynthSettings.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<widget name='EnableTabCheckbox' "
-"type='Checkbox' "
-"/>"
+"<dialog name='KeyMapper' overlays='screen_center' shading='dim'>"
+"<layout type='vertical' padding='8,8,32,8' spacing='10' center='true'>"
 "<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='RoomSizeText' "
+"<widget name='PopupDesc' "
 "type='OptionsLabel' "
 "/>"
-"<widget name='RoomSizeSlider' "
-"type='Slider' "
-"/>"
-"<widget name='RoomSizeLabel' "
-"width='32' "
+"<widget name='Popup' "
+"type='PopUp' "
+"width='400' "
 "height='Globals.Line.Height' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='DampingText' "
-"type='OptionsLabel' "
-"/>"
-"<widget name='DampingSlider' "
-"type='Slider' "
+"<widget name='KeymapArea' "
+"width='600' "
+"height='280' "
 "/>"
-"<widget name='DampingLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='Close' "
+"type='Button' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='WidthText' "
-"type='OptionsLabel' "
+"</dialog>"
+"<dialog name='Predictive' overlays='screen_center'>"
+"<layout type='vertical' padding='5,5,5,5' center='true'>"
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"width='210' "
+"textalign='center' "
 "/>"
-"<widget name='WidthSlider' "
-"type='Slider' "
+"<layout type='horizontal' padding='5,5,5,5'>"
+"<widget name='Word' "
+"width='190' "
+"height='Globals.Button.Height' "
 "/>"
-"<widget name='WidthLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='Delete' "
+"width='20' "
+"height='Globals.Button.Height' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'>"
-"<widget name='LevelText' "
-"type='OptionsLabel' "
+"<space size='5' />"
+"<layout type='horizontal' padding='3,3,3,3'>"
+"<widget name='Button1' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<widget name='LevelSlider' "
-"type='Slider' "
+"<widget name='Button2' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<widget name='LevelLabel' "
-"width='32' "
-"height='Globals.Line.Height' "
+"<widget name='Button3' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
 "</layout>"
-"</layout>"
-"</dialog>"
-"<dialog name='FluidSynthSettings_Misc' overlays='Dialog.FluidSynthSettings.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='InterpolationText' "
-"type='OptionsLabel' "
+"<layout type='horizontal' padding='3,3,3,3'>"
+"<widget name='Button4' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<widget name='Interpolation' "
-"type='PopUp' "
+"<widget name='Button5' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
+"/>"
+"<widget name='Button6' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
 "</layout>"
-"</layout>"
-"</dialog>"
-"<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'>"
-"<layout type='vertical' padding='8,8,8,32' center='true'>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='Title' "
-"height='Globals.Line.Height' "
+"<layout type='horizontal' padding='3,3,3,3'>"
+"<widget name='Button7' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<space/>"
-"<widget name='PageDisplay' "
-"width='200' "
-"height='Globals.Line.Height' "
+"<widget name='Button8' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'>"
-"<widget name='List' />"
-"<widget name='Thumbnail' "
-"width='180' "
-"height='200' "
+"<widget name='Button9' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
 "</layout>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='ListSwitch' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<layout type='horizontal' padding='3,3,3,3'>"
+"<widget name='Pre' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<widget name='GridSwitch' "
-"height='Globals.Line.Height' "
-"width='Globals.Line.Height' "
+"<widget name='Button0' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<space/>"
-"<widget name='Delete' "
-"type='Button' "
+"<widget name='Next' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<space size='32'/>"
+"</layout>"
+"<space size='5' />"
+"<layout type='horizontal' padding='3,3,3,3'>"
+"<widget name='Add' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
+"/>"
+"<space size='22'/>"
 "<widget name='Cancel' "
-"type='Button' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
-"<widget name='Choose' "
-"type='Button' "
+"<widget name='OK' "
+"width='Globals.Predictive.Button.Width' "
+"height='Globals.Button.Height' "
 "/>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='SavenameDialog' overlays='screen_center'>"
-"<layout type='vertical' padding='8,8,8,8'>"
-"<widget name='DescriptionText' "
-"width='320' "
-"height='Globals.Line.Height' "
+"</layout_info>"
+"<render_info>"
+"<palette>"
+"<color name='black' "
+"rgb='0,0,0' "
 "/>"
-"<widget name='Description' "
-"height='19' "
+"<color name='lightgrey' "
+"rgb='104,104,104' "
 "/>"
-"<layout type='horizontal' padding='0,0,16,0'>"
-"<widget name='Cancel' "
-"type='Button' "
+"<color name='darkgrey' "
+"rgb='64,64,64' "
 "/>"
-"<space size='96'/>"
-"<widget name='Ok' "
-"type='Button' "
+"<color name='green' "
+"rgb='32,160,32' "
 "/>"
-"</layout>"
-"</layout>"
-"</dialog>"
-"<dialog name='RecorderDialog' overlays='screen' inset='8' shading='dim'>"
-"<layout type='vertical' padding='8,8,8,32' center='true'>"
-"<widget name='Title' "
-"height='Globals.Line.Height' "
+"<color name='green2' "
+"rgb='0,255,0' "
 "/>"
-"<layout type='horizontal' padding='0,0,0,16' spacing='16'>"
-"<widget name='List' />"
-"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Thumbnail' "
-"width='180' "
-"height='170' "
+"</palette>"
+"<fonts>"
+"<font id='text_default' "
+"file='helvb12.bdf' "
 "/>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='NextScreenShotButton' "
-"width='25' "
-"height='25' "
+"<font resolution='y<400' "
+"id='text_default' "
+"file='clR6x12.bdf' "
 "/>"
-"<widget name='currentScreenshot' "
-"width='125' "
-"height='25' "
-"textalign='center' "
+"<font id='text_button' "
+"file='helvb12.bdf' "
 "/>"
-"<widget name='PreviousScreenShotButton' "
-"width='25' "
-"height='25' "
+"<font resolution='y<400' "
+"id='text_button' "
+"file='clR6x12.bdf' "
 "/>"
-"</layout>"
-"<widget name='Author' height='Globals.Line.Height' />"
-"<widget name='Notes' height='Globals.Line.Height' />"
-"</layout>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0'>"
-"<widget name='Delete' "
-"type='Button' "
+"<font id='text_normal' "
+"file='helvb12.bdf' "
 "/>"
-"<space size='16'/>"
-"<widget name='Cancel' "
-"type='Button' "
+"<font resolution='y<400' "
+"id='text_normal' "
+"file='clR6x12.bdf' "
 "/>"
-"<space size='16'/>"
-"<widget name='Edit' "
-"type='Button' "
+"<font id='tooltip_normal' "
+"file='fixed5x8.bdf' "
 "/>"
-"<widget name='Record' "
-"type='Button' "
+"<text_color id='color_normal' "
+"color='green' "
 "/>"
-"<widget name='Playback' "
-"type='Button' "
+"<text_color id='color_normal_inverted' "
+"color='black' "
 "/>"
-"</layout>"
-"</layout>"
-"</dialog>"
-"<dialog name='OnScreenDialog' overlays='screen_center'>"
-"<layout type='horizontal' spacing='5' padding='5,3,5,3' center='true'>"
-"<widget name='StopButton' "
-"width='32' "
-"height='32' "
+"<text_color id='color_normal_hover' "
+"color='green2' "
 "/>"
-"<widget name='EditButton' "
-"width='32' "
-"height='32' "
+"<text_color id='color_normal_disabled' "
+"color='lightgrey' "
 "/>"
-"<widget name='SwitchModeButton' "
-"width='32' "
-"height='32' "
+"<text_color id='color_alternative' "
+"color='lightgrey' "
 "/>"
-"<widget name='FastReplayButton' "
-"width='32' "
-"height='32' "
+"<text_color id='color_alternative_inverted' "
+"color='255,255,255' "
 "/>"
-"<widget name='TimeLabel' "
-"width='50' "
-"height='30' "
+"<text_color id='color_alternative_hover' "
+"color='176,176,176' "
 "/>"
-"</layout>"
-"</dialog>"
-"<dialog name='EditRecordDialog' overlays='screen_center'>"
-"<layout type='vertical' padding='8,8,8,8' center='true'>"
-"<widget name='Title' "
-"width='320' "
-"height='Globals.Line.Height' "
+"<text_color id='color_alternative_disabled' "
+"color='darkgrey' "
 "/>"
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
-"<widget name='AuthorLabel' "
-"type='EditRecordLabel' "
+"<text_color id='color_button' "
+"color='green' "
 "/>"
-"<widget name='AuthorEdit' "
-"type='EditRecord' "
+"<text_color id='color_button_hover' "
+"color='green2' "
 "/>"
-"</layout>"
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
-"<widget name='NameLabel' "
-"type='EditRecordLabel' "
+"<text_color id='color_button_disabled' "
+"color='lightgrey' "
 "/>"
-"<widget name='NameEdit' "
-"type='EditRecord' "
+"</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' "
 "/>"
-"</layout>"
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
-"<widget name='NotesLabel' "
-"type='EditRecordLabel' "
+"</drawdata>"
+"<drawdata id='text_selection_focus' cache='false'>"
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/>"
-"<widget name='NotesEdit' "
-"type='EditRecord' "
+"</drawdata>"
+"<drawdata id='mainmenu_bg' cache='false'>"
+"<drawstep func='fill' "
+"fill='foreground' "
+"fg_color='black' "
 "/>"
-"</layout>"
-"<layout type='horizontal' spacing='5' padding='0,0,0,10'>"
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='special_bg' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/>"
-"<widget name='OK' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='tooltip_bg' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='foreground' "
+"fg_color='black' "
 "/>"
-"</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='separator' cache='false'>"
+"<drawstep func='square' "
+"fill='foreground' "
+"height='2' "
+"ypos='center' "
+"fg_color='lightgrey' "
 "/>"
-"<widget name='HelpText' "
-"height='200' "
+"</drawdata>"
+"<drawdata id='scrollbar_base' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/>"
-"<layout type='horizontal' padding='0,0,16,0'>"
-"<widget name='Prev' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='scrollbar_handle_hover' cache='false'>"
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green2' "
 "/>"
-"<widget name='Next' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='scrollbar_handle_idle' cache='false'>"
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/>"
-"<space size='32'/>"
-"<widget name='Close' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y>399'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"</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' "
+"<drawstep func='triangle' "
+"fg_color='green' "
+"fill='foreground' "
+"width='10' "
+"height='10' "
+"xpos='right' "
+"ypos='center' "
+"padding='0,0,3,0' "
+"orientation='top' "
 "/>"
-"<widget name='Description2' "
-"height='Globals.Line.Height' "
+"</drawdata>"
+"<drawdata id='scrollbar_button_idle' cache='false' resolution='y<400'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='Standard' "
-"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' "
 "/>"
-"<widget name='Practice' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='scrollbar_button_hover' cache='false' resolution='y>399'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='Expert' "
-"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>"
-"</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='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' "
+"/>"
+"<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='widget_textedit' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='GameProgressText' "
-"width='480' "
-"height='Globals.Line.Height' "
+"</drawdata>"
+"<drawdata id='plain_bg' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/>"
-"<widget name='GameList' "
-"width='480' "
-"height='250' "
+"</drawdata>"
+"<drawdata id='caret' cache='false'>"
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='lightgrey' "
 "/>"
-"<layout type='horizontal' padding='8,8,8,8'>"
-"<widget name='Ok' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='default_bg' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/>"
-"<widget name='Cancel' "
-"type='Button' "
+"</drawdata>"
+"<drawdata id='button_pressed' cache='false'>"
+"<text font='text_button' "
+"text_color='color_alternative_inverted' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/>"
-"</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' "
+"<drawstep func='square' "
+"fill='foreground' "
+"fg_color='green' "
 "/>"
-"<widget name='Popup' "
-"type='PopUp' "
-"width='400' "
-"height='Globals.Line.Height' "
+"</drawdata>"
+"<drawdata id='button_idle' cache='false'>"
+"<text font='text_button' "
+"text_color='color_button' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/>"
-"</layout>"
-"<widget name='KeymapArea' "
-"width='600' "
-"height='280' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='Close' "
-"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>"
-"</dialog>"
-"<dialog name='Predictive' overlays='screen_center'>"
-"<layout type='vertical' padding='5,5,5,5' center='true'>"
-"<widget name='Headline' "
-"height='Globals.Line.Height' "
-"width='210' "
-"textalign='center' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<layout type='horizontal' padding='5,5,5,5'>"
-"<widget name='Word' "
-"width='190' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='button_disabled' cache='false'>"
+"<text font='text_button' "
+"text_color='color_button_disabled' "
+"vertical_align='center' "
+"horizontal_align='center' "
 "/>"
-"<widget name='Delete' "
-"width='20' "
-"height='Globals.Button.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"</layout>"
-"<space size='5' />"
-"<layout type='horizontal' padding='3,3,3,3'>"
-"<widget name='Button1' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.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='Button2' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='Button3' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='checkbox_selected' cache='false'>"
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='3,3,3,3'>"
-"<widget name='Button4' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='Button5' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='cross' "
+"fill='foreground' "
+"stroke='2' "
+"fg_color='green' "
 "/>"
-"<widget name='Button6' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='checkbox_default' cache='false'>"
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='top' "
+"horizontal_align='left' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='3,3,3,3'>"
-"<widget name='Button7' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='bevelsq' "
+"bevel='2' "
+"fill='none' "
 "/>"
-"<widget name='Button8' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='radiobutton_default' cache='false'>"
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/>"
-"<widget name='Button9' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fill='background' "
+"bg_color='darkgrey' "
+"xpos='0' "
+"ypos='0' "
 "/>"
-"</layout>"
-"<layout type='horizontal' padding='3,3,3,3'>"
-"<widget name='Pre' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='radiobutton_selected' cache='false'>"
+"<text font='text_default' "
+"text_color='color_normal' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/>"
-"<widget name='Button0' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"fg_color='darkgrey' "
+"fill='none' "
+"xpos='0' "
+"ypos='0' "
 "/>"
-"<widget name='Next' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='5' "
+"fg_color='green' "
+"fill='foreground' "
+"xpos='2' "
+"ypos='2' "
 "/>"
-"</layout>"
-"<space size='5' />"
-"<layout type='horizontal' padding='3,3,3,3'>"
-"<widget name='Add' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='radiobutton_disabled' cache='false'>"
+"<text font='text_default' "
+"text_color='color_normal_disabled' "
+"vertical_align='center' "
+"horizontal_align='left' "
 "/>"
-"<space size='22'/>"
-"<widget name='Cancel' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"<drawstep func='circle' "
+"width='7' "
+"height='7' "
+"radius='7' "
+"bg_color='lightgrey' "
+"fill='background' "
+"xpos='0' "
+"ypos='0' "
 "/>"
-"<widget name='OK' "
-"width='Globals.Predictive.Button.Width' "
-"height='Globals.Button.Height' "
+"</drawdata>"
+"<drawdata id='widget_default' cache='false'>"
+"<drawstep func='bevelsq' "
+"bevel='2' "
 "/>"
-"</layout>"
-"</layout>"
-"</dialog>"
-"</layout_info>"
+"</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' />"
@@ -2506,16 +2506,16 @@
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalMenu' overlays='screen_center'>"
-"<layout type='vertical' padding='2,2,4,6' center='true' spacing='6'>"
+"<layout type='vertical' padding='2,2,2,6' center='true' spacing='0'>"
 "<widget name='Title' "
 "width='160' "
-"height='4' "
+"height='12' "
 "/>"
 "<widget name='Version' "
 "width='160' "
-"height='4' "
+"height='14' "
 "/>"
-"<space size='1'/>"
+"<layout type='vertical' padding='0,0,3,0' center='true' spacing='6'>"
 "<widget name='Load' "
 "width='120' "
 "height='12' "
@@ -2551,6 +2551,7 @@
 "height='12' "
 "/>"
 "</layout>"
+"</layout>"
 "</dialog>"
 "<dialog name='GlobalConfig' overlays='screen_center'>"
 "<layout type='vertical' padding='8,8,8,8'>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 1085aa6..7115849 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 802998d..506657e 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -687,50 +687,51 @@
 	</dialog>
 	
 	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '2, 2, 4, 6' center = 'true' spacing='6'>
+		<layout type = 'vertical' padding = '2, 2, 2, 6' center = 'true' spacing='0'>
 			<widget name = 'Title'
 					width = '160'
-					height = '4'
+					height = '12'
 			/>
 			<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'
+					height = '14'
 			/>
+			<layout type = 'vertical' padding = '0, 0, 3, 0' center = 'true' spacing='6'>
+				<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>
 		</layout>
 	</dialog>