Deprecated support for "direction" layout keys.

svn-id: r33904

11 files changed, 832 insertions, 573 deletions

diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6a4ab4bd3c..e1fe3cfeed 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -645,6 +645,7 @@ HelpDialog::HelpDialog(const GameSettings &game)
 	_title = new StaticTextWidget(this, "ScummHelp.Title", "");
 
 	_page = 1;
+	_backgroundType = GUI::Theme::kDialogBackgroundDefault;
 
 	_numPages = ScummHelp::numPages(_game.id);
 
@@ -655,8 +656,8 @@ HelpDialog::HelpDialog(const GameSettings &game)
 
 	// Dummy entries
 	for (int i = 0; i < HELP_NUM_LINES; i++) {
-		_key[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", kTextAlignLeft);
-		_dsc[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", kTextAlignLeft);
+		_key[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignRight);
+		_dsc[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignLeft);
 	}
 
 }
@@ -671,12 +672,14 @@ void HelpDialog::reflowLayout() {
 	g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h);
 	
 	int keyW = w * 20 / 100;
-	int dscX = x + keyW;
+	int dscX = x + keyW + 32;
 	int dscW = w * 80 / 100;
+	
+	int xoff = (_w >> 1) - (w >> 1);
 
 	for (int i = 0; i < HELP_NUM_LINES; i++) {
-		_key[i]->resize(x, y + lineHeight * i, keyW, lineHeight + 2);
-		_dsc[i]->resize(dscX, y + lineHeight * i, dscW, lineHeight + 2);
+		_key[i]->resize(xoff + x, y + lineHeight * i, keyW, lineHeight + 2);
+		_dsc[i]->resize(xoff + dscX, y + lineHeight * i, dscW, lineHeight + 2);
 	}
 
 	displayKeyBindings();
diff --git a/gui/ThemeEval.cpp b/gui/ThemeEval.cpp
index 2d8290ffa8..ecf48e71b4 100644
--- a/gui/ThemeEval.cpp
+++ b/gui/ThemeEval.cpp
@@ -65,9 +65,6 @@ void ThemeLayoutMain::reflowLayout() {
 		_children[0]->setHeight(_h);
 		_children[0]->reflowLayout();
 		
-//		_children[0]->setX(_x);
-//		_children[0]->setY(_y);
-		
 		if (_w == -1)
 			_w = _children[0]->getWidth();
 			
@@ -109,32 +106,22 @@ void ThemeLayoutVertical::reflowLayout() {
 			
 		_children[i]->setY(curY);
 		
-		if (_centered && _children[i]->getWidth() < _w)
+		if (_centered && _children[i]->getWidth() < _w && _w != -1)
 			_children[i]->setX((_w >> 1) - (_children[i]->getWidth() >> 1));
 		else
 			_children[i]->setX(curX);
 
-		if (_reverse) {
-			for (int j = i - 1; j >= 0; --j)
-				_children[j]->setY(_children[i]->getHeight() + _spacing);
-		} else {
-			curY += _children[i]->getHeight() + _spacing;
-		}
-		
+		curY += _children[i]->getHeight() + _spacing;	
 		_w = MAX(_w, (int16)(_children[i]->getWidth() + _paddingLeft + _paddingRight));
 		
 		if (autoWidget != -1 && autoWidget != (int)i) {
 			_children[autoWidget]->setHeight(_children[autoWidget]->getHeight() - (_children[i]->getHeight() + _spacing));
 			
-			if (_reverse) for (int j = autoWidget - 1; j >= 0; --j)
+			extraHeight -= (_children[i]->getHeight() + _spacing);
+			_children[i]->setY(extraHeight);
+			
+			for (int j = i - 1; j > autoWidget; --j)
 				_children[j]->setY(-(_children[i]->getHeight() + _spacing));
-			else {
-				extraHeight -= (_children[i]->getHeight() + _spacing);
-				_children[i]->setY(extraHeight);
-				
-				for (int j = i - 1; j > autoWidget; --j)
-					_children[j]->setY(-(_children[i]->getHeight() + _spacing));
-			}
 		} else {
 			_h += _children[i]->getHeight() + _spacing;
 		}
@@ -170,30 +157,21 @@ void ThemeLayoutHorizontal::reflowLayout() {
 			
 		_children[i]->setX(curX);
 		
-		if (_centered && _children[i]->getHeight() < _h)
+		if (_centered && _children[i]->getHeight() < _h && _h != -1)
 			_children[i]->setY((_h >> 1) - (_children[i]->getHeight() >> 1));
 		else
 			_children[i]->setY(curY);
 			
-		if (_reverse) {
-			for (int j = i - 1; j >= 0; --j)
-				_children[j]->setX(_children[i]->getWidth() + _spacing);
-		} else {
-			curX += (_children[i]->getWidth() + _spacing);
-		}
+		curX += (_children[i]->getWidth() + _spacing);
 
 		if (autoWidget != -1 && autoWidget != (int)i) {
 			_children[autoWidget]->setWidth(_children[autoWidget]->getWidth() - (_children[i]->getWidth() + _spacing));
 			
-			if (_reverse) for (int j = autoWidget - 1; j >= 0; --j)
+			autoWidth -= (_children[i]->getWidth() + _spacing);
+			_children[i]->setX(autoWidth);
+		
+			for (int j = i - 1; j > autoWidget; --j)
 				_children[j]->setX(-(_children[i]->getWidth() + _spacing));
-			else {
-				autoWidth -= (_children[i]->getWidth() + _spacing);
-				_children[i]->setX(autoWidth);
-				
-				for (int j = i - 1; j > autoWidget; --j)
-					_children[j]->setX(-(_children[i]->getWidth() + _spacing));
-			}
 		} else {
 			_w += _children[i]->getWidth() + _spacing;
 		}
@@ -279,16 +257,16 @@ void ThemeEval::addDialog(const Common::String &name, const Common::String &over
 	setVar(name + ".Enabled", enabled ? 1 : 0);
 }
 
-void ThemeEval::addLayout(ThemeLayout::LayoutType type, int spacing, bool reverse, bool center) {
+void ThemeEval::addLayout(ThemeLayout::LayoutType type, int spacing, bool center) {
 	ThemeLayout *layout = 0;
 	
 	if (spacing == -1)
 		spacing = getVar("Globals.Layout.Spacing", 4);
 	
 	if (type == ThemeLayout::kLayoutVertical)
-		layout = new ThemeLayoutVertical(_curLayout.top(), spacing, reverse, center);
+		layout = new ThemeLayoutVertical(_curLayout.top(), spacing, center);
 	else if (type == ThemeLayout::kLayoutHorizontal)
-		layout = new ThemeLayoutHorizontal(_curLayout.top(), spacing, reverse, center);
+		layout = new ThemeLayoutHorizontal(_curLayout.top(), spacing, center);
 	
 	layout->setPadding(
 		getVar("Globals.Padding.Left", 0),
diff --git a/gui/ThemeEval.h b/gui/ThemeEval.h
index e0c1c5af59..8d55ff6066 100644
--- a/gui/ThemeEval.h
+++ b/gui/ThemeEval.h
@@ -50,7 +50,7 @@ public:
 	};
 	
 	ThemeLayout(ThemeLayout *p, const Common::String &name) : 
-		_parent(p), _name(name), _x(0), _y(0), _w(-1), _h(-1), _reverse(false),
+		_parent(p), _name(name), _x(0), _y(0), _w(-1), _h(-1),
 		_paddingLeft(0), _paddingRight(0), _paddingTop(0), _paddingBottom(0), 
 		_centered(false), _defaultW(-1), _defaultH(-1) { }
 		
@@ -185,7 +185,6 @@ protected:
 	int8 _spacing;
 	Common::Array<ThemeLayout*> _children;
 	ThemeLayout *_parent;
-	bool _reverse;
 	bool _centered;
 	Common::String _name;
 };
@@ -218,10 +217,9 @@ protected:
 
 class ThemeLayoutVertical : public ThemeLayout {
 public:
-	ThemeLayoutVertical(ThemeLayout *p, int spacing, bool reverse, bool center) :
+	ThemeLayoutVertical(ThemeLayout *p, int spacing, bool center) :
 	 	ThemeLayout(p, "") {
 		_spacing = spacing;
-		_reverse = reverse;
 		_centered = center;
 	}
 		
@@ -242,10 +240,9 @@ public:
 
 class ThemeLayoutHorizontal : public ThemeLayout {
 public:
-	ThemeLayoutHorizontal(ThemeLayout *p, int spacing, bool reverse, bool center) : 
+	ThemeLayoutHorizontal(ThemeLayout *p, int spacing, bool center) : 
 		ThemeLayout(p, "") {
 		_spacing = spacing;
-		_reverse = reverse;
 		_centered = center;
 	}
 		
@@ -337,7 +334,7 @@ public:
 	bool hasVar(const Common::String &name) { return _vars.contains(name) || _builtin.contains(name); }
 	
 	void addDialog(const Common::String &name, const Common::String &overlays, bool enabled = true, int inset = 0);
-	void addLayout(ThemeLayout::LayoutType type, int spacing, bool reverse, bool center = false);
+	void addLayout(ThemeLayout::LayoutType type, int spacing, bool center = false);
 	void addWidget(const Common::String &name, int w, int h, const Common::String &type, bool enabled = true);
 	bool addImportedLayout(const Common::String &name);
 	void addSpace(int size);
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 6972d89b6f..63fc868ba6 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -600,14 +600,10 @@ bool ThemeParser::parserCallback_layout(ParserNode *node) {
 	}
 	
 	if (node->values["type"] == "vertical")
-		_theme->themeEval()->addLayout(GUI::ThemeLayout::kLayoutVertical, spacing,
-		node->values["direction"] == "bottom2top",
-		node->values["center"] == "true");
+		_theme->themeEval()->addLayout(GUI::ThemeLayout::kLayoutVertical, spacing, node->values["center"] == "true");
 		
 	else if (node->values["type"] == "horizontal")
-		_theme->themeEval()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing,
-		node->values["direction"] == "right2left", 
-		node->values["center"] == "true");
+		_theme->themeEval()->addLayout(GUI::ThemeLayout::kLayoutHorizontal, spacing, node->values["center"] == "true");
 		
 	if (node->values.contains("padding")) {
 		int paddingL, paddingR, paddingT, paddingB;
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index 5c6ecd6649..098bdb0540 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -197,7 +197,6 @@ protected:
 				XML_KEY(layout)
 					XML_PROP(type, true)
 					XML_PROP(center, false)
-					XML_PROP(direction, false)
 					XML_PROP(padding, false)
 					XML_PROP(spacing, false)
 					
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 55d1211e24..3462b928c8 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -299,24 +299,17 @@
 "/> "
 "</drawdata> "
 "</render_info> "
-"<layout_info> "
+"<layout_info resolution = '-320xY, -256x240'> "
 "<globals> "
 "<def var = 'Line.Height' value = '16' /> "
 "<def var = 'Font.Height' value = '16' /> "
 "<def var = 'TabLabelWidth' value = '110' /> "
-"<def resolution = '320xY, 256x240' var = 'Line.Height' value = '12' /> "
-"<def resolution = '320xY, 256x240' var = 'Font.Height' value = '10' /> "
-"<def resolution = '320xY, 256x240' var = 'TabLabelWidth' value = '100' /> "
 "<def var = 'WidgetSize' value = 'kBigWidgetSize' /> "
 "<def var = 'About.OuterBorder' value = '80'/> "
 "<def var = 'PopUpWidget.labelSpacing' value = '10' /> "
-"<def resolution = '320xY, 256x240' var = 'WidgetSize' value = 'kNormalWidgetSize' /> "
-"<def resolution = '320xY, 256x240' var = 'About.OuterBorder' value = '10'/> "
-"<def resolution = '320xY, 256x240' var = 'PopUpWidget.labelSpacing' value = '6' /> "
 "<def var = 'Layout.Spacing' value = '8' /> "
 "<def var = 'ShowLauncherLogo' value = '0'/> "
 "<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/> "
-"<def resolution = '320xY, 256x240' var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/> "
 "<widget name = 'OptionsLabel' "
 "size = '110, Globals.Line.Height' "
 "/> "
@@ -326,33 +319,18 @@
 "<widget name = 'ShortOptionsLabel' "
 "size = '60, Globals.Line.Height' "
 "/> "
-"<widget resolution = '320xY, 256x240' name = 'ShortOptionsLabel' "
-"size = '40, Globals.Line.Height' "
-"/> "
 "<widget name = 'Button' "
 "size = 'kBigButtonWidth, kBigButtonHeight' "
 "/> "
 "<widget name = 'Slider' "
 "size = 'kBigSliderWidth, kBigSliderHeight' "
 "/> "
-"<widget resolution = '320xY, 256x240' name = 'Button' "
-"size = 'kButtonWidth, kButtonHeight' "
-"/> "
-"<widget resolution = '320xY, 256x240' name = 'Slider' "
-"size = 'kSliderWidth, kSliderHeight' "
-"/> "
 "<widget name = 'PopUp' "
 "size = '-1, 19' "
 "/> "
-"<widget name = 'PopUp' resolution = '320xY, 256x240' "
-"size = '-1, 15' "
-"/> "
 "<widget name = 'Checkbox' "
 "size = '-1, 14' "
 "/> "
-"<widget name = 'Checkbox' resolution = '320xY, 256x240' "
-"size = '-1, 10' "
-"/> "
 "<widget name = 'ListWidget' "
 "padding = '5, 0, 8, 0' "
 "/> "
@@ -373,14 +351,6 @@
 "size = '15, 18' "
 "padding = '0, 3, 4, 0' "
 "/> "
-"<widget name = 'TabWidget.Tab' resolution = '320xY, 256x240' "
-"size = '45, 16' "
-"padding = '0, 0, 0, 0' "
-"/> "
-"<widget name = 'TabWidget.NavButton' resolution = '320xY, 256x240' "
-"size = '32, 18' "
-"padding = '0, 3, 4, 0' "
-"/> "
 "</globals> "
 "<dialog name = 'Launcher' overlays = 'screen'> "
 "<layout type = 'vertical' center = 'true' padding = '16, 16, 8, 8'> "
@@ -423,7 +393,510 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'Launcher' overlays = 'screen' resolution = '320xY, 256x240'> "
+"<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 = 'mcFontClearButton' "
+"height = 'Globals.Line.Height' "
+"width = 'Globals.Line.Height' "
+"/> "
+"<widget name = 'mcFontPath' "
+"height = '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 = '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 = '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> "
+"<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 = 'Layout.Spacing' value = '8'/> "
+"<def var = 'ShowLauncherLogo' 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, 4, 4'> "
 "<widget name = 'Version' "
 "height = 'Globals.Line.Height' "
@@ -464,78 +937,41 @@
 "</layout> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> "
-"<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> "
-"<widget name = 'Choose' "
-"type = 'Button' "
-"/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
-"/> "
-"<space/> "
-"<widget name = 'Up' "
-"type = 'Button' "
-"/> "
-"</layout> "
-"<widget name = 'List'/> "
-"<widget name = 'Path' "
-"height = 'Globals.Line.Height' "
-"/> "
+"<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim'> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8'> "
 "<widget name = 'Headline' "
 "height = 'Globals.Line.Height' "
 "/> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> "
-"<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> "
-"<widget name = 'Ok' "
-"type = 'Button' "
+"<widget name = 'Path' "
+"height = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'Cancel' "
+"<widget name = 'List'/> "
+"<layout type = 'horizontal' padding = '0, 0, 16, 0'> "
+"<widget name = 'Up' "
 "type = 'Button' "
 "/> "
 "<space/> "
-"</layout> "
-"<widget name = 'TabWidget'/> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'> "
-"<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> "
-"<widget name = 'Choose' "
-"type = 'Button' "
-"/> "
 "<widget name = 'Cancel' "
 "type = 'Button' "
 "/> "
-"<space/> "
-"<widget name = 'Up' "
+"<widget name = 'Choose' "
 "type = 'Button' "
 "/> "
 "</layout> "
-"<widget name = 'List'/> "
-"<widget name = 'Path' "
-"height = 'Globals.Line.Height' "
-"/> "
-"<widget name = 'Headline' "
-"height = 'Globals.Line.Height' "
-"/> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'> "
-"<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> "
-"<widget name = 'Ok' "
+"<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, 2'> "
+"<space/> "
+"<widget name = 'Cancel' "
 "type = 'Button' "
 "/> "
-"<widget name = 'Cancel' "
+"<widget name = 'Ok' "
 "type = 'Button' "
 "/> "
-"<space/> "
 "</layout> "
-"<widget name = 'TabWidget'/> "
 "</layout> "
 "</dialog> "
 "<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> "
@@ -712,32 +1148,18 @@
 "/> "
 "</layout> "
 "</dialog> "
-"<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> "
-"<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'> "
-"<widget name = 'Ok' "
-"type = 'Button' "
-"/> "
+"<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, 2'> "
+"<space/> "
 "<widget name = 'Cancel' "
 "type = 'Button' "
 "/> "
-"<space/> "
-"</layout> "
-"<widget name = 'TabWidget'/> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = '320xY, 256x240'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'> "
-"<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'> "
 "<widget name = 'Ok' "
 "type = 'Button' "
 "/> "
-"<widget name = 'Cancel' "
-"type = 'Button' "
-"/> "
-"<space/> "
 "</layout> "
-"<widget name = 'TabWidget'/> "
 "</layout> "
 "</dialog> "
 "<dialog name = 'GameOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'> "
@@ -776,7 +1198,8 @@
 "<layout type = 'vertical' padding = '16, 16, 16, 16'> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
 "<widget name = 'Id' "
-"type = 'ShortOptionsLabel' "
+"width = '35' "
+"height = 'Globals.Line.Height' "
 "/> "
 "<widget name = 'Domain' "
 "type = 'PopUp' "
@@ -784,12 +1207,14 @@
 "</layout> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'> "
 "<widget name = 'Name' "
-"type = 'ShortOptionsLabel' "
+"width = '35' "
+"height = 'Globals.Line.Height' "
 "/> "
 "<widget name = 'Desc' "
 "type = 'PopUp' "
 "/> "
 "</layout> "
+"<space size = '8'/> "
 "<widget name = 'Lang' "
 "type = 'PopUp' "
 "/> "
@@ -831,14 +1256,14 @@
 "<widget name = 'Resume' "
 "type = 'Button' "
 "/> "
-"<space size = '15'/> "
+"<space size = '4'/> "
 "<widget name = 'Load' "
 "type = 'Button' "
 "/> "
 "<widget name = 'Save' "
 "type = 'Button' "
 "/> "
-"<space size = '15'/> "
+"<space size = '4'/> "
 "<widget name = 'Options' "
 "type = 'Button' "
 "/> "
@@ -848,42 +1273,34 @@
 "<widget name = 'About' "
 "type = 'Button' "
 "/> "
-"<space size = '15'/> "
+"<space size = '4'/> "
 "<widget name = 'Quit' "
 "type = 'Button' "
 "/> "
 "</layout> "
 "</dialog> "
 "<dialog name = 'ScummConfig' overlays = 'screen_center'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> "
-"<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> "
-"<space size = '100'/> "
+"<layout type = 'vertical' padding = '8, 8, 8, 8'> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<widget name = 'subSubtitleSpeedDesc' "
+"<widget name = 'vcMusicText' "
 "type = 'OptionsLabel' "
 "/> "
-"<widget name = 'subSubtitleSpeedSlider' "
+"<widget name = 'vcMusicSlider' "
 "type = 'Slider' "
 "/> "
-"<widget name = 'subSubtitleSpeedLabel' "
+"<widget name = 'vcMusicLabel' "
 "type = 'SmallLabel' "
 "/> "
 "</layout> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<widget name = 'subToggleDesc' "
+"<widget name = 'vcSfxText' "
 "type = 'OptionsLabel' "
 "/> "
-"<widget name = 'subToggleButton' "
-"width = '158' "
-"height = 'Globals.Slider.Height' "
+"<widget name = 'vcSfxSlider' "
+"type = 'Slider' "
+"/> "
+"<widget name = 'vcSfxLabel' "
+"type = 'SmallLabel' "
 "/> "
 "</layout> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
@@ -898,55 +1315,62 @@
 "/> "
 "</layout> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<widget name = 'vcSfxText' "
+"<widget name = 'subToggleDesc' "
 "type = 'OptionsLabel' "
 "/> "
-"<widget name = 'vcSfxSlider' "
-"type = 'Slider' "
-"/> "
-"<widget name = 'vcSfxLabel' "
-"type = 'SmallLabel' "
+"<widget name = 'subToggleButton' "
+"width = '92' "
+"height = 'Globals.Slider.Height' "
 "/> "
 "</layout> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'> "
-"<widget name = 'vcMusicText' "
+"<widget name = 'subSubtitleSpeedDesc' "
 "type = 'OptionsLabel' "
 "/> "
-"<widget name = 'vcMusicSlider' "
+"<widget name = 'subSubtitleSpeedSlider' "
 "type = 'Slider' "
 "/> "
-"<widget name = 'vcMusicLabel' "
+"<widget name = 'subSubtitleSpeedLabel' "
 "type = 'SmallLabel' "
 "/> "
 "</layout> "
-"</layout> "
-"</dialog> "
-"<dialog name = 'ScummSaveLoad' overlays = 'screen'> "
-"<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'> "
-"<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'> "
-"<widget name = 'Choose' "
+"<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 = 'Cancel' "
+"<widget name = 'Ok' "
 "type = 'Button' "
 "/> "
-"<space/> "
 "</layout> "
-"<layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'> "
-"<layout type = 'vertical' padding = '0, 0, 0, 0'> "
-"<widget name = 'Thumbnail' "
-"width = '180' "
-"height = '200' "
-"/> "
-"<space/> "
 "</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 = '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' direction = 'bottom2top'> "
-"<layout type = 'horizontal' padding = '0, 0, 16, 0'> "
+"<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' "
 "/> "
@@ -958,12 +1382,6 @@
 "type = 'Button' "
 "/> "
 "</layout> "
-"<widget name = 'HelpText' "
-"height = '220' "
-"/> "
-"<widget name = 'Title' "
-"height = 'Globals.Line.Height' "
-"/> "
 "</layout> "
 "</dialog> "
 "</layout_info> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 334d2a2274..a8d9bf90e6 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index e404aa37da..48c8c181ee 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -23,29 +23,20 @@
  *
  */
 
-<layout_info>
+<layout_info resolution = '-320xY, -256x240'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
 		<def var = 'Font.Height' value = '16' />
 		<def var = 'TabLabelWidth' value = '110' />
 		
-		<def resolution = "320xY, 256x240" var = 'Line.Height' value = '12' />
-		<def resolution = "320xY, 256x240" var = 'Font.Height' value = '10' />
-		<def resolution = "320xY, 256x240" var = 'TabLabelWidth' value = '100' />
-		
 		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
 		<def var = 'About.OuterBorder' value = '80'/>
 		<def var = 'PopUpWidget.labelSpacing' value = '10' />
 		
-		<def resolution = "320xY, 256x240" var = 'WidgetSize' value = 'kNormalWidgetSize' />
-		<def resolution = "320xY, 256x240" var = 'About.OuterBorder' value = '10'/>
-		<def resolution = "320xY, 256x240" var = 'PopUpWidget.labelSpacing' value = '6' />
-		
 		<def var = 'Layout.Spacing' value = '8' />
 		<def var = 'ShowLauncherLogo' value = '0'/>
 		
 		<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/>
-		<def resolution = "320xY, 256x240" var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/>
 
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
@@ -57,10 +48,6 @@
 		<widget name = 'ShortOptionsLabel'
 				size = '60, Globals.Line.Height'
 		/>
-		<widget resolution = "320xY, 256x240" name = 'ShortOptionsLabel'
-				size = '40, Globals.Line.Height'
-		/>
-		
 			
 		<widget name = 'Button'
 				size = 'kBigButtonWidth, kBigButtonHeight'
@@ -69,27 +56,12 @@
 				size = 'kBigSliderWidth, kBigSliderHeight'
 		/>
 		
-		<widget resolution = "320xY, 256x240" name = 'Button'
-				size = 'kButtonWidth, kButtonHeight'
-		/>
-		<widget resolution = "320xY, 256x240" name = 'Slider'
-				size = 'kSliderWidth, kSliderHeight'
-		/>
-		
 		<widget name = 'PopUp'
 				size = '-1, 19'
 		/>
-		<widget name = 'PopUp' resolution = "320xY, 256x240"
-				size = '-1, 15'
-		/>
-		
 		<widget name = 'Checkbox'
 				size = '-1, 14'
 		/>
-		<widget name = 'Checkbox' resolution = "320xY, 256x240"
-				size = '-1, 10'
-		/>
-		
 		<widget name = 'ListWidget'
 				padding = '5, 0, 8, 0'
 		/>
@@ -110,15 +82,6 @@
 				size = '15, 18'
 				padding = '0, 3, 4, 0'
 		/>
-		
-		<widget name = 'TabWidget.Tab' resolution = "320xY, 256x240"
-				size = '45, 16'
-				padding = '0, 0, 0, 0'
-		/>
-		<widget name = 'TabWidget.NavButton' resolution = "320xY, 256x240"
-				size = '32, 18'
-				padding = '0, 3, 4, 0'
-		/>
 	</globals>
 
 	<dialog name = 'Launcher' overlays = 'screen'>
@@ -163,128 +126,45 @@
 		</layout>
 	</dialog>
 	
-	<dialog name = 'Launcher' overlays = 'screen' resolution = "320xY, 256x240">
-		<layout type = 'vertical' center = 'true' padding = '8, 8, 4, 4'>
-			<widget name = 'Version'
+	<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 = 'GameList'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
-				<widget name = 'AddGameButton' 
-						width = '90'
-						height = '12'
-				/>
-				<widget name = 'EditGameButton' 
-						width = '90'
-						height = '12'
-				/>
-				<widget name = 'RemoveGameButton' 
-						width = '90'
-						height = '12'
-				/>
-			</layout>
-			<space size = '4'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
-				<widget name = 'QuitButton' 
-						width = '65'
-						height = '12'
-				/>
-				<widget name = 'AboutButton' 
-						width = '65'
-						height = '12'
-				/>
-				<widget name = 'OptionsButton' 
-						width = '65'
-						height = '12' 
-				/>
-				<widget name = 'StartButton' 
-						width = '65'
-						height = '12'
-				/>
-			</layout>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
+			<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'
 				/>
-				<space/>
-				<widget name = 'Up'
+				<widget name = 'Choose'
 						type = 'Button'
-				/>
+				/>	
 			</layout>
-			<widget name = 'List'/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
 		</layout>
 	</dialog>	
 	
 	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
-			</layout>
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
 			<widget name = 'TabWidget'/>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim' resolution = "320xY, 256x240">
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
+			<layout type = 'horizontal' padding = '16, 16, 16, 16'>
 				<space/>
-				<widget name = 'Up'
+				<widget name = 'Cancel'
 						type = 'Button'
 				/>
-			</layout>
-			<widget name = 'List'/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
-		</layout>
-	</dialog>
-
-	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = "320xY, 256x240">
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'>
 				<widget name = 'Ok' 
 						type = 'Button'
 				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
 			</layout>
-			<widget name = 'TabWidget'/>
 		</layout>
 	</dialog>
 	
-	
-	
 	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
 			<widget name = 'grModePopup'
@@ -315,7 +195,7 @@
 						type = 'OptionsLabel'
 				/>
 				<widget name = 'subToggleButton'
-						width = 'Globals.Slider.Width'
+						width = '150'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
@@ -466,32 +346,17 @@
 	</dialog>
 	
 	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
-				<widget name = 'Ok' 
-						type = 'Button'
-				/>
+		<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
+			<widget name = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '16, 16, 16, 4'>
+				<space/>
 				<widget name = 'Cancel'
 						type = 'Button'
 				/>
-				<space/>
-			</layout>
-			<widget name = 'TabWidget'/>
-		</layout>
-	</dialog>
-	
-	<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim' resolution = "320xY, 256x240">
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'>
 				<widget name = 'Ok' 
 						type = 'Button'
 				/>
-				<widget name = 'Cancel'
-						type = 'Button'
-				/>
-				<space/>
 			</layout>
-			<widget name = 'TabWidget'/>
 		</layout>
 	</dialog>
 	
@@ -535,7 +400,7 @@
 		<layout type = 'vertical' padding = '16, 16, 16, 16'>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
 				<widget name = 'Id'
-						type = 'ShortOptionsLabel'
+						type = 'OptionsLabel'
 				/>
 				<widget name = 'Domain'
 						type = 'PopUp'
@@ -543,7 +408,7 @@
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
 				<widget name = 'Name'
-						type = 'ShortOptionsLabel'
+						type = 'OptionsLabel'
 				/>
 				<widget name = 'Desc'
 						type = 'PopUp'
@@ -617,35 +482,27 @@
 	</dialog>
 	
 	<dialog name = 'ScummConfig' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<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>
-			<space size = '100'/>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subSubtitleSpeedDesc'
+				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'subSubtitleSpeedSlider'
+				<widget name = 'vcMusicSlider'
 						type = 'Slider'
 				/>
-				<widget name = 'subSubtitleSpeedLabel'
+				<widget name = 'vcMusicLabel'
 						type = 'SmallLabel'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subToggleDesc'
+				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'subToggleButton'
-						width = '158'
-						height = 'Globals.Slider.Height'
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
@@ -660,56 +517,71 @@
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSfxText'
+				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
+				<widget name = 'subToggleButton'
+						width = '158'
+						height = 'Globals.Slider.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcMusicText'
+				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'vcMusicSlider'
+				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
 				/>
-				<widget name = 'vcMusicLabel'
+				<widget name = 'subSubtitleSpeedLabel'
 						type = 'SmallLabel'
 				/>
-			</layout>			
+			</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'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
-						type = 'Button'
+	<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 = 'Cancel'
 						type = 'Button'
 				/>
-				<space/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0'>
-					<widget name = 'Thumbnail'
-							width = '180'
-							height = '200'
-					/>
-					<space/>
-				</layout>
-				<widget name = 'List' />
+				<widget name = 'Choose'
+						type = 'Button'
+				/>
 			</layout>
 		</layout>
 	</dialog>
 	
 	<dialog name = 'ScummHelp' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
+		<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'
@@ -722,12 +594,6 @@
 						type = 'Button'
 				/>
 			</layout>
-			<widget name = 'HelpText'
-					height = '220'
-			/>
-			<widget name = 'Title'
-					height = 'Globals.Line.Height'
-			/>
 		</layout>
 	</dialog>
 </layout_info>
\ No newline at end of file
diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip
index 3c68cc7df3..09fd31b8ab 100644
--- a/gui/themes/scummodern.zip
+++ b/gui/themes/scummodern.zip
diff --git a/gui/themes/scummodern/scummodern_layout.stx b/gui/themes/scummodern/scummodern_layout.stx
index 4d7d07c51b..61545d0ffa 100644
--- a/gui/themes/scummodern/scummodern_layout.stx
+++ b/gui/themes/scummodern/scummodern_layout.stx
@@ -23,7 +23,7 @@
  *
  */
 
-<layout_info resolution = '-320xY'>
+<layout_info resolution = '-320xY, -256x240'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
 		<def var = 'Font.Height' value = '16' />
@@ -132,46 +132,44 @@
 	</dialog>
 	
 	<dialog name = 'Browser' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
+		<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'
 				/>
-				<space/>
-				<widget name = 'Up'
+				<widget name = 'Choose'
 						type = 'Button'
-				/>
+				/>	
 			</layout>
-			<widget name = 'List'/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
 		</layout>
 	</dialog>	
 	
 	<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
-				<widget name = 'Ok' 
+		<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 = 'Cancel'
+				<widget name = 'Ok' 
 						type = 'Button'
 				/>
-				<space/>
 			</layout>
-			<widget name = 'TabWidget'/>
 		</layout>
 	</dialog>
 	
-	
-	
 	<dialog name = 'GlobalOptions_Graphics' overlays = 'Dialog.GlobalOptions.TabWidget'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
 			<widget name = 'grModePopup'
@@ -353,17 +351,17 @@
 	</dialog>
 	
 	<dialog name = 'GameOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '16, 16, 16, 16'>
-				<widget name = 'Ok' 
+		<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 = 'Cancel'
+				<widget name = 'Ok' 
 						type = 'Button'
 				/>
-				<space/>
 			</layout>
-			<widget name = 'TabWidget'/>
 		</layout>
 	</dialog>
 	
@@ -489,35 +487,27 @@
 	</dialog>
 	
 	<dialog name = 'ScummConfig' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<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>
-			<space size = '100'/>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true'>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subSubtitleSpeedDesc'
+				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'subSubtitleSpeedSlider'
+				<widget name = 'vcMusicSlider'
 						type = 'Slider'
 				/>
-				<widget name = 'subSubtitleSpeedLabel'
+				<widget name = 'vcMusicLabel'
 						type = 'SmallLabel'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subToggleDesc'
+				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'subToggleButton'
-						width = '158'
-						height = 'Globals.Slider.Height'
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
@@ -532,56 +522,71 @@
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSfxText'
+				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
+				<widget name = 'subToggleButton'
+						width = '158'
+						height = 'Globals.Slider.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcMusicText'
+				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'vcMusicSlider'
+				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
 				/>
-				<widget name = 'vcMusicLabel'
+				<widget name = 'subSubtitleSpeedLabel'
 						type = 'SmallLabel'
 				/>
-			</layout>			
+			</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'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
-						type = 'Button'
+	<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 = 'Cancel'
 						type = 'Button'
 				/>
-				<space/>
-			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' direction = 'right2left' spacing = '16'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0'>
-					<widget name = 'Thumbnail'
-							width = '180'
-							height = '200'
-					/>
-					<space/>
-				</layout>
-				<widget name = 'List' />
+				<widget name = 'Choose'
+						type = 'Button'
+				/>
 			</layout>
 		</layout>
 	</dialog>
 	
 	<dialog name = 'ScummHelp' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
+		<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'
@@ -594,12 +599,6 @@
 						type = 'Button'
 				/>
 			</layout>
-			<widget name = 'HelpText'
-					height = '220'
-			/>
-			<widget name = 'Title'
-					height = 'Globals.Line.Height'
-			/>
 		</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
index a84fa97cd7..75dd08a753 100644
--- a/gui/themes/scummodern/scummodern_layout_320.stx
+++ b/gui/themes/scummodern/scummodern_layout_320.stx
@@ -116,41 +116,43 @@
 	</dialog>
 
 	<dialog name = 'Browser' overlays = 'screen' inset = '16' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
+		<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'
 				/>
-				<space/>
-				<widget name = 'Up'
+				
+				<widget name = 'Choose'
 						type = 'Button'
-				/>
-			</layout>
-			<widget name = 'List'/>
-			<widget name = 'Path'
-					height = 'Globals.Line.Height'
-			/>
-			<widget name = 'Headline'
-					height = 'Globals.Line.Height'
-			/>
+				/>	
+			</layout>			
 		</layout>
 	</dialog>
 
 	<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'>
-				<widget name = 'Ok' 
+		<layout type = 'vertical' padding = '0, 0, 0, 0'>
+			<widget name = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '8, 8, 8, 2'>
+				<space/>
+				<widget name = 'Cancel'
 						type = 'Button'
 				/>
-				<widget name = 'Cancel'
+				
+				<widget name = 'Ok' 
 						type = 'Button'
 				/>
-				<space/>
 			</layout>
-			<widget name = 'TabWidget'/>
 		</layout>
 	</dialog>
 
@@ -335,17 +337,17 @@
 	</dialog>
 
 	<dialog name = 'GameOptions' overlays = 'screen' inset = '16' shading = 'dim'>
-		<layout type = 'vertical' padding = '0, 0, 0, 0' direction = 'bottom2top' spacing = '16'>
-			<layout type = 'horizontal' direction = 'right2left' padding = '8, 8, 8, 2'>
-				<widget name = 'Ok' 
+		<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '16'>
+			<widget name = 'TabWidget'/>
+			<layout type = 'horizontal' padding = '8, 8, 8, 2'>
+				<space/>
+				<widget name = 'Cancel'
 						type = 'Button'
 				/>
-				<widget name = 'Cancel'
+				<widget name = 'Ok' 
 						type = 'Button'
 				/>
-				<space/>
 			</layout>
-			<widget name = 'TabWidget'/>
 		</layout>
 	</dialog>
 
@@ -474,35 +476,27 @@
 	</dialog>
 
 	<dialog name = 'ScummConfig' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<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>
-			<space size = '100'/>
+		<layout type = 'vertical' padding = '8, 8, 8, 8'>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subSubtitleSpeedDesc'
+				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'subSubtitleSpeedSlider'
+				<widget name = 'vcMusicSlider'
 						type = 'Slider'
 				/>
-				<widget name = 'subSubtitleSpeedLabel'
+				<widget name = 'vcMusicLabel'
 						type = 'SmallLabel'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'subToggleDesc'
+				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'subToggleButton'
-						width = 'Globals.Slider.Width'
-						height = 'Globals.Slider.Height'
+				<widget name = 'vcSfxSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'vcSfxLabel'
+						type = 'SmallLabel'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
@@ -517,48 +511,63 @@
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcSfxText'
+				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'vcSfxSlider'
-						type = 'Slider'
-				/>
-				<widget name = 'vcSfxLabel'
-						type = 'SmallLabel'
+				<widget name = 'subToggleButton'
+						width = '92'
+						height = 'Globals.Slider.Height'
 				/>
 			</layout>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
-				<widget name = 'vcMusicText'
+				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
 				/>
-				<widget name = 'vcMusicSlider'
+				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
 				/>
-				<widget name = 'vcMusicLabel'
+				<widget name = 'subSubtitleSpeedLabel'
 						type = 'SmallLabel'
 				/>
-			</layout>			
+			</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'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' center = 'true' direction = 'bottom2top'>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0' direction = 'right2left'>
-				<widget name = 'Choose'
-						type = 'Button'
-				/>
+	<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 = 'Cancel'
 						type = 'Button'
 				/>
-				<space/>
-			</layout>
-			<widget name = 'List' />
-			<widget name = 'Title' height = 'Globals.Line.Height'/>
+				<widget name = 'Choose'
+						type = 'Button'
+				/>	
+			</layout>	
 		</layout>
 	</dialog>
 
 	<dialog name = 'ScummHelp' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8' direction = 'bottom2top'>
+		<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'
@@ -571,12 +580,6 @@
 						type = 'Button'
 				/>
 			</layout>
-			<widget name = 'HelpText'
-					height = '170'
-			/>
-			<widget name = 'Title'
-					height = 'Globals.Line.Height'
-			/>
 		</layout>
 	</dialog>
 </layout_info>