diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88cf594103..e32c8b7faa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,9 +17,6 @@ project(dolphin-emu)
 # unique name here.
 set(DISTRIBUTOR "None" CACHE STRING "Name of the distributor.")
 
-# Slippi Playback build option
-add_compile_definitions(IS_PLAYBACK)
-
 if(UNIX AND NOT APPLE AND NOT ANDROID)
   option(ENABLE_X11 "Enables X11 Support" ON)
 endif()
@@ -46,7 +43,10 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence, show the current gam
 #    launch).
 #  * The Dolphin team relies on the data in order to understand the behavior
 #    of our software in the wild.
-option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" ON)
+option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" OFF)
+
+# Enable Playback build for Slippi. TODO: turn off for normal builds
+option(SLIPPI_PLAYBACK "Enable Playback changes" ON) 
 
 option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
 
@@ -511,6 +511,11 @@ if(ENABLE_ANALYTICS)
   add_definitions(-DUSE_ANALYTICS=1)
 endif()
 
+if(SLIPPI_PLAYBACK)
+  # Slippi Playback build option
+  add_compile_definitions(IS_PLAYBACK)
+endif()
+
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #
diff --git a/Data/Sys/GameFiles/GALE01/MnExtAll.dat.diff b/Data/Sys/GameFiles/GALE01/MnExtAll.dat.diff
new file mode 100644
index 0000000000..8c9e762a05
Binary files /dev/null and b/Data/Sys/GameFiles/GALE01/MnExtAll.dat.diff differ
diff --git a/Data/Sys/GameFiles/GALE01/MnExtAll.usd.diff b/Data/Sys/GameFiles/GALE01/MnExtAll.usd.diff
new file mode 100644
index 0000000000..8555fada7e
Binary files /dev/null and b/Data/Sys/GameFiles/GALE01/MnExtAll.usd.diff differ
diff --git a/Data/Sys/GameFiles/GALE01/MnMaAll.dat.diff b/Data/Sys/GameFiles/GALE01/MnMaAll.dat.diff
new file mode 100644
index 0000000000..daf7b8a4f2
Binary files /dev/null and b/Data/Sys/GameFiles/GALE01/MnMaAll.dat.diff differ
diff --git a/Data/Sys/GameFiles/GALE01/MnMaAll.usd.diff b/Data/Sys/GameFiles/GALE01/MnMaAll.usd.diff
new file mode 100644
index 0000000000..d923e391ac
Binary files /dev/null and b/Data/Sys/GameFiles/GALE01/MnMaAll.usd.diff differ
diff --git a/Data/Sys/GameFiles/GALE01/SdMenu.dat.diff b/Data/Sys/GameFiles/GALE01/SdMenu.dat.diff
new file mode 100644
index 0000000000..6cf3f9a781
Binary files /dev/null and b/Data/Sys/GameFiles/GALE01/SdMenu.dat.diff differ
diff --git a/Data/Sys/GameFiles/GALE01/SdMenu.usd.diff b/Data/Sys/GameFiles/GALE01/SdMenu.usd.diff
new file mode 100644
index 0000000000..89c39acd05
Binary files /dev/null and b/Data/Sys/GameFiles/GALE01/SdMenu.usd.diff differ
diff --git a/Data/Sys/Resources/Roboto-Medium.ttf b/Data/Sys/Resources/Roboto-Medium.ttf
new file mode 100644
index 0000000000..f714a514d9
Binary files /dev/null and b/Data/Sys/Resources/Roboto-Medium.ttf differ
diff --git a/fontawesome-webfont.ttf b/Data/Sys/Resources/fontawesome-webfont.ttf
similarity index 100%
rename from fontawesome-webfont.ttf
rename to Data/Sys/Resources/fontawesome-webfont.ttf
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index a8125c7f76..06c046d06e 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -922,10 +922,10 @@ bool Renderer::InitializeImGui()
 #ifdef IS_PLAYBACK
   ImFontConfig config;
   config.MergeMode = true;
-  ImGui::GetIO().Fonts->AddFontFromFileTTF("Roboto-Medium.ttf", 14.0f, 0, ImGui::GetIO().Fonts->GetGlyphRangesDefault());
+  ImGui::GetIO().Fonts->AddFontFromFileTTF((File::GetSysDirectory() + "Resources/Roboto-Medium.ttf").c_str(), 14.0f, 0, ImGui::GetIO().Fonts->GetGlyphRangesDefault());
   static const ImWchar icons_ranges[] = { ICON_MIN_FA, ICON_MAX_FA, 0 };
   ImFontConfig icons_config; icons_config.MergeMode = true; icons_config.PixelSnapH = true;
-  ImGui::GetIO().Fonts->AddFontFromFileTTF(FONT_ICON_FILE_NAME_FA, 16.0f, &icons_config, icons_ranges);
+  ImGui::GetIO().Fonts->AddFontFromFileTTF((File::GetSysDirectory() + "Resources/" + FONT_ICON_FILE_NAME_FA).c_str(), 16.0f, &icons_config, icons_ranges);
 #endif
 
   // Don't create an ini file. TODO: Do we want this in the future?