diff --git a/Data/Sys/Themes/Boomy/README.txt b/Data/Sys/Themes/Boomy/README.txt
deleted file mode 100644
index 97a5aecef0..0000000000
--- a/Data/Sys/Themes/Boomy/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Boomy: Milosz Wlazlo [miloszwl@miloszwl.com]
diff --git a/Data/Sys/Themes/Boomy/browse.png b/Data/Sys/Themes/Boomy/browse.png
deleted file mode 100644
index c1847cca30..0000000000
Binary files a/Data/Sys/Themes/Boomy/browse.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/classic.png b/Data/Sys/Themes/Boomy/classic.png
deleted file mode 100644
index 69a3029227..0000000000
Binary files a/Data/Sys/Themes/Boomy/classic.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/config.png b/Data/Sys/Themes/Boomy/config.png
deleted file mode 100644
index fee2cf1eac..0000000000
Binary files a/Data/Sys/Themes/Boomy/config.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/fullscreen.png b/Data/Sys/Themes/Boomy/fullscreen.png
deleted file mode 100644
index bb801d58fb..0000000000
Binary files a/Data/Sys/Themes/Boomy/fullscreen.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/gcpad.png b/Data/Sys/Themes/Boomy/gcpad.png
deleted file mode 100644
index b3a23b7879..0000000000
Binary files a/Data/Sys/Themes/Boomy/gcpad.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/graphics.png b/Data/Sys/Themes/Boomy/graphics.png
deleted file mode 100644
index 4f68fd8c77..0000000000
Binary files a/Data/Sys/Themes/Boomy/graphics.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/help.png b/Data/Sys/Themes/Boomy/help.png
deleted file mode 100644
index 530ff7c75e..0000000000
Binary files a/Data/Sys/Themes/Boomy/help.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/open.png b/Data/Sys/Themes/Boomy/open.png
deleted file mode 100644
index 0f4747b678..0000000000
Binary files a/Data/Sys/Themes/Boomy/open.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/pause.png b/Data/Sys/Themes/Boomy/pause.png
deleted file mode 100644
index dd9bfc62bf..0000000000
Binary files a/Data/Sys/Themes/Boomy/pause.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/play.png b/Data/Sys/Themes/Boomy/play.png
deleted file mode 100644
index 2a843dc621..0000000000
Binary files a/Data/Sys/Themes/Boomy/play.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/refresh.png b/Data/Sys/Themes/Boomy/refresh.png
deleted file mode 100644
index daf31db109..0000000000
Binary files a/Data/Sys/Themes/Boomy/refresh.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/screenshot.png b/Data/Sys/Themes/Boomy/screenshot.png
deleted file mode 100644
index bb801d58fb..0000000000
Binary files a/Data/Sys/Themes/Boomy/screenshot.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/stop.png b/Data/Sys/Themes/Boomy/stop.png
deleted file mode 100644
index acba1df5c5..0000000000
Binary files a/Data/Sys/Themes/Boomy/stop.png and /dev/null differ
diff --git a/Data/Sys/Themes/Boomy/wiimote.png b/Data/Sys/Themes/Boomy/wiimote.png
deleted file mode 100644
index 69a3029227..0000000000
Binary files a/Data/Sys/Themes/Boomy/wiimote.png and /dev/null differ
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index 7f799dbf4c..916e711764 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -78,6 +78,9 @@
 // This one is only used to remove it if it was present
 #define SHADERCACHE_LEGACY_DIR "ShaderCache"
 
+// The theme directory used by default
+#define DEFAULT_THEME_DIR "Clean"
+
 // Filenames
 // Files in the directory returned by GetUserPath(D_CONFIG_IDX)
 #define DOLPHIN_CONFIG "Dolphin.ini"
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 8317550297..564ab58d8f 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -866,12 +866,16 @@ void SetUserPath(unsigned int dir_index, const std::string& path)
 std::string GetThemeDir(const std::string& theme_name)
 {
   std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
+  if (File::Exists(dir))
+    return dir;
 
-  // If theme does not exist in user's dir load from shared directory
-  if (!File::Exists(dir))
-    dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
+  // If the theme doesn't exist in the user dir, load from shared directory
+  dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
+  if (File::Exists(dir))
+    return dir;
 
-  return dir;
+  // If the theme doesn't exist at all, load the default theme
+  return GetSysDirectory() + THEMES_DIR "/" DEFAULT_THEME_DIR "/";
 }
 
 bool WriteStringToFile(const std::string& str, const std::string& filename)
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index fa2ade2cef..b25bf02500 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -403,7 +403,7 @@ void SConfig::LoadInterfaceSettings(IniFile& ini)
   interface->Get("ShowLogWindow", &m_InterfaceLogWindow, false);
   interface->Get("ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false);
   interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false);
-  interface->Get("ThemeName40", &theme_name, "Clean");
+  interface->Get("ThemeName40", &theme_name, DEFAULT_THEME_DIR);
   interface->Get("PauseOnFocusLost", &m_PauseOnFocusLost, false);
 }