From c3b1e3416371b8a54721c53a17920f1bc9458772 Mon Sep 17 00:00:00 2001
From: Vicent Marti
Date: Thu, 9 Oct 2008 18:09:59 +0000
Subject: Renamed "scummodern" theme to "scummmodern", for naming consistence.

svn-id: r34762
---
 gui/newgui.cpp                                   |   2 +-
 gui/themes/scummmodern.zip                       | Bin 0 -> 144239 bytes
 gui/themes/scummmodern/THEMERC                   |   1 +
 gui/themes/scummmodern/checkbox.bmp              | Bin 0 -> 774 bytes
 gui/themes/scummmodern/cursor.bmp                | Bin 0 -> 3126 bytes
 gui/themes/scummmodern/cursor_small.bmp          | Bin 0 -> 1062 bytes
 gui/themes/scummmodern/helvr12-l1.fcc            | Bin 0 -> 5615 bytes
 gui/themes/scummmodern/logo.bmp                  | Bin 0 -> 68214 bytes
 gui/themes/scummmodern/logo_small.bmp            | Bin 0 -> 17174 bytes
 gui/themes/scummmodern/scummodern_gfx.stx        | 489 +++++++++++++++++
 gui/themes/scummmodern/scummodern_layout.stx     | 647 +++++++++++++++++++++++
 gui/themes/scummmodern/scummodern_layout_320.stx | 625 ++++++++++++++++++++++
 gui/themes/scummodern.zip                        | Bin 144239 -> 0 bytes
 gui/themes/scummodern/THEMERC                    |   1 -
 gui/themes/scummodern/checkbox.bmp               | Bin 774 -> 0 bytes
 gui/themes/scummodern/cursor.bmp                 | Bin 3126 -> 0 bytes
 gui/themes/scummodern/cursor_small.bmp           | Bin 1062 -> 0 bytes
 gui/themes/scummodern/helvr12-l1.fcc             | Bin 5615 -> 0 bytes
 gui/themes/scummodern/logo.bmp                   | Bin 68214 -> 0 bytes
 gui/themes/scummodern/logo_small.bmp             | Bin 17174 -> 0 bytes
 gui/themes/scummodern/scummodern_gfx.stx         | 489 -----------------
 gui/themes/scummodern/scummodern_layout.stx      | 647 -----------------------
 gui/themes/scummodern/scummodern_layout_320.stx  | 625 ----------------------
 23 files changed, 1763 insertions(+), 1763 deletions(-)
 create mode 100644 gui/themes/scummmodern.zip
 create mode 100644 gui/themes/scummmodern/THEMERC
 create mode 100644 gui/themes/scummmodern/checkbox.bmp
 create mode 100644 gui/themes/scummmodern/cursor.bmp
 create mode 100644 gui/themes/scummmodern/cursor_small.bmp
 create mode 100644 gui/themes/scummmodern/helvr12-l1.fcc
 create mode 100644 gui/themes/scummmodern/logo.bmp
 create mode 100644 gui/themes/scummmodern/logo_small.bmp
 create mode 100644 gui/themes/scummmodern/scummodern_gfx.stx
 create mode 100644 gui/themes/scummmodern/scummodern_layout.stx
 create mode 100644 gui/themes/scummmodern/scummodern_layout_320.stx
 delete mode 100644 gui/themes/scummodern.zip
 delete mode 100644 gui/themes/scummodern/THEMERC
 delete mode 100644 gui/themes/scummodern/checkbox.bmp
 delete mode 100644 gui/themes/scummodern/cursor.bmp
 delete mode 100644 gui/themes/scummodern/cursor_small.bmp
 delete mode 100644 gui/themes/scummodern/helvr12-l1.fcc
 delete mode 100644 gui/themes/scummodern/logo.bmp
 delete mode 100644 gui/themes/scummodern/logo_small.bmp
 delete mode 100644 gui/themes/scummodern/scummodern_gfx.stx
 delete mode 100644 gui/themes/scummodern/scummodern_layout.stx
 delete mode 100644 gui/themes/scummodern/scummodern_layout_320.stx

(limited to 'gui')

diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 1520aacaea..6d3957560f 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -88,7 +88,7 @@ NewGui::NewGui() : _redrawStatus(kRedrawDisabled),
 	memset(_cursor, 0xFF, sizeof(_cursor));
 
 
-	ConfMan.registerDefault("gui_theme", "scummodern.zip");
+	ConfMan.registerDefault("gui_theme", "scummmodern.zip");
 	Common::String themefile(ConfMan.get("gui_theme"));
 	if (themefile.compareToIgnoreCase("default") == 0)
 		themefile = "builtin";
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
new file mode 100644
index 0000000000..70141bfce9
Binary files /dev/null and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
new file mode 100644
index 0000000000..d11c959867
--- /dev/null
+++ b/gui/themes/scummmodern/THEMERC
@@ -0,0 +1 @@
+[SCUMMVM_THEME_V23:ScummVM Modern Theme:No Author]
\ No newline at end of file
diff --git a/gui/themes/scummmodern/checkbox.bmp b/gui/themes/scummmodern/checkbox.bmp
new file mode 100644
index 0000000000..a0b91b569f
Binary files /dev/null and b/gui/themes/scummmodern/checkbox.bmp differ
diff --git a/gui/themes/scummmodern/cursor.bmp b/gui/themes/scummmodern/cursor.bmp
new file mode 100644
index 0000000000..e7bdb60cad
Binary files /dev/null and b/gui/themes/scummmodern/cursor.bmp differ
diff --git a/gui/themes/scummmodern/cursor_small.bmp b/gui/themes/scummmodern/cursor_small.bmp
new file mode 100644
index 0000000000..5f25f32f1a
Binary files /dev/null and b/gui/themes/scummmodern/cursor_small.bmp differ
diff --git a/gui/themes/scummmodern/helvr12-l1.fcc b/gui/themes/scummmodern/helvr12-l1.fcc
new file mode 100644
index 0000000000..651a25934a
Binary files /dev/null and b/gui/themes/scummmodern/helvr12-l1.fcc differ
diff --git a/gui/themes/scummmodern/logo.bmp b/gui/themes/scummmodern/logo.bmp
new file mode 100644
index 0000000000..659ec47d03
Binary files /dev/null and b/gui/themes/scummmodern/logo.bmp differ
diff --git a/gui/themes/scummmodern/logo_small.bmp b/gui/themes/scummmodern/logo_small.bmp
new file mode 100644
index 0000000000..eaa998a165
Binary files /dev/null and b/gui/themes/scummmodern/logo_small.bmp differ
diff --git a/gui/themes/scummmodern/scummodern_gfx.stx b/gui/themes/scummmodern/scummodern_gfx.stx
new file mode 100644
index 0000000000..b8eff77aa1
--- /dev/null
+++ b/gui/themes/scummmodern/scummodern_gfx.stx
@@ -0,0 +1,489 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+<render_info>
+	<palette>
+		<color name = 'darkred'
+				rgb = '169, 42, 12'
+		/>
+		<color name = 'brightred'
+				rgb = '203, 126, 107'
+		/>
+		<color name = 'xtrabrightred'
+				rgb = '251, 241, 206'
+		/>
+		<color name = 'blandyellow'
+				rgb = '246, 224, 139'
+		/>
+		<color name = 'bgreen'
+				rgb = '100, 162, 8'
+		/>
+		<color name = 'black'
+				rgb = '0, 0, 0'
+		/>
+		<color name = 'white'
+				rgb = '255, 255, 255'
+		/>
+		<color name = 'shadowcolor'
+				rgb = '63, 60, 17'
+		/>
+	</palette>
+
+	<bitmaps>
+		<bitmap filename = 'logo.bmp'/>
+		<bitmap filename = 'cursor.bmp'/>
+		<bitmap filename = 'cursor_small.bmp'/>
+		<bitmap filename = 'checkbox.bmp'/>
+		<bitmap filename = 'logo_small.bmp'/>
+	</bitmaps>
+
+	<fonts>
+		<font	id = 'text_default'
+				file = 'default'
+				color = 'black'
+		/>
+		<font	id = 'text_hover'
+				file = 'default'
+				color = 'bgreen'
+		/>
+		<font	id = 'text_disabled'
+				file = 'default'
+				color = '128, 128, 128'
+		/>
+		<font	id = 'text_inverted'
+				file = 'default'
+				color = '0, 0, 0'
+		/>
+		<font	id = 'text_button'
+				file = 'default'
+				color = 'white'
+		/>
+		<font	id = 'text_button_hover'
+				file = 'default'
+				color = 'blandyellow'
+		/>
+		<font	id = 'text_normal'
+				file = 'helvr12-l1.bdf'
+				color = 'black'
+		/>
+	</fonts>
+
+	<defaults fill = 'gradient' fg_color = 'white' bevel_color = '237, 169, 72'/>
+
+	<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
+	<cursor resolution = '320xY, 256x240' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
+
+	<drawdata id = 'text_selection' cache = false>
+		<drawstep	func = 'square'
+					fill = 'foreground'
+					fg_color = 'bgreen'
+		/>
+	</drawdata>
+
+	<drawdata id = 'mainmenu_bg' cache = false>
+		<drawstep	func = 'fill'
+					fill = 'gradient'
+					gradient_start = '208, 112, 8'
+					gradient_end = '232, 192, 16'
+		/>
+	</drawdata>
+
+	<drawdata id = 'special_bg' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = '4'
+					fill = 'gradient'
+					stroke = '0'
+					gradient_start = '208, 112, 8'
+					gradient_end = '232, 192, 16'
+					shadow = '3'
+					gradient_factor = '3'
+		/>
+	</drawdata>
+
+	<drawdata id = 'separator' cache = false>
+		<drawstep	func = 'square'
+					fill = 'foreground'
+					height = '1'
+					ypos = 'center'
+					fg_color = 'black'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_base' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 6
+					fill = 'background'
+					fg_color = '176, 164, 160'
+					bg_color = '240, 228, 160'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_handle_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 6
+					fill = 'gradient'
+					fg_color = 'blandyellow'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_handle_idle' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 6
+					fill = 'gradient'
+					fg_color = 'blandyellow'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_button_idle' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = '4'
+					fill = 'none'
+					fg_color = '176, 164, 160'
+					stroke = 1
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '0, 0, 0'
+					fill = 'foreground'
+					width = 'auto'
+					height = 'auto'
+					xpos = 'center'
+					ypos = 'center'
+					orientation = 'top'
+		/>
+	</drawdata>
+
+	<drawdata id = 'scrollbar_button_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = '4'
+					fill = 'background'
+					fg_color = '120, 120, 120'
+					bg_color = '206, 121, 99'
+					stroke = 1
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '0, 0, 0'
+					fill = 'foreground'
+					width = 'auto'
+					height = 'auto'
+					xpos = 'center'
+					ypos = 'center'
+					orientation = 'top'
+		/>
+	</drawdata>
+
+	<drawdata id = 'tab_active' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'tab'
+					radius = '4'
+					stroke = '0'
+					fill = 'gradient'
+					gradient_end = 'xtrabrightred'
+					gradient_start = 'blandyellow'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'tab_inactive' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'tab'
+					radius = '4'
+					stroke = '0'
+					fill = 'foreground'
+					fg_color = '240, 205, 118'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'tab_background' cache = false>
+		<drawstep	func = 'tab'
+					radius = '6'
+					stroke = '0'
+					fill = 'foreground'
+					fg_color = '232, 180, 81'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'widget_slider' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 0
+					radius = 4
+					fill = 'foreground'
+					fg_color = 'blandyellow'
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'slider_full' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 4
+					fill = 'gradient'
+					fg_color = '123, 112, 56'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'slider_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 4
+					fill = 'gradient'
+					fg_color = '123, 112, 56'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+	
+	<drawdata id = 'slider_disabled' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 1
+					radius = 4
+					fill = 'gradient'
+					fg_color = '123, 112, 56'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+		/>
+	</drawdata>
+
+	<drawdata id = 'popup_idle' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 0
+					radius = 4
+					fill = 'foreground'
+					fg_color = '250, 237, 190'
+					shadow = 2
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '63, 60, 52'
+					fill = 'foreground'
+					width = 'height'
+					height = 'auto'
+					xpos = 'right'
+					ypos = 'center'
+					orientation = 'bottom'
+		/>
+		<text	font = 'text_default'
+				vertical_align = 'center'
+				horizontal_align = 'left'
+		/>
+	</drawdata>
+
+
+	<drawdata id = 'popup_hover' cache = false>
+		<drawstep	func = 'roundedsq'
+					stroke = 0
+					radius = 4
+					fill = 'gradient'
+					gradient_start = 'blandyellow'
+					gradient_end = '250, 237, 190'
+					shadow = 0
+		/>
+		<drawstep	func = 'triangle'
+					fg_color = '63, 60, 52'
+					fill = 'foreground'
+					width = 'height'
+					height = 'auto'
+					xpos = 'right'
+					ypos = 'center'
+					orientation = 'bottom'
+		/>
+		<text	font = 'text_hover'
+				vertical_align = 'center'
+				horizontal_align = 'left'
+		/>
+	</drawdata>
+
+	<drawdata id = 'widget_textedit' cache = false>
+		<drawstep	func = 'roundedsq'
+					fill = 'foreground'
+					radius = 4
+					fg_color = 'blandyellow'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+	
+	<drawdata id = 'plain_bg' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = 6
+					stroke = 0
+					gradient_start = 'blandyellow'
+					gradient_end = 'xtrabrightred'
+					fill = 'gradient'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'caret' cache = false>
+		<drawstep	func = 'square'
+					fill = 'foreground'
+					fg_color = 'black'
+		/>
+	</drawdata>
+
+	<drawdata id = 'default_bg' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = 12
+					stroke = 0
+					fg_color = 'xtrabrightred'
+					fill = 'foreground'
+					shadow = 3
+		/>
+	</drawdata>
+
+	<drawdata id = 'button_idle' cache = false>
+		<text	font = 'text_button'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'roundedsq'
+					radius = '3'
+					stroke = 1
+					fill = 'gradient'
+					shadow = 0
+					fg_color = 'shadowcolor'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+					bevel = 1
+		/>
+	</drawdata>
+
+	<drawdata id = 'button_hover' cache = false>
+		<text	font = 'text_button_hover'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'roundedsq'
+					radius = '3'
+					gradient_factor = 1
+					stroke = 1 
+					fill = 'gradient'
+					shadow = 0
+					fg_color = 'shadowcolor'
+					gradient_start = 'xtrabrightred'
+					gradient_end = 'darkred'
+					bevel_color = 'xtrabrightred'
+					bevel = 1
+		/>
+	</drawdata>
+
+	<drawdata id = 'button_disabled' cache = false>
+		<text	font = 'text_disabled'
+				vertical_align = 'center'
+				horizontal_align = 'center'
+		/>
+		<drawstep	func = 'roundedsq'
+					radius = '3'
+					stroke = 1
+					fill = 'gradient'
+					shadow = 0
+					fg_color = 'shadowcolor'
+					gradient_start = 'brightred'
+					gradient_end = 'darkred'
+					bevel = 1
+		/>
+	</drawdata>
+
+	<drawdata id = 'checkbox_disabled' cache = false>
+		<text	font = 'text_disabled'
+				vertical_align = 'top'
+				horizontal_align = 'left'
+		/>
+		<drawstep	func = 'roundedsq'
+					fill = 'none'
+					radius = 4
+					fg_color = 'black'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'checkbox_selected' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'top'
+				horizontal_align = 'left'
+		/>
+		<drawstep	func = 'bitmap'
+					file = 'checkbox.bmp'
+		/>
+	</drawdata>
+
+	<drawdata id = 'checkbox_default' cache = false>
+		<text	font = 'text_default'
+				vertical_align = 'top'
+				horizontal_align = 'left'
+		/>
+		<drawstep	func = 'roundedsq'
+					fill = 'foreground'
+					radius = 4
+					fg_color = 'blandyellow'
+					shadow = 0
+					bevel = 1
+					bevel_color = 'shadowcolor'
+		/>
+	</drawdata>
+
+	<drawdata id = 'widget_default' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = 8
+					stroke = 0
+					gradient_start = 'blandyellow'
+					gradient_end = '251, 241, 206'
+					gradient_factor = '6'
+					fill = 'gradient'
+					shadow = 3
+		/>
+	</drawdata>
+	
+	<drawdata id = 'widget_small' cache = false>
+		<drawstep	func = 'roundedsq'
+					radius = 8
+					stroke = 0
+					gradient_start = 'blandyellow'
+					gradient_end = 'xtrabrightred'
+					gradient_factor = '6'
+					fill = 'gradient'
+					shadow = 3
+		/>
+	</drawdata>
+</render_info>
\ No newline at end of file
diff --git a/gui/themes/scummmodern/scummodern_layout.stx b/gui/themes/scummmodern/scummodern_layout.stx
new file mode 100644
index 0000000000..03d920ac05
--- /dev/null
+++ b/gui/themes/scummmodern/scummodern_layout.stx
@@ -0,0 +1,647 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+<layout_info resolution = '-320xY, -256x240'>
+	<globals>
+		<def var = 'Line.Height' value = '16' />
+		<def var = 'Font.Height' value = '16' />
+		<def var = 'TabLabelWidth' value = '110' />
+		
+		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
+		
+		<def var = 'Padding.Bottom' value = '16' />
+		<def var = 'Padding.Left' value = '16' />
+		<def var = 'Padding.Right' value = '16' />
+		<def var = 'Padding.Top' value = '16' />
+		
+		<def var = 'About.OuterBorder' value = '80'/>
+		
+		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
+		<def var = 'ListWidget.hlRightPadding' value = '0'/>
+		<def var = 'PopUpWidget.labelSpacing' value = '10' />
+		
+		<def var = 'ShowLauncherLogo' value = '1'/>
+		<def var = 'ShowGlobalMenuLogo' value = '1'/>
+		
+		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/>
+
+		<widget name = 'OptionsLabel'
+				size = '110, Globals.Line.Height'
+		/>
+		<widget name = 'SmallLabel'
+				size = '24, Globals.Line.Height'
+		/>
+		
+		<widget name = 'Button'
+				size = 'kBigButtonWidth, kBigButtonHeight'
+		/>
+		
+		
+		<widget name = 'Slider'
+				size = 'kBigSliderWidth, kBigSliderHeight'
+		/>
+		<widget name = 'PopUp'
+				size = '-1, 19'
+		/>
+		<widget name = 'Checkbox'
+				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 = 'TabWidget.Tab'
+				size = '75, 27'
+				padding = '0, 0, 8, 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 = '23, 23, 8, 23'>
+			<widget name = 'Version'
+					width = '247'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Logo'
+					width = '283'
+					height = '80'
+			/>		
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'GameList'/>
+				<layout type = 'vertical' padding = '10, 0, 0, 0'>
+					<widget name = 'StartButton' 
+							type = 'Button'
+					/>
+					<widget name = 'LoadGameButton' 
+							type = 'Button'
+					/>
+					<space size = '10' />
+					<widget name = 'AddGameButton' 
+							type = 'Button' 
+					/>
+					<widget name = 'EditGameButton' 
+							type = 'Button' 
+					/>
+					<widget name = 'RemoveGameButton' 
+							type = 'Button' 
+					/>
+					<space size = '10' />
+					<widget name = 'OptionsButton' 
+							type = 'Button' 
+					/>
+					<widget name = 'AboutButton' 
+							type = 'Button' 
+					/>
+					<space size = '10' />
+					<widget name = 'QuitButton' 
+							type = 'Button' 
+					/>
+				</layout>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>			
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Path'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'List'/>
+			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
+				<widget name = 'Up'
+						type = 'Button'
+				/>
+				<space/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Choose'
+						type = 'Button'
+				/>	
+			</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'
+				/>
+				<widget name = 'Ok' 
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<widget name = 'grModePopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'grRenderPopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'grAspectCheckbox'
+					type = 'Checkbox'
+			/>
+			<widget name = 'grFullscreenCheckbox'
+					type = 'Checkbox'
+			/>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<widget name = 'auMidiPopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'auSampleRatePopup'
+					type = 'PopUp'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'subToggleDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subToggleButton'
+						width = '150'
+						height = 'Globals.Slider.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'subSubtitleSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subSubtitleSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'subSubtitleSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'vcMusicText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcMusicSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcMusicLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'vcSfxText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'vcSpeechText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSpeechSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSpeechLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'mcFontButton'
+						type = 'Button'
+				/>	
+				<widget name = 'mcFontPath'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'mcFontClearButton'
+						height = 'Globals.Line.Height'
+						width = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'mcMixedCheckbox'
+					type = 'Checkbox'
+			/>
+			<widget name = 'mcMt32Checkbox'
+					type = 'Checkbox'
+			/>
+			<widget name = 'mcGSCheckbox'
+					type = 'Checkbox'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'mcMidiGainText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'mcMidiGainSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'mcMidiGainLabel'
+						width = '32'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'SaveButton'
+						type = 'Button'
+				/>
+				<widget name = 'SavePath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ThemeButton'
+						type = 'Button'
+				/>
+				<widget name = 'ThemePath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ExtraButton'
+						type = 'Button'
+				/>
+				<widget name = 'ExtraPath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'PluginsButton'
+						type = 'Button'
+				/>
+				<widget name = 'PluginsPath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ThemeButton'
+						type = 'Button'
+				/>
+				<widget name = 'CurTheme'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'Renderer'
+					type = 'PopUp'
+			/>
+			<widget name = 'AutosavePeriod'
+					type = 'PopUp'
+			/>
+		</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_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 = '16'>
+				<widget name = 'Id'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Domain'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'Name'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Desc'
+						type = 'PopUp'
+				/>
+			</layout>
+			<widget name = 'Lang'
+					type = 'PopUp'
+			/>
+			<widget name = 'Platform'
+					type = 'PopUp'
+			/>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+				<widget name = 'Savepath'
+						type = 'Button'
+				/>
+				<widget name = 'SavepathText'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+				<widget name = 'Extrapath'
+						type = 'Button'
+				/>
+				<widget name = 'ExtrapathText'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+				<widget name = 'Gamepath'
+						type = 'Button'
+				/>
+				<widget name = 'GamepathText'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'>
+			<widget name = 'Logo'
+					width = '210'
+					height = '40'
+			/>
+			<widget name = 'Version'
+					width = '210'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Resume'
+					width = '150'
+					height = 'Globals.Button.Height'
+			/>
+			<space size = '10'/>
+			<widget name = 'Options'
+					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 = 'ScummMain' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
+			<widget name = 'Resume'
+					type = 'Button'
+			/>
+			<space size = '15'/>
+			<widget name = 'Load'
+					type = 'Button'
+			/>
+			<widget name = 'Save'
+					type = 'Button'
+			/>
+			<space size = '15'/>
+			<widget name = 'Options'
+					type = 'Button'
+			/>
+			<widget name = 'Help'
+					type = 'Button'
+			/>
+			<widget name = 'About'
+					type = 'Button'
+			/>
+			<space size = '15'/>
+			<widget name = 'Quit'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'ScummConfig' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'vcMusicText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcMusicSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcMusicLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'vcSfxText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'vcSpeechText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSpeechSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSpeechLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'subToggleDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subToggleButton'
+						width = '158'
+						height = 'Globals.Slider.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'subSubtitleSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subSubtitleSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'subSubtitleSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<space size = '60'/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<space size = 'Globals.Button.Width' />
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Ok'
+						type = 'Button'
+				/>
+			</layout>		
+		</layout>
+	</dialog>
+	
+	<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'>
+		<layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'>
+			<widget name = 'Title'
+					height = 'Globals.Line.Height'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'>	
+				<widget name = 'List' />
+				<widget name = 'Thumbnail'
+						width = '180'
+						height = '200'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<space/>
+				<widget name = 'Delete'
+						type = 'Button'
+				/>
+				<space size = '32'/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Choose'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'ScummHelp' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Title'
+					width = '320'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'HelpText'
+					height = '220'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
+				<widget name = 'Prev'
+						type = 'Button'
+				/>
+				<widget name = 'Next'
+						type = 'Button'
+				/>
+				<space size = '32'/>
+				<widget name = 'Close'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+</layout_info>
\ No newline at end of file
diff --git a/gui/themes/scummmodern/scummodern_layout_320.stx b/gui/themes/scummmodern/scummodern_layout_320.stx
new file mode 100644
index 0000000000..b92ded6097
--- /dev/null
+++ b/gui/themes/scummmodern/scummodern_layout_320.stx
@@ -0,0 +1,625 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+<layout_info resolution = "320xY, 256x240">
+	<globals>
+		<def var = 'Line.Height' value = '12' />
+		<def var = 'Font.Height' value = '10' />
+		<def var = 'TabLabelWidth' value = '100' />
+
+		<def var = 'WidgetSize' value = 'kNormalWidgetSize' />
+		<def var = 'About.OuterBorder' value = '10'/>
+		<def var = 'PopUpWidget.labelSpacing' value = '6' />
+
+		<def var = 'ShowLauncherLogo' value = '0'/>
+		<def var = 'ShowGlobalMenuLogo' value = '0'/>
+		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/>
+
+		<widget name = 'Button'
+				size = 'kButtonWidth, kButtonHeight'
+		/>
+
+		<widget name = 'Slider'
+				size = 'kSliderWidth, kSliderHeight'
+		/>
+
+		<widget name = 'OptionsLabel'
+				size = '110, Globals.Line.Height'
+		/>
+		<widget name = 'SmallLabel'
+				size = '18, Globals.Line.Height'
+		/>
+		<widget name = 'PopUp'
+				size = '-1, 15'
+		/>
+		<widget name = 'Checkbox'
+				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 = 'TabWidget.Tab'
+				size = '45, 16'
+				padding = '0, 0, 2, 0'
+		/>
+		<widget name = 'TabWidget.NavButton'
+				size = '32, 18'
+				padding = '0, 3, 4, 0'
+		/>
+	</globals>
+
+	<dialog name = 'Launcher' overlays = 'screen'>
+		<layout type = 'vertical' center = 'true' padding = '8, 8, 8, 4' spacing = '8'>
+			<widget name = 'Version'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'GameList'/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6'>
+				<widget name = 'LoadGameButton' 
+						height = 'Globals.Button.Height' 
+				/>
+				<widget name = 'AddGameButton' 
+						height = 'Globals.Button.Height' 
+				/>
+				<widget name = 'EditGameButton' 
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'RemoveGameButton' 
+						height = 'Globals.Button.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'QuitButton' 
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'AboutButton' 
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'OptionsButton' 
+						height = 'Globals.Button.Height'
+				/>
+				<widget name = 'StartButton' 
+						height = 'Globals.Button.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
+			<widget name = 'Headline'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Path'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'List'/>
+			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
+				<widget name = 'Up'
+						type = 'Button'
+				/>
+				<space/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				
+				<widget name = 'Choose'
+						type = 'Button'
+				/>	
+			</layout>			
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
+				<space/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				
+				<widget name = 'Ok' 
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<widget name = 'grModePopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'grRenderPopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'grAspectCheckbox'
+					type = 'Checkbox'
+			/>
+			<widget name = 'grFullscreenCheckbox'
+					type = 'Checkbox'
+			/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<widget name = 'auMidiPopup'
+					type = 'PopUp'
+			/>
+			<widget name = 'auSampleRatePopup'
+					type = 'PopUp'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'subToggleDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subToggleButton'
+						width = 'Globals.Slider.Width'
+						height = 'Globals.Slider.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'subSubtitleSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subSubtitleSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'subSubtitleSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'vcMusicText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcMusicSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcMusicLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'vcSfxText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'vcSpeechText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSpeechSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSpeechLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'mcFontButton'
+						type = 'Button'
+				/>
+				<widget name = 'mcFontPath'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'mcFontClearButton'
+						height = 'Globals.Line.Height'
+						width = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'mcMixedCheckbox'
+					type = 'Checkbox'
+			/>
+			<widget name = 'mcMt32Checkbox'
+					type = 'Checkbox'
+			/>
+			<widget name = 'mcGSCheckbox'
+					type = 'Checkbox'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<widget name = 'mcMidiGainText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'mcMidiGainSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'mcMidiGainLabel'
+						width = '32'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'SaveButton'
+						type = 'Button'
+				/>
+				<widget name = 'SavePath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ThemeButton'
+						type = 'Button'
+				/>
+				<widget name = 'ThemePath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ExtraButton'
+						type = 'Button'
+				/>
+				<widget name = 'ExtraPath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'PluginsButton'
+						type = 'Button'
+				/>
+				<widget name = 'PluginsPath'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'ThemeButton'
+						type = 'Button'
+				/>
+				<widget name = 'CurTheme'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<widget name = 'Renderer'
+					type = 'PopUp'
+			/>
+			<widget name = 'AutosavePeriod'
+					type = 'PopUp'
+			/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'>
+		<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
+			<widget name = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
+				<space/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Ok' 
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
+		<layout type = 'vertical' padding = '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_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 = '16'>
+				<widget name = 'Id'
+						width = '35'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'Domain'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+				<widget name = 'Name'
+						width = '35'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'Desc'
+						type = 'PopUp'
+				/>
+			</layout>
+			<space size = '8'/>
+			<widget name = 'Lang'
+					type = 'PopUp'
+			/>
+			<widget name = 'Platform'
+					type = 'PopUp'
+			/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'>
+		<layout type = 'vertical' padding = '16, 16, 16, 16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+				<widget name = 'Savepath'
+						type = 'Button'
+				/>
+				<widget name = 'SavepathText'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+				<widget name = 'Extrapath'
+						type = 'Button'
+				/>
+				<widget name = 'ExtrapathText'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+				<widget name = 'Gamepath'
+						type = 'Button'
+				/>
+				<widget name = 'GamepathText'
+						height = 'Globals.Line.Height'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+	
+	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Title'
+					width = '120'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Version'
+					width = '120'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'Resume'
+					width = '70'
+					height = 'Globals.Button.Height'
+			/>
+			<space size = '4'/>
+			<widget name = 'Options'
+					width = '70'
+					height = 'Globals.Button.Height'
+			/>
+			<widget name = 'About'
+					width = '70'
+					height = 'Globals.Button.Height'
+			/>
+			<space size = '4'/>
+			<widget name = 'RTL'
+					width = '70'
+					height = 'Globals.Button.Height'
+			/>
+			<widget name = 'Quit'
+					width = '70'
+					height = 'Globals.Button.Height'
+			/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'ScummMain' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '4, 4, 4, 4'>
+			<widget name = 'Resume'
+					type = 'Button'
+			/>
+			<space size = '8'/>
+			<widget name = 'Load'
+					type = 'Button'
+			/>
+			<widget name = 'Save'
+					type = 'Button'
+			/>
+			<space size = '8'/>
+			<widget name = 'Options'
+					type = 'Button'
+			/>
+			<widget name = 'Help'
+					type = 'Button'
+			/>
+			<widget name = 'About'
+					type = 'Button'
+			/>
+			<space size = '8'/>
+			<widget name = 'Quit'
+					type = 'Button'
+			/>
+		</layout>
+	</dialog>
+
+	<dialog name = 'ScummConfig' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'vcMusicText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcMusicSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcMusicLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'vcSfxText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'vcSpeechText'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'vcSpeechSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSpeechLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'subToggleDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subToggleButton'
+						width = '92'
+						height = 'Globals.Slider.Height'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<widget name = 'subSubtitleSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'subSubtitleSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'subSubtitleSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<space size = '20'/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<space size = 'Globals.Button.Width' />
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Ok'
+						type = 'Button'
+				/>
+			</layout>		
+		</layout>
+	</dialog>
+
+	<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
+			<widget name = 'Title' height = 'Globals.Line.Height'/>
+			<widget name = 'List' />
+			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
+				<space/>
+				<widget name = 'Delete'
+						type = 'Button'
+				/>
+				<space size = '16'/>
+				<widget name = 'Cancel'
+						type = 'Button'
+				/>
+				<widget name = 'Choose'
+						type = 'Button'
+				/>	
+			</layout>	
+		</layout>
+	</dialog>
+
+	<dialog name = 'ScummHelp' overlays = 'screen_center'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
+			<widget name = 'Title'
+					width = '180'
+					height = 'Globals.Line.Height'
+			/>
+			<widget name = 'HelpText'
+					height = '170'
+			/>
+			<layout type = 'horizontal' padding = '0, 0, 4, 0'>
+				<widget name = 'Prev'
+						type = 'Button'
+				/>
+				<widget name = 'Next'
+						type = 'Button'
+				/>
+				<space size = '32'/>
+				<widget name = 'Close'
+						type = 'Button'
+				/>
+			</layout>
+		</layout>
+	</dialog>
+</layout_info>
diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip
deleted file mode 100644
index 70141bfce9..0000000000
Binary files a/gui/themes/scummodern.zip and /dev/null differ
diff --git a/gui/themes/scummodern/THEMERC b/gui/themes/scummodern/THEMERC
deleted file mode 100644
index d11c959867..0000000000
--- a/gui/themes/scummodern/THEMERC
+++ /dev/null
@@ -1 +0,0 @@
-[SCUMMVM_THEME_V23:ScummVM Modern Theme:No Author]
\ No newline at end of file
diff --git a/gui/themes/scummodern/checkbox.bmp b/gui/themes/scummodern/checkbox.bmp
deleted file mode 100644
index a0b91b569f..0000000000
Binary files a/gui/themes/scummodern/checkbox.bmp and /dev/null differ
diff --git a/gui/themes/scummodern/cursor.bmp b/gui/themes/scummodern/cursor.bmp
deleted file mode 100644
index e7bdb60cad..0000000000
Binary files a/gui/themes/scummodern/cursor.bmp and /dev/null differ
diff --git a/gui/themes/scummodern/cursor_small.bmp b/gui/themes/scummodern/cursor_small.bmp
deleted file mode 100644
index 5f25f32f1a..0000000000
Binary files a/gui/themes/scummodern/cursor_small.bmp and /dev/null differ
diff --git a/gui/themes/scummodern/helvr12-l1.fcc b/gui/themes/scummodern/helvr12-l1.fcc
deleted file mode 100644
index 651a25934a..0000000000
Binary files a/gui/themes/scummodern/helvr12-l1.fcc and /dev/null differ
diff --git a/gui/themes/scummodern/logo.bmp b/gui/themes/scummodern/logo.bmp
deleted file mode 100644
index 659ec47d03..0000000000
Binary files a/gui/themes/scummodern/logo.bmp and /dev/null differ
diff --git a/gui/themes/scummodern/logo_small.bmp b/gui/themes/scummodern/logo_small.bmp
deleted file mode 100644
index eaa998a165..0000000000
Binary files a/gui/themes/scummodern/logo_small.bmp and /dev/null differ
diff --git a/gui/themes/scummodern/scummodern_gfx.stx b/gui/themes/scummodern/scummodern_gfx.stx
deleted file mode 100644
index b8eff77aa1..0000000000
--- a/gui/themes/scummodern/scummodern_gfx.stx
+++ /dev/null
@@ -1,489 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-<render_info>
-	<palette>
-		<color name = 'darkred'
-				rgb = '169, 42, 12'
-		/>
-		<color name = 'brightred'
-				rgb = '203, 126, 107'
-		/>
-		<color name = 'xtrabrightred'
-				rgb = '251, 241, 206'
-		/>
-		<color name = 'blandyellow'
-				rgb = '246, 224, 139'
-		/>
-		<color name = 'bgreen'
-				rgb = '100, 162, 8'
-		/>
-		<color name = 'black'
-				rgb = '0, 0, 0'
-		/>
-		<color name = 'white'
-				rgb = '255, 255, 255'
-		/>
-		<color name = 'shadowcolor'
-				rgb = '63, 60, 17'
-		/>
-	</palette>
-
-	<bitmaps>
-		<bitmap filename = 'logo.bmp'/>
-		<bitmap filename = 'cursor.bmp'/>
-		<bitmap filename = 'cursor_small.bmp'/>
-		<bitmap filename = 'checkbox.bmp'/>
-		<bitmap filename = 'logo_small.bmp'/>
-	</bitmaps>
-
-	<fonts>
-		<font	id = 'text_default'
-				file = 'default'
-				color = 'black'
-		/>
-		<font	id = 'text_hover'
-				file = 'default'
-				color = 'bgreen'
-		/>
-		<font	id = 'text_disabled'
-				file = 'default'
-				color = '128, 128, 128'
-		/>
-		<font	id = 'text_inverted'
-				file = 'default'
-				color = '0, 0, 0'
-		/>
-		<font	id = 'text_button'
-				file = 'default'
-				color = 'white'
-		/>
-		<font	id = 'text_button_hover'
-				file = 'default'
-				color = 'blandyellow'
-		/>
-		<font	id = 'text_normal'
-				file = 'helvr12-l1.bdf'
-				color = 'black'
-		/>
-	</fonts>
-
-	<defaults fill = 'gradient' fg_color = 'white' bevel_color = '237, 169, 72'/>
-
-	<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
-	<cursor resolution = '320xY, 256x240' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
-
-	<drawdata id = 'text_selection' cache = false>
-		<drawstep	func = 'square'
-					fill = 'foreground'
-					fg_color = 'bgreen'
-		/>
-	</drawdata>
-
-	<drawdata id = 'mainmenu_bg' cache = false>
-		<drawstep	func = 'fill'
-					fill = 'gradient'
-					gradient_start = '208, 112, 8'
-					gradient_end = '232, 192, 16'
-		/>
-	</drawdata>
-
-	<drawdata id = 'special_bg' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = '4'
-					fill = 'gradient'
-					stroke = '0'
-					gradient_start = '208, 112, 8'
-					gradient_end = '232, 192, 16'
-					shadow = '3'
-					gradient_factor = '3'
-		/>
-	</drawdata>
-
-	<drawdata id = 'separator' cache = false>
-		<drawstep	func = 'square'
-					fill = 'foreground'
-					height = '1'
-					ypos = 'center'
-					fg_color = 'black'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_base' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
-					fill = 'background'
-					fg_color = '176, 164, 160'
-					bg_color = '240, 228, 160'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_handle_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
-					fill = 'gradient'
-					fg_color = 'blandyellow'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_handle_idle' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
-					fill = 'gradient'
-					fg_color = 'blandyellow'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_button_idle' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = '4'
-					fill = 'none'
-					fg_color = '176, 164, 160'
-					stroke = 1
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '0, 0, 0'
-					fill = 'foreground'
-					width = 'auto'
-					height = 'auto'
-					xpos = 'center'
-					ypos = 'center'
-					orientation = 'top'
-		/>
-	</drawdata>
-
-	<drawdata id = 'scrollbar_button_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = '4'
-					fill = 'background'
-					fg_color = '120, 120, 120'
-					bg_color = '206, 121, 99'
-					stroke = 1
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '0, 0, 0'
-					fill = 'foreground'
-					width = 'auto'
-					height = 'auto'
-					xpos = 'center'
-					ypos = 'center'
-					orientation = 'top'
-		/>
-	</drawdata>
-
-	<drawdata id = 'tab_active' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'tab'
-					radius = '4'
-					stroke = '0'
-					fill = 'gradient'
-					gradient_end = 'xtrabrightred'
-					gradient_start = 'blandyellow'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'tab_inactive' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'tab'
-					radius = '4'
-					stroke = '0'
-					fill = 'foreground'
-					fg_color = '240, 205, 118'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'tab_background' cache = false>
-		<drawstep	func = 'tab'
-					radius = '6'
-					stroke = '0'
-					fill = 'foreground'
-					fg_color = '232, 180, 81'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'widget_slider' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
-					fill = 'foreground'
-					fg_color = 'blandyellow'
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'slider_full' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
-					fill = 'gradient'
-					fg_color = '123, 112, 56'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'slider_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
-					fill = 'gradient'
-					fg_color = '123, 112, 56'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-	
-	<drawdata id = 'slider_disabled' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
-					fill = 'gradient'
-					fg_color = '123, 112, 56'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-		/>
-	</drawdata>
-
-	<drawdata id = 'popup_idle' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
-					fill = 'foreground'
-					fg_color = '250, 237, 190'
-					shadow = 2
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '63, 60, 52'
-					fill = 'foreground'
-					width = 'height'
-					height = 'auto'
-					xpos = 'right'
-					ypos = 'center'
-					orientation = 'bottom'
-		/>
-		<text	font = 'text_default'
-				vertical_align = 'center'
-				horizontal_align = 'left'
-		/>
-	</drawdata>
-
-
-	<drawdata id = 'popup_hover' cache = false>
-		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
-					fill = 'gradient'
-					gradient_start = 'blandyellow'
-					gradient_end = '250, 237, 190'
-					shadow = 0
-		/>
-		<drawstep	func = 'triangle'
-					fg_color = '63, 60, 52'
-					fill = 'foreground'
-					width = 'height'
-					height = 'auto'
-					xpos = 'right'
-					ypos = 'center'
-					orientation = 'bottom'
-		/>
-		<text	font = 'text_hover'
-				vertical_align = 'center'
-				horizontal_align = 'left'
-		/>
-	</drawdata>
-
-	<drawdata id = 'widget_textedit' cache = false>
-		<drawstep	func = 'roundedsq'
-					fill = 'foreground'
-					radius = 4
-					fg_color = 'blandyellow'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-	
-	<drawdata id = 'plain_bg' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = 6
-					stroke = 0
-					gradient_start = 'blandyellow'
-					gradient_end = 'xtrabrightred'
-					fill = 'gradient'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'caret' cache = false>
-		<drawstep	func = 'square'
-					fill = 'foreground'
-					fg_color = 'black'
-		/>
-	</drawdata>
-
-	<drawdata id = 'default_bg' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = 12
-					stroke = 0
-					fg_color = 'xtrabrightred'
-					fill = 'foreground'
-					shadow = 3
-		/>
-	</drawdata>
-
-	<drawdata id = 'button_idle' cache = false>
-		<text	font = 'text_button'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'roundedsq'
-					radius = '3'
-					stroke = 1
-					fill = 'gradient'
-					shadow = 0
-					fg_color = 'shadowcolor'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-					bevel = 1
-		/>
-	</drawdata>
-
-	<drawdata id = 'button_hover' cache = false>
-		<text	font = 'text_button_hover'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'roundedsq'
-					radius = '3'
-					gradient_factor = 1
-					stroke = 1 
-					fill = 'gradient'
-					shadow = 0
-					fg_color = 'shadowcolor'
-					gradient_start = 'xtrabrightred'
-					gradient_end = 'darkred'
-					bevel_color = 'xtrabrightred'
-					bevel = 1
-		/>
-	</drawdata>
-
-	<drawdata id = 'button_disabled' cache = false>
-		<text	font = 'text_disabled'
-				vertical_align = 'center'
-				horizontal_align = 'center'
-		/>
-		<drawstep	func = 'roundedsq'
-					radius = '3'
-					stroke = 1
-					fill = 'gradient'
-					shadow = 0
-					fg_color = 'shadowcolor'
-					gradient_start = 'brightred'
-					gradient_end = 'darkred'
-					bevel = 1
-		/>
-	</drawdata>
-
-	<drawdata id = 'checkbox_disabled' cache = false>
-		<text	font = 'text_disabled'
-				vertical_align = 'top'
-				horizontal_align = 'left'
-		/>
-		<drawstep	func = 'roundedsq'
-					fill = 'none'
-					radius = 4
-					fg_color = 'black'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'checkbox_selected' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'top'
-				horizontal_align = 'left'
-		/>
-		<drawstep	func = 'bitmap'
-					file = 'checkbox.bmp'
-		/>
-	</drawdata>
-
-	<drawdata id = 'checkbox_default' cache = false>
-		<text	font = 'text_default'
-				vertical_align = 'top'
-				horizontal_align = 'left'
-		/>
-		<drawstep	func = 'roundedsq'
-					fill = 'foreground'
-					radius = 4
-					fg_color = 'blandyellow'
-					shadow = 0
-					bevel = 1
-					bevel_color = 'shadowcolor'
-		/>
-	</drawdata>
-
-	<drawdata id = 'widget_default' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = 8
-					stroke = 0
-					gradient_start = 'blandyellow'
-					gradient_end = '251, 241, 206'
-					gradient_factor = '6'
-					fill = 'gradient'
-					shadow = 3
-		/>
-	</drawdata>
-	
-	<drawdata id = 'widget_small' cache = false>
-		<drawstep	func = 'roundedsq'
-					radius = 8
-					stroke = 0
-					gradient_start = 'blandyellow'
-					gradient_end = 'xtrabrightred'
-					gradient_factor = '6'
-					fill = 'gradient'
-					shadow = 3
-		/>
-	</drawdata>
-</render_info>
\ No newline at end of file
diff --git a/gui/themes/scummodern/scummodern_layout.stx b/gui/themes/scummodern/scummodern_layout.stx
deleted file mode 100644
index 03d920ac05..0000000000
--- a/gui/themes/scummodern/scummodern_layout.stx
+++ /dev/null
@@ -1,647 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-<layout_info resolution = '-320xY, -256x240'>
-	<globals>
-		<def var = 'Line.Height' value = '16' />
-		<def var = 'Font.Height' value = '16' />
-		<def var = 'TabLabelWidth' value = '110' />
-		
-		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
-		
-		<def var = 'Padding.Bottom' value = '16' />
-		<def var = 'Padding.Left' value = '16' />
-		<def var = 'Padding.Right' value = '16' />
-		<def var = 'Padding.Top' value = '16' />
-		
-		<def var = 'About.OuterBorder' value = '80'/>
-		
-		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
-		<def var = 'ListWidget.hlRightPadding' value = '0'/>
-		<def var = 'PopUpWidget.labelSpacing' value = '10' />
-		
-		<def var = 'ShowLauncherLogo' value = '1'/>
-		<def var = 'ShowGlobalMenuLogo' value = '1'/>
-		
-		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/>
-
-		<widget name = 'OptionsLabel'
-				size = '110, Globals.Line.Height'
-		/>
-		<widget name = 'SmallLabel'
-				size = '24, Globals.Line.Height'
-		/>
-		
-		<widget name = 'Button'
-				size = 'kBigButtonWidth, kBigButtonHeight'
-		/>
-		
-		
-		<widget name = 'Slider'
-				size = 'kBigSliderWidth, kBigSliderHeight'
-		/>
-		<widget name = 'PopUp'
-				size = '-1, 19'
-		/>
-		<widget name = 'Checkbox'
-				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 = 'TabWidget.Tab'
-				size = '75, 27'
-				padding = '0, 0, 8, 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 = '23, 23, 8, 23'>
-			<widget name = 'Version'
-					width = '247'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Logo'
-					width = '283'
-					height = '80'
-			/>		
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'GameList'/>
-				<layout type = 'vertical' padding = '10, 0, 0, 0'>
-					<widget name = 'StartButton' 
-							type = 'Button'
-					/>
-					<widget name = 'LoadGameButton' 
-							type = 'Button'
-					/>
-					<space size = '10' />
-					<widget name = 'AddGameButton' 
-							type = 'Button' 
-					/>
-					<widget name = 'EditGameButton' 
-							type = 'Button' 
-					/>
-					<widget name = 'RemoveGameButton' 
-							type = 'Button' 
-					/>
-					<space size = '10' />
-					<widget name = 'OptionsButton' 
-							type = 'Button' 
-					/>
-					<widget name = 'AboutButton' 
-							type = 'Button' 
-					/>
-					<space size = '10' />
-					<widget name = 'QuitButton' 
-							type = 'Button' 
-					/>
-				</layout>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8'>			
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'List'/>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
-				<widget name = 'Up'
-						type = 'Button'
-				/>
-				<space/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>	
-			</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'
-				/>
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<widget name = 'grModePopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'grRenderPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'grAspectCheckbox'
-					type = 'Checkbox'
-			/>
-			<widget name = 'grFullscreenCheckbox'
-					type = 'Checkbox'
-			/>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<widget name = 'auMidiPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'subToggleDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subToggleButton'
-						width = '150'
-						height = 'Globals.Slider.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'subSubtitleSpeedDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subSubtitleSpeedSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'subSubtitleSpeedLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'vcMusicText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcMusicSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcMusicLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'vcSfxText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'vcSpeechText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSpeechSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSpeechLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'mcFontButton'
-						type = 'Button'
-				/>	
-				<widget name = 'mcFontPath'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'mcFontClearButton'
-						height = 'Globals.Line.Height'
-						width = 'Globals.Line.Height'
-				/>
-			</layout>
-			<widget name = 'mcMixedCheckbox'
-					type = 'Checkbox'
-			/>
-			<widget name = 'mcMt32Checkbox'
-					type = 'Checkbox'
-			/>
-			<widget name = 'mcGSCheckbox'
-					type = 'Checkbox'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'mcMidiGainText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'mcMidiGainSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'mcMidiGainLabel'
-						width = '32'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'SaveButton'
-						type = 'Button'
-				/>
-				<widget name = 'SavePath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ThemeButton'
-						type = 'Button'
-				/>
-				<widget name = 'ThemePath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ExtraButton'
-						type = 'Button'
-				/>
-				<widget name = 'ExtraPath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'PluginsButton'
-						type = 'Button'
-				/>
-				<widget name = 'PluginsPath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ThemeButton'
-						type = 'Button'
-				/>
-				<widget name = 'CurTheme'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<widget name = 'Renderer'
-					type = 'PopUp'
-			/>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
-		</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_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 = '16'>
-				<widget name = 'Id'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'Domain'
-						type = 'PopUp'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'Name'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'Desc'
-						type = 'PopUp'
-				/>
-			</layout>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
-				<widget name = 'Savepath'
-						type = 'Button'
-				/>
-				<widget name = 'SavepathText'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
-				<widget name = 'Extrapath'
-						type = 'Button'
-				/>
-				<widget name = 'ExtrapathText'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
-				<widget name = 'Gamepath'
-						type = 'Button'
-				/>
-				<widget name = 'GamepathText'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'>
-			<widget name = 'Logo'
-					width = '210'
-					height = '40'
-			/>
-			<widget name = 'Version'
-					width = '210'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Resume'
-					width = '150'
-					height = 'Globals.Button.Height'
-			/>
-			<space size = '10'/>
-			<widget name = 'Options'
-					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 = 'ScummMain' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8'>
-			<widget name = 'Resume'
-					type = 'Button'
-			/>
-			<space size = '15'/>
-			<widget name = 'Load'
-					type = 'Button'
-			/>
-			<widget name = 'Save'
-					type = 'Button'
-			/>
-			<space size = '15'/>
-			<widget name = 'Options'
-					type = 'Button'
-			/>
-			<widget name = 'Help'
-					type = 'Button'
-			/>
-			<widget name = 'About'
-					type = 'Button'
-			/>
-			<space size = '15'/>
-			<widget name = 'Quit'
-					type = 'Button'
-			/>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'ScummConfig' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcMusicText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcMusicSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcMusicLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSfxText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSpeechText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSpeechSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSpeechLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subToggleDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subToggleButton'
-						width = '158'
-						height = 'Globals.Slider.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subSubtitleSpeedDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subSubtitleSpeedSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'subSubtitleSpeedLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<space size = '60'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<space size = 'Globals.Button.Width' />
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Ok'
-						type = 'Button'
-				/>
-			</layout>		
-		</layout>
-	</dialog>
-	
-	<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'>
-		<layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'>
-			<widget name = 'Title'
-					height = 'Globals.Line.Height'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'>	
-				<widget name = 'List' />
-				<widget name = 'Thumbnail'
-						width = '180'
-						height = '200'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<space/>
-				<widget name = 'Delete'
-						type = 'Button'
-				/>
-				<space size = '32'/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'ScummHelp' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
-			<widget name = 'Title'
-					width = '320'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'HelpText'
-					height = '220'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
-				<widget name = 'Prev'
-						type = 'Button'
-				/>
-				<widget name = 'Next'
-						type = 'Button'
-				/>
-				<space size = '32'/>
-				<widget name = 'Close'
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-</layout_info>
\ No newline at end of file
diff --git a/gui/themes/scummodern/scummodern_layout_320.stx b/gui/themes/scummodern/scummodern_layout_320.stx
deleted file mode 100644
index b92ded6097..0000000000
--- a/gui/themes/scummodern/scummodern_layout_320.stx
+++ /dev/null
@@ -1,625 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-<layout_info resolution = "320xY, 256x240">
-	<globals>
-		<def var = 'Line.Height' value = '12' />
-		<def var = 'Font.Height' value = '10' />
-		<def var = 'TabLabelWidth' value = '100' />
-
-		<def var = 'WidgetSize' value = 'kNormalWidgetSize' />
-		<def var = 'About.OuterBorder' value = '10'/>
-		<def var = 'PopUpWidget.labelSpacing' value = '6' />
-
-		<def var = 'ShowLauncherLogo' value = '0'/>
-		<def var = 'ShowGlobalMenuLogo' value = '0'/>
-		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/>
-
-		<widget name = 'Button'
-				size = 'kButtonWidth, kButtonHeight'
-		/>
-
-		<widget name = 'Slider'
-				size = 'kSliderWidth, kSliderHeight'
-		/>
-
-		<widget name = 'OptionsLabel'
-				size = '110, Globals.Line.Height'
-		/>
-		<widget name = 'SmallLabel'
-				size = '18, Globals.Line.Height'
-		/>
-		<widget name = 'PopUp'
-				size = '-1, 15'
-		/>
-		<widget name = 'Checkbox'
-				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 = 'TabWidget.Tab'
-				size = '45, 16'
-				padding = '0, 0, 2, 0'
-		/>
-		<widget name = 'TabWidget.NavButton'
-				size = '32, 18'
-				padding = '0, 3, 4, 0'
-		/>
-	</globals>
-
-	<dialog name = 'Launcher' overlays = 'screen'>
-		<layout type = 'vertical' center = 'true' padding = '8, 8, 8, 4' spacing = '8'>
-			<widget name = 'Version'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'GameList'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6'>
-				<widget name = 'LoadGameButton' 
-						height = 'Globals.Button.Height' 
-				/>
-				<widget name = 'AddGameButton' 
-						height = 'Globals.Button.Height' 
-				/>
-				<widget name = 'EditGameButton' 
-						height = 'Globals.Button.Height'
-				/>
-				<widget name = 'RemoveGameButton' 
-						height = 'Globals.Button.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'QuitButton' 
-						height = 'Globals.Button.Height'
-				/>
-				<widget name = 'AboutButton' 
-						height = 'Globals.Button.Height'
-				/>
-				<widget name = 'OptionsButton' 
-						height = 'Globals.Button.Height'
-				/>
-				<widget name = 'StartButton' 
-						height = 'Globals.Button.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8'>
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'List'/>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
-				<widget name = 'Up'
-						type = 'Button'
-				/>
-				<space/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				
-				<widget name = 'Choose'
-						type = 'Button'
-				/>	
-			</layout>			
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0'>
-			<widget name = 'TabWidget'/>
-			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
-				<space/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<widget name = 'grModePopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'grRenderPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'grAspectCheckbox'
-					type = 'Checkbox'
-			/>
-			<widget name = 'grFullscreenCheckbox'
-					type = 'Checkbox'
-			/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Audio' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<widget name = 'auMidiPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'subToggleDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subToggleButton'
-						width = 'Globals.Slider.Width'
-						height = 'Globals.Slider.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'subSubtitleSpeedDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subSubtitleSpeedSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'subSubtitleSpeedLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'vcMusicText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcMusicSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcMusicLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'vcSfxText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'vcSpeechText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSpeechSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSpeechLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_MIDI' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'mcFontButton'
-						type = 'Button'
-				/>
-				<widget name = 'mcFontPath'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'mcFontClearButton'
-						height = 'Globals.Line.Height'
-						width = 'Globals.Line.Height'
-				/>
-			</layout>
-			<widget name = 'mcMixedCheckbox'
-					type = 'Checkbox'
-			/>
-			<widget name = 'mcMt32Checkbox'
-					type = 'Checkbox'
-			/>
-			<widget name = 'mcGSCheckbox'
-					type = 'Checkbox'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<widget name = 'mcMidiGainText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'mcMidiGainSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'mcMidiGainLabel'
-						width = '32'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Paths' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'SaveButton'
-						type = 'Button'
-				/>
-				<widget name = 'SavePath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ThemeButton'
-						type = 'Button'
-				/>
-				<widget name = 'ThemePath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ExtraButton'
-						type = 'Button'
-				/>
-				<widget name = 'ExtraPath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'PluginsButton'
-						type = 'Button'
-				/>
-				<widget name = 'PluginsPath'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions_Misc' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'ThemeButton'
-						type = 'Button'
-				/>
-				<widget name = 'CurTheme'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<widget name = 'Renderer'
-					type = 'PopUp'
-			/>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
-			<widget name = 'TabWidget'/>
-			<layout type = 'horizontal' padding = '8, 8, 8, 8'>
-				<space/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
-		<layout type = 'vertical' padding = '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_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 = '16'>
-				<widget name = 'Id'
-						width = '35'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'Domain'
-						type = 'PopUp'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
-				<widget name = 'Name'
-						width = '35'
-						height = 'Globals.Line.Height'
-				/>
-				<widget name = 'Desc'
-						type = 'PopUp'
-				/>
-			</layout>
-			<space size = '8'/>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'>
-		<layout type = 'vertical' padding = '16, 16, 16, 16'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
-				<widget name = 'Savepath'
-						type = 'Button'
-				/>
-				<widget name = 'SavepathText'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
-				<widget name = 'Extrapath'
-						type = 'Button'
-				/>
-				<widget name = 'ExtrapathText'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
-				<widget name = 'Gamepath'
-						type = 'Button'
-				/>
-				<widget name = 'GamepathText'
-						height = 'Globals.Line.Height'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GlobalMenu' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
-			<widget name = 'Title'
-					width = '120'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Version'
-					width = '120'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Resume'
-					width = '70'
-					height = 'Globals.Button.Height'
-			/>
-			<space size = '4'/>
-			<widget name = 'Options'
-					width = '70'
-					height = 'Globals.Button.Height'
-			/>
-			<widget name = 'About'
-					width = '70'
-					height = 'Globals.Button.Height'
-			/>
-			<space size = '4'/>
-			<widget name = 'RTL'
-					width = '70'
-					height = 'Globals.Button.Height'
-			/>
-			<widget name = 'Quit'
-					width = '70'
-					height = 'Globals.Button.Height'
-			/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'ScummMain' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '4, 4, 4, 4'>
-			<widget name = 'Resume'
-					type = 'Button'
-			/>
-			<space size = '8'/>
-			<widget name = 'Load'
-					type = 'Button'
-			/>
-			<widget name = 'Save'
-					type = 'Button'
-			/>
-			<space size = '8'/>
-			<widget name = 'Options'
-					type = 'Button'
-			/>
-			<widget name = 'Help'
-					type = 'Button'
-			/>
-			<widget name = 'About'
-					type = 'Button'
-			/>
-			<space size = '8'/>
-			<widget name = 'Quit'
-					type = 'Button'
-			/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'ScummConfig' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcMusicText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcMusicSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcMusicLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSfxText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSpeechText'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'vcSpeechSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSpeechLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subToggleDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subToggleButton'
-						width = '92'
-						height = 'Globals.Slider.Height'
-				/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subSubtitleSpeedDesc'
-						type = 'OptionsLabel'
-				/>
-				<widget name = 'subSubtitleSpeedSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'subSubtitleSpeedLabel'
-						type = 'SmallLabel'
-				/>
-			</layout>
-			<space size = '20'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<space size = 'Globals.Button.Width' />
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Ok'
-						type = 'Button'
-				/>
-			</layout>		
-		</layout>
-	</dialog>
-
-	<dialog name = 'ScummSaveLoad' overlays = 'screen' inset = '16'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
-			<widget name = 'Title' height = 'Globals.Line.Height'/>
-			<widget name = 'List' />
-			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
-				<space/>
-				<widget name = 'Delete'
-						type = 'Button'
-				/>
-				<space size = '16'/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>	
-			</layout>	
-		</layout>
-	</dialog>
-
-	<dialog name = 'ScummHelp' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8'>
-			<widget name = 'Title'
-					width = '180'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'HelpText'
-					height = '170'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 4, 0'>
-				<widget name = 'Prev'
-						type = 'Button'
-				/>
-				<widget name = 'Next'
-						type = 'Button'
-				/>
-				<space size = '32'/>
-				<widget name = 'Close'
-						type = 'Button'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-</layout_info>
-- 
cgit v1.2.3