diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index d53ae588f8b..8b0a5c2e36e 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -44,7 +44,8 @@ RemapDialog::RemapDialog()
 	_keymapper = g_system->getEventManager()->getKeymapper();
 	assert(_keymapper);
 
-	_kmPopUp = new GUI::PopUpWidget(this, "KeyRemapper.Popup", "Keymap: ");
+	_kmPopUpDesc = new GUI::StaticTextWidget(this, "KeyRemapper.PopupDesc", "Keymap:");
+	_kmPopUp = new GUI::PopUpWidget(this, "KeyRemapper.Popup");
 
 	_scrollBar = new GUI::ScrollBarWidget(this, 0, 0, 0, 0);
 
diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h
index abec8a2d5ce..88f099520ab 100644
--- a/backends/keymapper/remap-dialog.h
+++ b/backends/keymapper/remap-dialog.h
@@ -76,6 +76,7 @@ protected:
 
 	Rect _keymapArea;
 
+	GUI::StaticTextWidget *_kmPopUpDesc;
 	GUI::PopUpWidget *_kmPopUp;
 	//GUI::ContainerWidget *_container;
 	GUI::ScrollBarWidget *_scrollBar;
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index 9be652b8d69..cc756a96b68 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -79,10 +79,10 @@ PopUpDialog::PopUpDialog(PopUpWidget *boss, int clickX, int clickY)
 	_selection = _popUpBoss->_selectedItem;
 
 	// Calculate real popup dimensions
-	_x = _popUpBoss->getAbsX() + _popUpBoss->_labelWidth + _popUpBoss->_labelSpacing;
+	_x = _popUpBoss->getAbsX();
 	_y = _popUpBoss->getAbsY() - _popUpBoss->_selectedItem * kLineHeight;
 	_h = _popUpBoss->_entries.size() * kLineHeight + 2;
-	_w = _popUpBoss->_w - kLineHeight + 2 - _popUpBoss->_labelWidth - _popUpBoss->_labelSpacing;
+	_w = _popUpBoss->_w - kLineHeight + 2;
 
 	_leftPadding = _popUpBoss->_leftPadding;
 	_rightPadding = _popUpBoss->_rightPadding;
@@ -356,13 +356,12 @@ void PopUpDialog::drawMenuEntry(int entry, bool hilite) {
 // PopUpWidget
 //
 
-PopUpWidget::PopUpWidget(GuiObject *boss, const String &name, const String &label)
-	: Widget(boss, name), CommandSender(boss), _label(label), _labelWidth(0) {
+PopUpWidget::PopUpWidget(GuiObject *boss, const String &name)
+	: Widget(boss, name), CommandSender(boss) {
 	setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_IGNORE_DRAG);
 	_type = kPopUpWidget;
 
 	_selectedItem = -1;
-	_labelWidth = g_gui.xmlEval()->getVar("Globals.PopUpWidget.labelWidth");
 }
 
 void PopUpWidget::handleMouseDown(int x, int y, int button, int clickCount) {
@@ -394,10 +393,8 @@ void PopUpWidget::handleMouseWheel(int x, int y, int direction) {
 }
 
 void PopUpWidget::reflowLayout() {
-	_labelWidth = g_gui.xmlEval()->getVar("Globals.PopUpWidget.labelWidth");
 	_leftPadding = g_gui.xmlEval()->getVar("Globals.PopUpWidget.Padding.Left", 0);
 	_rightPadding = g_gui.xmlEval()->getVar("Globals.PopUpWidget.Padding.Right", 0);
-	_labelSpacing = g_gui.xmlEval()->getVar("Globals.PopUpWidget.labelSpacing", 10);
 
 	Widget::reflowLayout();
 }
@@ -435,17 +432,10 @@ void PopUpWidget::setSelectedTag(uint32 tag) {
 }
 
 void PopUpWidget::drawWidget() {
-	int x = _x + _labelWidth + _labelSpacing;
-	int w = _w - _labelWidth - _labelSpacing;
-
-	// Draw the label, if any
-	if (_labelWidth > 0)
-		g_gui.theme()->drawText(Common::Rect(_x+2,_y+3,_x+2+_labelWidth, _y+3+g_gui.theme()->getFontHeight()), _label, _state, Graphics::kTextAlignRight);
-
 	Common::String sel;
 	if (_selectedItem >= 0)
 		sel = _entries[_selectedItem].name;
-	g_gui.theme()->drawPopUpWidget(Common::Rect(x, _y, x+w, _y+_h), sel, _leftPadding, _state, Graphics::kTextAlignLeft);
+	g_gui.theme()->drawPopUpWidget(Common::Rect(_x, _y, _x + _w, _y + _h), sel, _leftPadding, _state, Graphics::kTextAlignLeft);
 }
 
 } // End of namespace GUI
diff --git a/gui/PopUpWidget.h b/gui/PopUpWidget.h
index 23d57579922..050dc0936d3 100644
--- a/gui/PopUpWidget.h
+++ b/gui/PopUpWidget.h
@@ -55,15 +55,11 @@ protected:
 	EntryList		_entries;
 	int				_selectedItem;
 
-	String			_label;
-	int				_labelWidth;
-
 	int				_leftPadding;
 	int				_rightPadding;
-	int				_labelSpacing;
 
 public:
-	PopUpWidget(GuiObject *boss, const String &name, const String &label);
+	PopUpWidget(GuiObject *boss, const String &name);
 
 	void handleMouseDown(int x, int y, int button, int clickCount);
 	void handleMouseWheel(int x, int y, int direction);
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 3d056486e04..dd32ff6f2f3 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -31,7 +31,6 @@
 #include "common/fs.h"
 #include "graphics/surface.h"
 #include "graphics/fontman.h"
-#include "graphics/font.h"
 
 #define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.4"
 
diff --git a/gui/ThemeEval.cpp b/gui/ThemeEval.cpp
index d50564462c5..88727412286 100644
--- a/gui/ThemeEval.cpp
+++ b/gui/ThemeEval.cpp
@@ -66,23 +66,39 @@ bool ThemeEval::getWidgetData(const Common::String &widget, int16 &x, int16 &y,
 	return _layouts[dialogName]->getWidgetData(widgetName, x, y, w, h);
 }
 
+Graphics::TextAlign ThemeEval::getWidgetTextHAlign(const Common::String &widget) {
+	Common::StringTokenizer tokenizer(widget, ".");
+
+	if (widget.hasPrefix("Dialog."))
+		tokenizer.nextToken();
+
+	Common::String dialogName = "Dialog." + tokenizer.nextToken();
+	Common::String widgetName = tokenizer.nextToken();
+
+	if (!_layouts.contains(dialogName))
+		return Graphics::kTextAlignInvalid;
+
+	return _layouts[dialogName]->getWidgetTextHAlign(widgetName);
+}
 
 void ThemeEval::addWidget(const Common::String &name, int w, int h, const Common::String &type, bool enabled, Graphics::TextAlign align) {
 	int typeW = -1;
 	int typeH = -1;
+	Graphics::TextAlign typeAlign = Graphics::kTextAlignInvalid;
 
 	if (!type.empty()) {
 		typeW = getVar("Globals." + type + ".Width", -1);
 		typeH = getVar("Globals." + type + ".Height", -1);
+		typeAlign = (Graphics::TextAlign)getVar("Globals." + type + ".Align", Graphics::kTextAlignInvalid);
 	}
 
 	ThemeLayoutWidget *widget = new ThemeLayoutWidget(_curLayout.top(), name,
 								typeW == -1 ? w : typeW,
-								typeH == -1 ? h : typeH);
+								typeH == -1 ? h : typeH,
+								typeAlign == Graphics::kTextAlignInvalid ? align : typeAlign);
 
 	_curLayout.top()->addChild(widget);
 	setVar(_curDialog + "." + name + ".Enabled", enabled ? 1 : 0);
-	setVar(_curDialog + "." + name + ".Align", align);
 }
 
 void ThemeEval::addDialog(const Common::String &name, const Common::String &overlays, bool enabled, int inset) {
diff --git a/gui/ThemeEval.h b/gui/ThemeEval.h
index 2e15f604ed2..c484a49564d 100644
--- a/gui/ThemeEval.h
+++ b/gui/ThemeEval.h
@@ -88,6 +88,8 @@ public:
 
 	bool getWidgetData(const Common::String &widget, int16 &x, int16 &y, uint16 &w, uint16 &h);
 
+	Graphics::TextAlign getWidgetTextHAlign(const Common::String &widget);
+
 #ifdef LAYOUT_DEBUG_DIALOG
 	void debugDraw(Graphics::Surface *screen, const Graphics::Font *font) {
 		_layouts[LAYOUT_DEBUG_DIALOG]->debugDraw(screen, font);
diff --git a/gui/ThemeLayout.cpp b/gui/ThemeLayout.cpp
index 3afded5504e..3c930db73c2 100644
--- a/gui/ThemeLayout.cpp
+++ b/gui/ThemeLayout.cpp
@@ -70,6 +70,22 @@ bool ThemeLayout::getWidgetData(const Common::String &name, int16 &x, int16 &y,
 	return false;
 }
 
+Graphics::TextAlign ThemeLayout::getWidgetTextHAlign(const Common::String &name) {
+	if (name.empty()) {
+		assert(getLayoutType() == kLayoutMain);
+		return _textHAlign;
+	}
+
+	Graphics::TextAlign res;
+
+	for (uint i = 0; i < _children.size(); ++i) {
+		if ((res = _children[i]->getWidgetTextHAlign(name)) != Graphics::kTextAlignInvalid)
+			return res;
+	}
+
+	return Graphics::kTextAlignInvalid;
+}
+
 int16 ThemeLayoutStacked::getParentWidth() {
 	ThemeLayout *p = _parent;
 	int width = 0;
@@ -135,6 +151,14 @@ bool ThemeLayoutWidget::getWidgetData(const Common::String &name, int16 &x, int1
 	return false;
 }
 
+Graphics::TextAlign ThemeLayoutWidget::getWidgetTextHAlign(const Common::String &name) {
+	if (name == _name) {
+		return _textHAlign;
+	}
+
+	return Graphics::kTextAlignInvalid;
+}
+
 void ThemeLayoutMain::reflowLayout() {
 	assert(_children.size() <= 1);
 
diff --git a/gui/ThemeLayout.h b/gui/ThemeLayout.h
index ac17e5744bd..3d367df147d 100644
--- a/gui/ThemeLayout.h
+++ b/gui/ThemeLayout.h
@@ -52,7 +52,8 @@ public:
 
 	ThemeLayout(ThemeLayout *p) :
 		_parent(p), _x(0), _y(0), _w(-1), _h(-1),
-		_centered(false), _defaultW(-1), _defaultH(-1) { }
+		_centered(false), _defaultW(-1), _defaultH(-1),
+		_textHAlign(Graphics::kTextAlignInvalid) {}
 
 	virtual ~ThemeLayout() {
 		for (uint i = 0; i < _children.size(); ++i)
@@ -90,6 +91,7 @@ protected:
 
 	void setWidth(int16 width) { _w = width; }
 	void setHeight(int16 height) { _h = height; }
+	void setTextHAlign(Graphics::TextAlign align) { _textHAlign = align; }
 
 	virtual LayoutType getLayoutType() = 0;
 
@@ -98,8 +100,12 @@ protected:
 public:
 	virtual bool getWidgetData(const Common::String &name, int16 &x, int16 &y, uint16 &w, uint16 &h);
 
+	virtual Graphics::TextAlign getWidgetTextHAlign(const Common::String &name);
+
 	void importLayout(ThemeLayout *layout);
 
+	Graphics::TextAlign getTextHAlign() { return _textHAlign; }
+
 #ifdef LAYOUT_DEBUG_DIALOG
 	void debugDraw(Graphics::Surface *screen, const Graphics::Font *font);
 
@@ -113,6 +119,7 @@ protected:
 	Common::Array<ThemeLayout *> _children;
 	bool _centered;
 	int16 _defaultW, _defaultH;
+	Graphics::TextAlign _textHAlign;
 };
 
 class ThemeLayoutMain : public ThemeLayout {
@@ -190,12 +197,16 @@ protected:
 
 class ThemeLayoutWidget : public ThemeLayout {
 public:
-	ThemeLayoutWidget(ThemeLayout *p, const Common::String &name, int16 w, int16 h) : ThemeLayout(p), _name(name) {
+	ThemeLayoutWidget(ThemeLayout *p, const Common::String &name, int16 w, int16 h, Graphics::TextAlign align) : ThemeLayout(p), _name(name) {
 		_w = _defaultW = w;
 		_h = _defaultH = h;
+
+		setTextHAlign(align);
 	}
 
 	bool getWidgetData(const Common::String &name, int16 &x, int16 &y, uint16 &w, uint16 &h);
+	Graphics::TextAlign getWidgetTextHAlign(const Common::String &name);
+
 	void reflowLayout() {}
 
 #ifdef LAYOUT_DEBUG_DIALOG
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index 31d1deb6563..2e7e2d32149 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -800,6 +800,15 @@ bool ThemeParser::parseCommonLayoutProps(ParserNode *node, const Common::String
 		_theme->getEvaluator()->setVar(var + "Padding.Bottom", paddingB);
 	}
 
+
+	if (node->values.contains("textalign")) {
+		Graphics::TextAlign alignH = Graphics::kTextAlignLeft;
+
+		if((alignH = parseTextHAlign(node->values["textalign"])) == Graphics::kTextAlignInvalid)
+			return parserError("Invalid value for text alignment.");
+
+		_theme->getEvaluator()->setVar(var + "Align", alignH);
+	}
 	return true;
 }
 
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index ce44341e140..6982550cbdf 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -133,7 +133,9 @@ protected:
 	StaticTextWidget *_extraPathWidget;
 	StaticTextWidget *_savePathWidget;
 
+	StaticTextWidget *_langPopUpDesc;
 	PopUpWidget *_langPopUp;
+	StaticTextWidget *_platformPopUpDesc;
 	PopUpWidget *_platformPopUp;
 
 	CheckboxWidget *_globalGraphicsOverride;
@@ -173,7 +175,8 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 	_descriptionWidget = new EditTextWidget(tab, "GameOptions_Game.Desc", description);
 
 	// Language popup
-	_langPopUp = new PopUpWidget(tab, "GameOptions_Game.Lang", "Language:");
+	_langPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.LangPopupDesc", "Language:");
+	_langPopUp = new PopUpWidget(tab, "GameOptions_Game.LangPopup");
 	_langPopUp->appendEntry("<default>");
 	_langPopUp->appendEntry("");
 	const Common::LanguageDescription *l = Common::g_languages;
@@ -182,7 +185,8 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 	}
 
 	// Platform popup
-	_platformPopUp = new PopUpWidget(tab, "GameOptions_Game.Platform", "Platform:");
+	_platformPopUpDesc = new StaticTextWidget(tab, "GameOptions_Game.PlatformPopupDesc", "Platform:");
+	_platformPopUp = new PopUpWidget(tab, "GameOptions_Game.PlatformPopup");
 	_platformPopUp->appendEntry("<default>");
 	_platformPopUp->appendEntry("");
 	const Common::PlatformDescription *p = Common::g_platforms;
diff --git a/gui/options.cpp b/gui/options.cpp
index 2e23a4dc61d..5d603fa25e9 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -477,7 +477,9 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 void OptionsDialog::setGraphicSettingsState(bool enabled) {
 	_enableGraphicSettings = enabled;
 
+	_gfxPopUpDesc->setEnabled(enabled);
 	_gfxPopUp->setEnabled(enabled);
+	_renderModePopUpDesc->setEnabled(enabled);
 	_renderModePopUp->setEnabled(enabled);
 #ifndef SMALL_SCREEN_DEVICE
 	_fullscreenCheckbox->setEnabled(enabled);
@@ -488,8 +490,11 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
 void OptionsDialog::setAudioSettingsState(bool enabled) {
 	_enableAudioSettings = enabled;
 
+	_midiPopUpDesc->setEnabled(enabled);
 	_midiPopUp->setEnabled(enabled);
+	_oplPopUpDesc->setEnabled(enabled);
 	_oplPopUp->setEnabled(enabled);
+	_outputRatePopUpDesc->setEnabled(enabled);
 	_outputRatePopUp->setEnabled(enabled);
 }
 
@@ -541,7 +546,8 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const String &prefix) {
 	const OSystem::GraphicsMode *gm = g_system->getSupportedGraphicsModes();
 
 	// The GFX mode popup
-	_gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup", "Graphics mode:");
+	_gfxPopUpDesc = new StaticTextWidget(boss, prefix + "grModePopupDesc", "Graphics mode:");
+	_gfxPopUp = new PopUpWidget(boss, prefix + "grModePopup");
 
 	_gfxPopUp->appendEntry("<default>");
 	_gfxPopUp->appendEntry("");
@@ -551,7 +557,8 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const String &prefix) {
 	}
 
 	// RenderMode popup
-	_renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup", "Render mode:");
+	_renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", "Render mode:");
+	_renderModePopUp = new PopUpWidget(boss, prefix + "grRenderPopup");
 	_renderModePopUp->appendEntry("<default>", Common::kRenderDefault);
 	_renderModePopUp->appendEntry("");
 	const Common::RenderModeDescription *rm = Common::g_renderModes;
@@ -570,7 +577,8 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const String &prefix) {
 
 void OptionsDialog::addAudioControls(GuiObject *boss, const String &prefix) {
 	// The MIDI mode popup & a label
-	_midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", "Music driver:");
+	_midiPopUpDesc = new StaticTextWidget(boss, prefix + "auMidiPopupDesc", "Music driver:");
+	_midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup");
 
 	// Populate it
 	const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
@@ -580,7 +588,8 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const String &prefix) {
 	}
 
 	// The OPL emulator popup & a label
-	_oplPopUp = new PopUpWidget(boss, prefix + "auOPLPopup", "AdLib emulator:");
+	_oplPopUpDesc = new StaticTextWidget(boss, prefix + "auOPLPopupDesc", "AdLib emulator:");
+	_oplPopUp = new PopUpWidget(boss, prefix + "auOPLPopup");
 
 	// Populate it
 	const OPL::Config::EmulatorDescription *ed = OPL::Config::getAvailable();
@@ -590,7 +599,8 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const String &prefix) {
 	}
 
 	// Sample rate settings
-	_outputRatePopUp = new PopUpWidget(boss, prefix + "auSampleRatePopup", "Output rate:");
+	_outputRatePopUpDesc = new StaticTextWidget(boss, prefix + "auSampleRatePopupDesc", "Output rate:");
+	_outputRatePopUp = new PopUpWidget(boss, prefix + "auSampleRatePopup");
 
 	for (int i = 0; outputRateLabels[i]; i++) {
 		_outputRatePopUp->appendEntry(outputRateLabels[i], outputRateValues[i]);
@@ -754,12 +764,14 @@ GlobalOptionsDialog::GlobalOptionsDialog()
 	_curTheme = new StaticTextWidget(tab, "GlobalOptions_Misc.CurTheme", g_gui.theme()->getThemeName());
 
 
-	_rendererPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.Renderer", "GUI Renderer:");
+	_rendererPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.RendererPopupDesc", "GUI Renderer:");
+	_rendererPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.RendererPopup");
 
 	for (uint i = 1; i < GUI::ThemeEngine::_rendererModesSize; ++i)
 		_rendererPopUp->appendEntry(GUI::ThemeEngine::_rendererModes[i].name, GUI::ThemeEngine::_rendererModes[i].mode);
 
-	_autosavePeriodPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.AutosavePeriod", "Autosave:");
+	_autosavePeriodPopUpDesc = new StaticTextWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopupDesc", "Autosave:");
+	_autosavePeriodPopUp = new PopUpWidget(tab, "GlobalOptions_Misc.AutosavePeriodPopup");
 
 	for (int i = 0; savePeriodLabels[i]; i++) {
 		_autosavePeriodPopUp->appendEntry(savePeriodLabels[i], savePeriodValues[i]);
diff --git a/gui/options.h b/gui/options.h
index 4edf12a0dff..3a5cd31c178 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -91,17 +91,22 @@ private:
 	// Graphics controls
 	//
 	bool _enableGraphicSettings;
+	StaticTextWidget *_gfxPopUpDesc;
 	PopUpWidget *_gfxPopUp;
 	CheckboxWidget *_fullscreenCheckbox;
 	CheckboxWidget *_aspectCheckbox;
+	StaticTextWidget *_renderModePopUpDesc;
 	PopUpWidget *_renderModePopUp;
 
 	//
 	// Audio controls
 	//
 	bool _enableAudioSettings;
+	StaticTextWidget *_midiPopUpDesc;
 	PopUpWidget *_midiPopUp;
+	StaticTextWidget *_oplPopUpDesc;
 	PopUpWidget *_oplPopUp;
+	StaticTextWidget *_outputRatePopUpDesc;
 	PopUpWidget *_outputRatePopUp;
 
 	//
@@ -175,7 +180,9 @@ protected:
 	// Misc controls
 	//
 	StaticTextWidget *_curTheme;
+	StaticTextWidget *_rendererPopUpDesc;
 	PopUpWidget *_rendererPopUp;
+	StaticTextWidget *_autosavePeriodPopUpDesc;
 	PopUpWidget *_autosavePeriodPopUp;
 };
 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 99ac80adc5c..e4df6b05094 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -329,14 +329,13 @@
 "<def var='Line.Height' value='16' /> "
 "<def var='Font.Height' value='16' /> "
 "<def var='About.OuterBorder' value='80'/> "
-"<def var='PopUpWidget.labelSpacing' value='10' /> "
-"<def var='PopUpWidget.labelWidth' value='110' /> "
 "<def var='Layout.Spacing' value='8' /> "
 "<def var='ShowLauncherLogo' value='0'/> "
 "<def var='ShowGlobalMenuLogo' value='0'/> "
 "<def var='ScummSaveLoad.ExtInfo.Visible' value='1'/> "
 "<widget name='OptionsLabel' "
 "size='110,Globals.Line.Height' "
+"textalign='right' "
 "/> "
 "<widget name='SmallLabel' "
 "size='24,Globals.Line.Height' "
@@ -456,12 +455,22 @@
 "</dialog> "
 "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
 "<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='grModePopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='grRenderPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
 "<widget name='grAspectCheckbox' "
 "type='Checkbox' "
 "/> "
@@ -472,29 +481,42 @@
 "</dialog> "
 "<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
 "<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='auMidiPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='auOPLPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='auSampleRatePopup' "
 "type='PopUp' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subToggleButton' "
 "width='150' "
 "height='Globals.Slider.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
@@ -511,7 +533,6 @@
 "<layout type='horizontal' padding='0,0,0,0'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='vcMusicSlider' "
 "type='Slider' "
@@ -523,7 +544,6 @@
 "<layout type='horizontal' padding='0,0,0,0'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='vcSfxSlider' "
 "type='Slider' "
@@ -535,7 +555,6 @@
 "<layout type='horizontal' padding='0,0,0,0'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='vcSpeechSlider' "
 "type='Slider' "
@@ -554,7 +573,7 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='mcFontButton' "
 "type='Button' "
 "/> "
@@ -591,7 +610,7 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='SaveButton' "
 "type='Button' "
 "/> "
@@ -599,7 +618,7 @@
 "height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='ThemeButton' "
 "type='Button' "
 "/> "
@@ -607,7 +626,7 @@
 "height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='ExtraButton' "
 "type='Button' "
 "/> "
@@ -627,7 +646,7 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='ThemeButton' "
 "type='Button' "
 "/> "
@@ -635,12 +654,22 @@
 "height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<widget name='Renderer' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='RendererPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='RendererPopup' "
 "type='PopUp' "
 "/> "
-"<widget name='AutosavePeriod' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='AutosavePeriodPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
 "<widget name='KeysButton' "
 "type='Button' "
 "/> "
@@ -718,35 +747,43 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='Id' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='Domain' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='Name' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='Desc' "
 "type='PopUp' "
 "/> "
 "</layout> "
-"<widget name='Lang' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='LangPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
-"<widget name='Platform' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"type='OptionsLabel' "
+"/> "
+"<widget name='PlatformPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
 "<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
 "<layout type='vertical' padding='16,16,16,16'> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='Savepath' "
 "type='Button' "
 "/> "
@@ -754,7 +791,7 @@
 "height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='Extrapath' "
 "type='Button' "
 "/> "
@@ -762,7 +799,7 @@
 "height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> "
 "<widget name='Gamepath' "
 "type='Button' "
 "/> "
@@ -888,20 +925,19 @@
 "/> "
 "</layout> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<space size='8' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subToggleButton' "
 "width='158' "
 "height='Globals.Slider.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
@@ -911,7 +947,7 @@
 "/> "
 "</layout> "
 "<space size='60'/> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='10'> "
 "<widget name='Keys' "
 "type='Button' "
 "/> "
@@ -1005,8 +1041,6 @@
 "<def var='Line.Height' value='12' /> "
 "<def var='Font.Height' value='10' /> "
 "<def var='About.OuterBorder' value='10'/> "
-"<def var='PopUpWidget.labelSpacing' value='6' /> "
-"<def var='PopUpWidget.labelWidth' value='100' /> "
 "<def var='Layout.Spacing' value='8'/> "
 "<def var='ShowLauncherLogo' value='0'/> "
 "<def var='ShowGlobalMenuLogo' value='0'/> "
@@ -1019,6 +1053,7 @@
 "/> "
 "<widget name='OptionsLabel' "
 "size='110,Globals.Line.Height' "
+"textalign='right' "
 "/> "
 "<widget name='SmallLabel' "
 "size='18,Globals.Line.Height' "
@@ -1128,12 +1163,22 @@
 "</dialog> "
 "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'> "
 "<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grModePopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='grModePopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='grRenderPopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='grRenderPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
 "<widget name='grAspectCheckbox' "
 "type='Checkbox' "
 "/> "
@@ -1144,29 +1189,42 @@
 "</dialog> "
 "<dialog name='GlobalOptions_Audio' overlays='Dialog.GlobalOptions.TabWidget'> "
 "<layout type='vertical' padding='16,16,16,16' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auMidiPopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='auMidiPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auOPLPopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='auOPLPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='auSampleRatePopupDesc' "
+"type='OptionsLabel' "
+"/> "
 "<widget name='auSampleRatePopup' "
 "type='PopUp' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subToggleButton' "
 "width='128' "
 "height='Globals.Slider.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
@@ -1179,10 +1237,9 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='vcMusicSlider' "
 "type='Slider' "
@@ -1191,10 +1248,9 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='vcSfxSlider' "
 "type='Slider' "
@@ -1203,10 +1259,9 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='vcSpeechSlider' "
 "type='Slider' "
@@ -1215,7 +1270,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<space size='110' /> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
@@ -1225,7 +1280,7 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='16' center='true'> "
 "<widget name='mcFontButton' "
 "type='Button' "
 "/> "
@@ -1246,7 +1301,7 @@
 "<widget name='mcGSCheckbox' "
 "type='Checkbox' "
 "/> "
-"<layout type='horizontal' padding='0,0,0,0'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='mcMidiGainText' "
 "type='OptionsLabel' "
 "/> "
@@ -1306,12 +1361,26 @@
 "height='Globals.Line.Height' "
 "/> "
 "</layout> "
-"<widget name='Renderer' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='RendererPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='RendererPopup' "
 "type='PopUp' "
 "/> "
-"<widget name='AutosavePeriod' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='AutosavePeriodPopupDesc' "
+"width='80' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='AutosavePeriodPopup' "
 "type='PopUp' "
 "/> "
+"</layout> "
 "<widget name='KeysButton' "
 "type='Button' "
 "/> "
@@ -1389,7 +1458,7 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='Id' "
 "width='35' "
 "height='Globals.Line.Height' "
@@ -1399,7 +1468,7 @@
 "type='PopUp' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='Name' "
 "width='35' "
 "height='Globals.Line.Height' "
@@ -1410,13 +1479,27 @@
 "/> "
 "</layout> "
 "<space size='8'/> "
-"<widget name='Lang' "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='LangPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='LangPopup' "
 "type='PopUp' "
 "/> "
-"<widget name='Platform' "
+"</layout> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
+"<widget name='PlatformPopupDesc' "
+"width='60' "
+"height='Globals.Line.Height' "
+"textalign='right' "
+"/> "
+"<widget name='PlatformPopup' "
 "type='PopUp' "
 "/> "
 "</layout> "
+"</layout> "
 "</dialog> "
 "<dialog name='GameOptions_Paths' overlays='Dialog.GameOptions.TabWidget' shading='dim'> "
 "<layout type='vertical' padding='16,16,16,16'> "
@@ -1526,7 +1609,7 @@
 "</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'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcMusicText' "
 "type='OptionsLabel' "
 "/> "
@@ -1537,7 +1620,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSfxText' "
 "type='OptionsLabel' "
 "/> "
@@ -1548,7 +1631,7 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='vcSpeechText' "
 "type='OptionsLabel' "
 "/> "
@@ -1559,27 +1642,26 @@
 "type='SmallLabel' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8' center='true'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<space size='110' /> "
 "<widget name='vcMuteCheckbox' "
 "type='Checkbox' "
 "width='80' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<space size='4' /> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='subToggleDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subToggleButton' "
 "width='128' "
 "height='Globals.Slider.Height' "
 "/> "
 "</layout> "
-"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
+"<layout type='horizontal' padding='0,0,0,0' spacing='6' center='true'> "
 "<widget name='subSubtitleSpeedDesc' "
 "type='OptionsLabel' "
-"textalign='right' "
 "/> "
 "<widget name='subSubtitleSpeedSlider' "
 "type='Slider' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 15fed944f33..daefaa9d780 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index a50e17ad25b..5569f685235 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -29,8 +29,10 @@
 		<def var = 'Font.Height' value = '16' />
 		
 		<def var = 'About.OuterBorder' value = '80'/>
+<!--
 		<def var = 'PopUpWidget.labelSpacing' value = '10' />
 		<def var = 'PopUpWidget.labelWidth' value = '110' />
+-->
 		
 		<def var = 'Layout.Spacing' value = '8' />
 		<def var = 'ShowLauncherLogo' value = '0'/>
@@ -40,6 +42,7 @@
 
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
+				textalign = 'right'
 		/>
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
@@ -166,12 +169,22 @@
 	
 	<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'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grModePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grModePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grRenderPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grRenderPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name = 'grAspectCheckbox'
 					type = 'Checkbox'
 			/>
@@ -183,29 +196,42 @@
 	
 	<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 = 'auOPLPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'auMidiPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auMidiPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'auOPLPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auOPLPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'auSampleRatePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auSampleRatePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '150'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
@@ -223,7 +249,6 @@
 				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 					<widget name = 'vcMusicText'
 							type = 'OptionsLabel'
-							textalign = 'right'
 					/>
 					<widget name = 'vcMusicSlider'
 							type = 'Slider'
@@ -235,7 +260,6 @@
 				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 					<widget name = 'vcSfxText'
 							type = 'OptionsLabel'
-							textalign = 'right'
 					/>
 					<widget name = 'vcSfxSlider'
 							type = 'Slider'
@@ -247,7 +271,6 @@
 				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 					<widget name = 'vcSpeechText'
 							type = 'OptionsLabel'
-							textalign = 'right'
 					/>
 					<widget name = 'vcSpeechSlider'
 							type = 'Slider'
@@ -267,7 +290,7 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'mcFontButton'
 						type = 'Button'
 				/>
@@ -305,7 +328,7 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'SaveButton'
 						type = 'Button'
 				/>
@@ -313,7 +336,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'ThemeButton'
 						type = 'Button'
 				/>
@@ -321,7 +344,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'ExtraButton'
 						type = 'Button'
 				/>
@@ -342,7 +365,7 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'ThemeButton'
 						type = 'Button'
 				/>
@@ -350,12 +373,22 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<widget name = 'Renderer'
-					type = 'PopUp'
-			/>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'RendererPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'RendererPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'AutosavePeriodPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'AutosavePeriodPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name='KeysButton' 
  				     type='Button' 
 			/> 
@@ -440,36 +473,44 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Id'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'Domain'
 						type = 'PopUp'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Name'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'Desc'
 						type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'LangPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'LangPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'PlatformPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'PlatformPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 	
 	<dialog name = 'GameOptions_Paths' overlays = 'Dialog.GameOptions.TabWidget' shading = 'dim'>
 		<layout type = 'vertical' padding = '16, 16, 16, 16'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Savepath'
 						type = 'Button'
 				/>
@@ -477,7 +518,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Extrapath'
 						type = 'Button'
 				/>
@@ -485,7 +526,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Gamepath'
 						type = 'Button'
 				/>
@@ -615,20 +656,19 @@
 					/>
 				</layout>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<space size = '8' />
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '158'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
@@ -638,7 +678,7 @@
 				/>
 			</layout>
 			<space size = '60'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'Keys'
 						type = 'Button'
 				/>	
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 89b894de84e..a557b14f656 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -29,8 +29,6 @@
 		<def var = 'Font.Height' value = '10' />
 
 		<def var = 'About.OuterBorder' value = '10'/>
-		<def var = 'PopUpWidget.labelSpacing' value = '6' />
-		<def var = 'PopUpWidget.labelWidth' value = '100' />
 
 		<def var = 'Layout.Spacing' value = '8'/>
 
@@ -48,6 +46,7 @@
 
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
+				textalign = 'right'
 		/>
 		<widget name = 'SmallLabel'
 				size = '18, Globals.Line.Height'
@@ -163,12 +162,22 @@
 
 	<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'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'grModePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grModePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'grRenderPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grRenderPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name = 'grAspectCheckbox'
 					type = 'Checkbox'
 			/>
@@ -180,29 +189,42 @@
 
 	<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 = 'auOPLPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'auMidiPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auMidiPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'auOPLPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auOPLPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'auSampleRatePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auSampleRatePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '128'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
@@ -216,10 +238,9 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'vcMusicSlider'
 						type = 'Slider'
@@ -228,10 +249,9 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'vcSfxSlider'
 						type = 'Slider'
@@ -240,10 +260,9 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcSpeechText'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'vcSpeechSlider'
 						type = 'Slider'
@@ -252,7 +271,7 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<space size = '110' />
 				<widget name = 'vcMuteCheckbox'
 						type = 'Checkbox'
@@ -263,7 +282,7 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'mcFontButton'
 						type = 'Button'
 				/>
@@ -284,7 +303,7 @@
 			<widget name = 'mcGSCheckbox'
 					type = 'Checkbox'
 			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'mcMidiGainText'
 						type = 'OptionsLabel'
 				/>
@@ -346,12 +365,26 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<widget name = 'Renderer'
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'RendererPopupDesc'
+						width = '80'
+						height = 'Globals.Line.Height'
+						textalign = 'right'
+				/>
+				<widget name = 'RendererPopup'
 					type = 'PopUp'
-			/>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'AutosavePeriodPopupDesc'
+						width = '80'
+						height = 'Globals.Line.Height'
+						textalign = 'right'
+				/>
+				<widget name = 'AutosavePeriodPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name='KeysButton' 
  				     type='Button' 
 			/> 
@@ -436,7 +469,7 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'Id'
 						width = '35'
 						height = 'Globals.Line.Height'
@@ -446,7 +479,7 @@
 						type = 'PopUp'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'Name'
 						width = '35'
 						height = 'Globals.Line.Height'
@@ -457,12 +490,26 @@
 				/>
 			</layout>
 			<space size = '8'/>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'LangPopupDesc'
+						width = '60'
+						height = 'Globals.Line.Height'
+						textalign = 'right'
+				/>
+				<widget name = 'LangPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'PlatformPopupDesc'
+						width = '60'
+						height = 'Globals.Line.Height'
+						textalign = 'right'
+				/>
+				<widget name = 'PlatformPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 
@@ -577,7 +624,7 @@
 
 	<dialog name = 'ScummConfig' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '8, 8, 8, 8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
 				/>
@@ -588,7 +635,7 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
 				/>
@@ -599,7 +646,7 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcSpeechText'
 						type = 'OptionsLabel'
 				/>
@@ -610,27 +657,26 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<space size = '110' />
 				<widget name = 'vcMuteCheckbox'
 						type = 'Checkbox'
 						width = '80'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<space size = '4' />
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '128'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index e70b79f02e3..1870d5c2242 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 527acccba29..3b948f08858 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -37,8 +37,6 @@
 		
 		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
 		<def var = 'ListWidget.hlRightPadding' value = '0'/>
-		<def var = 'PopUpWidget.labelSpacing' value = '10' />
-		<def var = 'PopUpWidget.labelWidth' value = '110' />
 		
 		<def var = 'ShowLauncherLogo' value = '1'/>
 		<def var = 'ShowGlobalMenuLogo' value = '1'/>
@@ -51,6 +49,7 @@
 
 		<widget name = 'OptionsLabel'
 				size = '110, Globals.Line.Height'
+				textalign = 'right'
 		/>
 		<widget name = 'SmallLabel'
 				size = '24, Globals.Line.Height'
@@ -181,12 +180,22 @@
 	
 	<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'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grModePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grModePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grRenderPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grRenderPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name = 'grAspectCheckbox'
 					type = 'Checkbox'
 			/>
@@ -198,29 +207,42 @@
 	
 	<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 = 'auOPLPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'auMidiPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auMidiPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'auOPLPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auOPLPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'auSampleRatePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auSampleRatePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
-			/>
+				/>
 				<widget name = 'subToggleButton'
 						width = '150'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
@@ -235,10 +257,9 @@
 	<dialog name = 'GlobalOptions_Volume' overlays = 'Dialog.GlobalOptions.TabWidget'>
 		<layout type = 'horizontal' padding = '16, 16, 16, 16' spacing = '8'>
 			<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '8'>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 					<widget name = 'vcMusicText'
 							type = 'OptionsLabel'
-							textalign = 'right'
 					/>
 					<widget name = 'vcMusicSlider'
 							type = 'Slider'
@@ -247,10 +268,9 @@
 							type = 'SmallLabel'
 					/>
 				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 					<widget name = 'vcSfxText'
 							type = 'OptionsLabel'
-							textalign = 'right'
 					/>
 					<widget name = 'vcSfxSlider'
 							type = 'Slider'
@@ -259,10 +279,9 @@
 							type = 'SmallLabel'
 					/>
 				</layout>
-				<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+				<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 					<widget name = 'vcSpeechText'
 							type = 'OptionsLabel'
-							textalign = 'right'
 					/>
 					<widget name = 'vcSpeechSlider'
 							type = 'Slider'
@@ -282,7 +301,7 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'mcFontButton'
 						type = 'Button'
 				/>	
@@ -303,7 +322,7 @@
 			<widget name = 'mcGSCheckbox'
 					type = 'Checkbox'
 			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'mcMidiGainText'
 						type = 'OptionsLabel'
 				/>
@@ -320,7 +339,7 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'SaveButton'
 						type = 'Button'
 				/>
@@ -328,7 +347,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'ThemeButton'
 						type = 'Button'
 				/>
@@ -336,7 +355,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'ExtraButton'
 						type = 'Button'
 				/>
@@ -344,7 +363,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'PluginsButton'
 						type = 'Button'
 				/>
@@ -357,7 +376,7 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'ThemeButton'
 						type = 'Button'
 				/>
@@ -365,12 +384,22 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<widget name = 'Renderer'
-					type = 'PopUp'
-			/>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'RendererPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'RendererPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'AutosavePeriodPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'AutosavePeriodPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name='KeysButton' 
  				     type='Button' 
 			/> 
@@ -455,30 +484,38 @@
 	
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Id'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'Domain'
 						type = 'PopUp'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 				<widget name = 'Name'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'Desc'
 						type = 'PopUp'
 				/>
 			</layout>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'LangPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'LangPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'PlatformPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'PlatformPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 	
@@ -585,10 +622,10 @@
 	</dialog>
 	
 	<dialog name = 'ScummConfig' overlays = 'screen_center'>
-		<layout type = 'vertical' padding = '8, 8, 8, 8'>
+		<layout type = 'vertical' padding = '8, 8, 8, 8' spacing = '8'>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
-				<layout type = 'vertical' padding = '0, 0, 0, 0' center = 'true'>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+				<layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 						<widget name = 'vcMusicText'
 								type = 'OptionsLabel'
 						/>
@@ -599,7 +636,7 @@
 								type = 'SmallLabel'
 						/>
 					</layout>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 						<widget name = 'vcSfxText'
 								type = 'OptionsLabel'
 						/>
@@ -610,7 +647,7 @@
 								type = 'SmallLabel'
 						/>
 					</layout>
-					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+					<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
 						<widget name = 'vcSpeechText'
 								type = 'OptionsLabel'
 						/>
@@ -630,20 +667,19 @@
 					/>
 				</layout>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<space size = '8' />
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '158'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
@@ -653,7 +689,7 @@
 				/>
 			</layout>
 			<space size = '60'/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name='Keys' 
  					    type='Button'
 				/>
@@ -750,11 +786,16 @@
 	</dialog>
 	
 	<dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
-		<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'>
-			<widget name = 'Popup'
-					type = 'PopUp'
-					width = '600'
-			/>
+		<layout type = 'vertical' padding = '8, 8, 32, 8' spacing = '10' center = 'true'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'PopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'Popup'
+						type = 'PopUp'
+						width = '500'
+				/>
+			</layout>
 			<widget name = 'KeymapArea'
 					width = '600'
 					height = '378'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 52b23ea532f..4fbce354ae6 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -29,8 +29,6 @@
 		<def var = 'Font.Height' value = '10' />
 
 		<def var = 'About.OuterBorder' value = '10'/>
-		<def var = 'PopUpWidget.labelSpacing' value = '6' />
-		<def var = 'PopUpWidget.labelWidth' value = '100' />
 
 		<def var = 'ShowLauncherLogo' value = '0'/>
 		<def var = 'ShowGlobalMenuLogo' value = '0'/>
@@ -45,7 +43,8 @@
 		/>
 
 		<widget name = 'OptionsLabel'
-				size = '110, Globals.Line.Height'
+				size = '100, Globals.Line.Height'
+				textalign = 'right'
 		/>
 		<widget name = 'SmallLabel'
 				size = '18, Globals.Line.Height'
@@ -161,12 +160,22 @@
 
 	<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'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'grModePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grModePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'grRenderPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grRenderPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name = 'grAspectCheckbox'
 					type = 'Checkbox'
 			/>
@@ -178,29 +187,42 @@
 
 	<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 = 'auOPLPopup'
-					type = 'PopUp'
-			/>
-			<widget name = 'auSampleRatePopup'
-					type = 'PopUp'
-			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'auMidiPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auMidiPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'auOPLPopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auOPLPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'auSampleRatePopupDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'auSampleRatePopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '128'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
@@ -217,7 +239,6 @@
 			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'vcMusicSlider'
 						type = 'Slider'
@@ -229,7 +250,6 @@
 			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'vcSfxSlider'
 						type = 'Slider'
@@ -241,7 +261,6 @@
 			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
 				<widget name = 'vcSpeechText'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'vcSpeechSlider'
 						type = 'Slider'
@@ -261,7 +280,7 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'mcFontButton'
 						type = 'Button'
 				/>
@@ -282,7 +301,7 @@
 			<widget name = 'mcGSCheckbox'
 					type = 'Checkbox'
 			/>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0'  center = 'true'>
 				<widget name = 'mcMidiGainText'
 						type = 'OptionsLabel'
 				/>
@@ -299,7 +318,7 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'SaveButton'
 						type = 'Button'
 				/>
@@ -307,7 +326,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'ThemeButton'
 						type = 'Button'
 				/>
@@ -315,7 +334,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'ExtraButton'
 						type = 'Button'
 				/>
@@ -323,7 +342,7 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'PluginsButton'
 						type = 'Button'
 				/>
@@ -336,7 +355,7 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16' center = 'true'>
 				<widget name = 'ThemeButton'
 						type = 'Button'
 				/>
@@ -344,12 +363,24 @@
 						height = 'Globals.Line.Height'
 				/>
 			</layout>
-			<widget name = 'Renderer'
-					type = 'PopUp'
-			/>
-			<widget name = 'AutosavePeriod'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'RendererPopupDesc'
+						width = '80'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'RendererPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'AutosavePeriodPopupDesc'
+						width = '80'
+						height = 'Globals.Line.Height'
+				/>
+				<widget name = 'AutosavePeriodPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 			<widget name='KeysButton' 
  				     type='Button' 
 			/> 
@@ -434,7 +465,7 @@
 
 	<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'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'Id'
 						width = '35'
 						height = 'Globals.Line.Height'
@@ -444,7 +475,7 @@
 						type = 'PopUp'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'Name'
 						width = '35'
 						height = 'Globals.Line.Height'
@@ -455,12 +486,26 @@
 				/>
 			</layout>
 			<space size = '8'/>
-			<widget name = 'Lang'
-					type = 'PopUp'
-			/>
-			<widget name = 'Platform'
-					type = 'PopUp'
-			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'LangPopupDesc'
+						width = '60'
+						height = 'Globals.Line.Height'
+						textalign = 'right'
+				/>
+				<widget name = 'LangPopup'
+						type = 'PopUp'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<widget name = 'PlatformPopupDesc'
+						width = '60'
+						height = 'Globals.Line.Height'
+						textalign = 'right'
+				/>
+				<widget name = 'PlatformPopup'
+						type = 'PopUp'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 
@@ -568,7 +613,7 @@
 
 	<dialog name = 'ScummConfig' overlays = 'screen_center'>
 		<layout type = 'vertical' padding = '8, 8, 8, 8'>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcMusicText'
 						type = 'OptionsLabel'
 				/>
@@ -579,7 +624,7 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcSfxText'
 						type = 'OptionsLabel'
 				/>
@@ -590,7 +635,7 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'vcSpeechText'
 						type = 'OptionsLabel'
 				/>
@@ -601,27 +646,26 @@
 						type = 'SmallLabel'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8' center = 'true'>
-				<space size = '110' />
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
+				<space size = '100' />
 				<widget name = 'vcMuteCheckbox'
 						type = 'Checkbox'
 						width = '80'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<space size = '4' />
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subToggleDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subToggleButton'
 						width = '128'
 						height = 'Globals.Slider.Height'
 				/>
 			</layout>
-			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
 				<widget name = 'subSubtitleSpeedDesc'
 						type = 'OptionsLabel'
-						textalign = 'right'
 				/>
 				<widget name = 'subSubtitleSpeedSlider'
 						type = 'Slider'
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 8c3b4bc2107..e4b37dc3c2f 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -192,7 +192,7 @@ StaticTextWidget::StaticTextWidget(GuiObject *boss, const Common::String &name,
 	_type = kStaticTextWidget;
 	_label = text;
 
-	_align = (Graphics::TextAlign)g_gui.xmlEval()->getVar("Dialog." + name + ".Align", Graphics::kTextAlignLeft);
+	_align = g_gui.xmlEval()->getWidgetTextHAlign(name);
 }
 
 void StaticTextWidget::setValue(int value) {