diff --git a/bin/GuiConfigs/kot-bg.jpg b/bin/GuiConfigs/kot-bg.jpg
index 3b01821ea3..24c271005b 100644
Binary files a/bin/GuiConfigs/kot-bg.jpg and b/bin/GuiConfigs/kot-bg.jpg differ
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 2da36e67da..d165e935ac 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -134,11 +134,19 @@ if(APPLE)
 			${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/../Resources/Icons
 			COMMAND ${CMAKE_COMMAND} -E copy_directory
 			${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/../Resources/GuiConfigs
+			COMMAND ${CMAKE_COMMAND} -E copy_directory
+			${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/../Resources/git
 			COMMAND "${Qt5_DIR}/../../../bin/macdeployqt" "${PROJECT_BINARY_DIR}/bin/rpcs3.app")
 elseif(UNIX)
 	add_custom_command(TARGET rpcs3 POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -E copy_directory
 			${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons)
+	add_custom_command(TARGET rpcs3 POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_directory
+			${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs)
+	add_custom_command(TARGET rpcs3 POST_BUILD
+			COMMAND ${CMAKE_COMMAND} -E copy_directory
+			${CMAKE_SOURCE_DIR}/bin/git $<TARGET_FILE_DIR:rpcs3>/git)
 elseif(WIN32)
 	add_custom_command(TARGET rpcs3 POST_BUILD
 			COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_SOURCE_DIR}/bin" "$<TARGET_FILE_DIR:rpcs3>"
@@ -163,4 +171,6 @@ if(UNIX AND NOT APPLE)
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
 	install(DIRECTORY ../bin/GuiConfigs
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
+	install(DIRECTORY ../bin/git
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
 endif()
diff --git a/rpcs3/rpcs3qt/gui_settings.cpp b/rpcs3/rpcs3qt/gui_settings.cpp
index 037a33ac17..4ee48c17dd 100644
--- a/rpcs3/rpcs3qt/gui_settings.cpp
+++ b/rpcs3/rpcs3qt/gui_settings.cpp
@@ -334,10 +334,11 @@ QStringList gui_settings::GetStylesheetEntries()
 #else
 	QDir platformStylesheetDir = QCoreApplication::applicationDirPath() + "/../share/rpcs3/GuiConfigs/";
 #endif
+	res.append(gui::utils::get_dir_entries(QCoreApplication::applicationDirPath() + "/GuiConfigs/", name_filter));
 	res.append(gui::utils::get_dir_entries(platformStylesheetDir, name_filter));
 	res.removeDuplicates();
 #endif
-	res.sort(Qt::CaseInsensitive);
+	res.sort();
 	return res;
 }
 
@@ -356,7 +357,29 @@ QString gui_settings::GetCurrentStylesheetPath()
 		return "-";
 	}
 
-	return m_settings_dir.absoluteFilePath(stylesheet + ".qss");
+	QList<QDir> locs;
+	locs += m_settings_dir;
+
+#if !defined(_WIN32)
+#ifdef __APPLE__
+	QDir platformStylesheetDir = QCoreApplication::applicationDirPath() + "/../Resources/GuiConfigs/";
+#else
+	QDir platformStylesheetDir = QCoreApplication::applicationDirPath() + "/../share/rpcs3/GuiConfigs/";
+#endif
+	QDir appDir = QCoreApplication::applicationDirPath() + "/GuiConfigs/";
+	locs += platformStylesheetDir;
+	locs += appDir;
+#endif
+
+	for (auto&& dir : locs)
+	{
+		QString path = dir.absoluteFilePath(stylesheet + ".qss");
+		QFile test(path);
+		if (test.exists())
+			return path;
+	}
+
+	return "";
 }
 
 QSize gui_settings::SizeFromSlider(int pos)