diff --git a/Data/User/Themes/Boomy/README.txt b/Data/Sys/Themes/Boomy/README.txt
similarity index 100%
rename from Data/User/Themes/Boomy/README.txt
rename to Data/Sys/Themes/Boomy/README.txt
diff --git a/Data/User/Themes/Boomy/browse.png b/Data/Sys/Themes/Boomy/browse.png
similarity index 100%
rename from Data/User/Themes/Boomy/browse.png
rename to Data/Sys/Themes/Boomy/browse.png
diff --git a/Data/User/Themes/Boomy/config.png b/Data/Sys/Themes/Boomy/config.png
similarity index 100%
rename from Data/User/Themes/Boomy/config.png
rename to Data/Sys/Themes/Boomy/config.png
diff --git a/Data/User/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/dsp.png
similarity index 100%
rename from Data/User/Themes/Boomy/dsp.png
rename to Data/Sys/Themes/Boomy/dsp.png
diff --git a/Data/User/Themes/Boomy/fullscreen.png b/Data/Sys/Themes/Boomy/fullscreen.png
similarity index 100%
rename from Data/User/Themes/Boomy/fullscreen.png
rename to Data/Sys/Themes/Boomy/fullscreen.png
diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/Sys/Themes/Boomy/gcpad.png
similarity index 100%
rename from Data/User/Themes/Boomy/gcpad.png
rename to Data/Sys/Themes/Boomy/gcpad.png
diff --git a/Data/User/Themes/Boomy/graphics.png b/Data/Sys/Themes/Boomy/graphics.png
similarity index 100%
rename from Data/User/Themes/Boomy/graphics.png
rename to Data/Sys/Themes/Boomy/graphics.png
diff --git a/Data/User/Themes/Boomy/help.png b/Data/Sys/Themes/Boomy/help.png
similarity index 100%
rename from Data/User/Themes/Boomy/help.png
rename to Data/Sys/Themes/Boomy/help.png
diff --git a/Data/User/Themes/Boomy/nobanner.png b/Data/Sys/Themes/Boomy/nobanner.png
similarity index 100%
rename from Data/User/Themes/Boomy/nobanner.png
rename to Data/Sys/Themes/Boomy/nobanner.png
diff --git a/Data/User/Themes/Boomy/open.png b/Data/Sys/Themes/Boomy/open.png
similarity index 100%
rename from Data/User/Themes/Boomy/open.png
rename to Data/Sys/Themes/Boomy/open.png
diff --git a/Data/User/Themes/Boomy/pause.png b/Data/Sys/Themes/Boomy/pause.png
similarity index 100%
rename from Data/User/Themes/Boomy/pause.png
rename to Data/Sys/Themes/Boomy/pause.png
diff --git a/Data/User/Themes/Boomy/play.png b/Data/Sys/Themes/Boomy/play.png
similarity index 100%
rename from Data/User/Themes/Boomy/play.png
rename to Data/Sys/Themes/Boomy/play.png
diff --git a/Data/User/Themes/Boomy/refresh.png b/Data/Sys/Themes/Boomy/refresh.png
similarity index 100%
rename from Data/User/Themes/Boomy/refresh.png
rename to Data/Sys/Themes/Boomy/refresh.png
diff --git a/Data/User/Themes/Boomy/screenshot.png b/Data/Sys/Themes/Boomy/screenshot.png
similarity index 100%
rename from Data/User/Themes/Boomy/screenshot.png
rename to Data/Sys/Themes/Boomy/screenshot.png
diff --git a/Data/User/Themes/Boomy/stop.png b/Data/Sys/Themes/Boomy/stop.png
similarity index 100%
rename from Data/User/Themes/Boomy/stop.png
rename to Data/Sys/Themes/Boomy/stop.png
diff --git a/Data/User/Themes/Boomy/wiimote.png b/Data/Sys/Themes/Boomy/wiimote.png
similarity index 100%
rename from Data/User/Themes/Boomy/wiimote.png
rename to Data/Sys/Themes/Boomy/wiimote.png
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index 92e9674ff2..e37689ad0a 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -861,12 +861,10 @@ std::string GetThemeDir(const std::string& theme_name)
 {
 	std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
 
-#if !defined(_WIN32)
 	// If theme does not exist in user's dir load from shared directory
 	if (!File::Exists(dir))
-		dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/";
-#endif
-	
+		dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
+
 	return dir;
 }
 
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 168e046c29..7da1226d64 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -598,9 +598,7 @@ void CConfigMain::CreateGUIControls()
 
 	CFileSearch::XStringVector theme_dirs;
 	theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX));
-#if !defined(_WIN32)
-	theme_dirs.push_back(SHARED_USER_DIR THEMES_DIR);
-#endif
+	theme_dirs.push_back(File::GetSysDirectory() + THEMES_DIR);
 
 	CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs);
 	auto const& sv = cfs.GetFileNames();
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 3965943b89..c354b640e3 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -273,6 +273,7 @@ bool DolphinApp::OnInit()
 	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
 	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX));
 	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_THEMES_IDX));
 
 	LogManager::Init();
 	SConfig::Init();