diff --git a/gui/ThemeRenderer.cpp b/gui/ThemeRenderer.cpp
index ab186101b16..43659eeb167 100644
--- a/gui/ThemeRenderer.cpp
+++ b/gui/ThemeRenderer.cpp
@@ -363,16 +363,7 @@ bool ThemeRenderer::addDrawData(const Common::String &data, bool cached) {
 bool ThemeRenderer::loadTheme(Common::String fileName) {
 	unloadTheme();
 
-	if (fileName != "builtin") {	
-		if (ConfMan.hasKey("themepath"))
-			Common::File::addDefaultDirectory(ConfMan.get("themepath"));
-
-#ifdef DATA_PATH
-		Common::File::addDefaultDirectoryRecursive(DATA_PATH);
-#endif
-		if (ConfMan.hasKey("extrapath"))
-			Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
-		
+	if (fileName != "builtin") {
 		if (fileName.hasSuffix(".zip"))
 			ImageMan.addArchive(fileName);
 		else 
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index ce7fc16cfc6..71e655f5bcd 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -189,7 +189,7 @@
 "/> "
 "<text font = 'text_default' "
 "vertical_align = 'center' "
-"horizontal_align = 'right' "
+"horizontal_align = 'left' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'popup_hover' cache = false> "
@@ -208,7 +208,7 @@
 "/> "
 "<text font = 'text_hover' "
 "vertical_align = 'center' "
-"horizontal_align = 'right' "
+"horizontal_align = 'left' "
 "/> "
 "</drawdata> "
 "<drawdata id = 'widget_textedit' cache = false> "
@@ -517,13 +517,13 @@
 "<widget name = 'mcFontButton' "
 "type = 'Button' "
 "/> "
+"<widget name = 'mcFontPath' "
+"height = 'Globals.Line.Height' "
+"/> "
 "<widget name = 'mcFontClearButton' "
 "height = 'Globals.Line.Height' "
 "width = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'mcFontPath' "
-"height = 'Globals.Line.Height' "
-"/> "
 "</layout> "
 "<widget name = 'mcMixedCheckbox' "
 "type = 'Checkbox' "
@@ -1054,13 +1054,13 @@
 "<widget name = 'mcFontButton' "
 "type = 'Button' "
 "/> "
+"<widget name = 'mcFontPath' "
+"height = 'Globals.Line.Height' "
+"/> "
 "<widget name = 'mcFontClearButton' "
 "height = 'Globals.Line.Height' "
 "width = 'Globals.Line.Height' "
 "/> "
-"<widget name = 'mcFontPath' "
-"height = 'Globals.Line.Height' "
-"/> "
 "</layout> "
 "<widget name = 'mcMixedCheckbox' "
 "type = 'Checkbox' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 768d02b7f63..22928d2a850 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummodern.zip b/gui/themes/scummodern.zip
index db728c51693..d5030f8ecf5 100644
Binary files a/gui/themes/scummodern.zip and b/gui/themes/scummodern.zip differ