diff --git a/Ryujinx.sln b/Ryujinx.sln
index 8177f8617c..18df571bb6 100644
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -28,7 +28,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Common", "Ryujinx.C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Profiler", "Ryujinx.Profiler\Ryujinx.Profiler.csproj", "{4E69B67F-8CA7-42CF-A9E1-CCB0915DFB34}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ARMeilleure", "ARMeilleure\ARMeilleure.csproj", "{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARMeilleure", "ARMeilleure\ARMeilleure.csproj", "{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -126,6 +126,14 @@ Global
 		{4E69B67F-8CA7-42CF-A9E1-CCB0915DFB34}.Profile Release|Any CPU.Build.0 = Profile Release|Any CPU
 		{4E69B67F-8CA7-42CF-A9E1-CCB0915DFB34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E69B67F-8CA7-42CF-A9E1-CCB0915DFB34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Profile Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Profile Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Profile Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Profile Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF09A5E-2D8B-4B6F-A51D-5CE414DDB15A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Ryujinx/Config.jsonc b/Ryujinx/Config.json
similarity index 53%
rename from Ryujinx/Config.jsonc
rename to Ryujinx/Config.json
index 35ecc8ac02..ac98ae02f2 100644
--- a/Ryujinx/Config.jsonc
+++ b/Ryujinx/Config.json
@@ -1,81 +1,26 @@
 {
-    "$schema": "./_schema.json",
-
-    // Dump shaders in local directory (e.g. `C:\ShaderDumps`)
     "graphics_shaders_dump_path": "",
-
-    // Enable printing debug logs
     "logging_enable_debug": false,
-
-    // Enable printing stubbed calls logs
     "logging_enable_stub": true,
-
-    // Enable printing information logs
     "logging_enable_info": true,
-
-    // Enable printing warning logs
     "logging_enable_warn": true,
-
-    // Enable printing error logs
     "logging_enable_error": true,
-
-    // Enable printing guest logs
     "logging_enable_guest": true,
-
-    // Enable printing FS access logs. fs_global_access_log_mode must be 2 or 3
     "logging_enable_fs_access_log": false,
-
-    // Filtered log classes, in a JSON array, eg. `[ "Loader", "ServiceFs" ]`
     "logging_filtered_classes": [ ],
-
-    // Enable file logging
     "enable_file_log": true,
-
-    // Change System Language
-    // System Language list: https://gist.github.com/HorrorTroll/b6e4a88d774c3c9b3bdf54d79a7ca43b
-    "system_language": "AmericanEnglish",
-
-    // Enable or disable Docked Mode
+    "system_language": "BritishEnglish",
     "docked_mode": false,
-
-    // Enable or disable Discord Rich Presence
     "enable_discord_integration": true,
-
-    // Enable or disable Game Vsync
     "enable_vsync": true,
-
-    // Enable or disable Multi-core scheduling of threads
     "enable_multicore_scheduling": true,
-
-    // Enable integrity checks on Switch content files
     "enable_fs_integrity_checks": true,
-
-    // Sets the "GlobalAccessLogMode". Possible modes are 0-3
-    "fs_global_access_log_mode": 0,
-
-    // Use old ChocolArm64 ARM emulator
     "enable_legacy_jit": false,
-
-    // Enable or disable ignoring missing services, this may cause instability
     "ignore_missing_services": false,
-
-    // Enable or disable custom themes in the GUI.
-    "enable_custom_theme": false,
-    
-    // Path to custom GUI theme.
-    "custom_theme_path": "",
-    
-    // The primary controller's type
-    // Supported Values: Handheld, ProController, NpadPair, NpadLeft, NpadRight
     "controller_type": "Handheld",
-
-    // Enable or disable "direct keyboard access (HID) support" (Provides games access to your keyboard as a text entry device).
-    "enable_keyboard": false,
-
-    // Keyboard Controls
-    // https://github.com/opentk/opentk/blob/master/src/OpenTK/Input/Key.cs
+    "enable_custom_theme": false,
+    "custom_theme_path": "",
     "keyboard_controls": {
-        // Left JoyCon Keyboard Bindings
         "left_joycon": {
             "stick_up": "W",
             "stick_down": "S",
@@ -90,8 +35,6 @@
             "button_l": "E",
             "button_zl": "Q"
         },
-
-        // Right JoyCon Keyboard Bindings
         "right_joycon": {
             "stick_up": "I",
             "stick_down": "K",
@@ -106,27 +49,15 @@
             "button_r": "U",
             "button_zr": "O"
         },
-
         "hotkeys": {
             "toggle_vsync": "Tab"
         }
     },
-
-    // Controller Controls
-    "joystick_controls": {
-        // Whether or not to enable Controller support
-        "enabled": true,
-
-        // Controller Device Index
+        "joystick_controls": {
+        "enabled": false,
         "index": 0,
-
-        // Controller Analog Stick Deadzone
         "deadzone": 0.05,
-
-        // The value of how pressed down each trigger has to be in order to register a button press
         "trigger_threshold": 0.5,
-
-        // Left JoyCon Controller Bindings
         "left_joycon": {
             "stick": "Axis0",
             "stick_button": "Button13",
@@ -138,8 +69,6 @@
             "button_l": "Button6",
             "button_zl": "Button8"
         },
-
-        // Right JoyCon Controller Bindings
         "right_joycon": {
             "stick": "Axis2",
             "stick_button": "Button14",
diff --git a/Ryujinx/GUI/GeneralSettings.cs b/Ryujinx/GUI/GeneralSettings.cs
index bd137ded9d..e3d16483df 100644
--- a/Ryujinx/GUI/GeneralSettings.cs
+++ b/Ryujinx/GUI/GeneralSettings.cs
@@ -32,8 +32,6 @@ namespace Ryujinx
         [GUI] CheckButton  CustThemeToggle;
         [GUI] Entry        CustThemeDir;
         [GUI] TextView     GameDirsBox;
-        [GUI] ToggleButton SaveToggle;
-        [GUI] ToggleButton CloseToggle;
 
         public static void ConfigureSettings(Configuration Instance) { SwitchConfig = Instance; }
 
@@ -47,8 +45,6 @@ namespace Ryujinx
 
             GSWin.Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.GUI.assets.ryujinxIcon.png");
 
-            CustThemeToggle.Clicked += CustThemeToggle_Activated;
-
             if (SwitchConfig.LoggingEnableError)        { ErrorLogToggle.Click(); }
             if (SwitchConfig.LoggingEnableWarn)         { WarningLogToggle.Click(); }
             if (SwitchConfig.LoggingEnableInfo)         { InfoLogToggle.Click(); }
@@ -102,7 +98,7 @@ namespace Ryujinx
             SwitchConfig.SystemLanguage  = (SystemLanguage)Enum.Parse(typeof(SystemLanguage), SystemLanguageSelect.ActiveId);
             SwitchConfig.CustomThemePath = CustThemeDir.Buffer.Text;
 
-            Configuration.SaveConfig(SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.jsonc"));
+            Configuration.SaveConfig(SwitchConfig, System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
             File.WriteAllText("./GameDirs.dat", GameDirsBox.Buffer.Text);
 
             Configuration.Configure(device, SwitchConfig);
diff --git a/Ryujinx/GUI/GeneralSettings.glade b/Ryujinx/GUI/GeneralSettings.glade
index 45b1b7eabf..ca4c4d6da6 100644
--- a/Ryujinx/GUI/GeneralSettings.glade
+++ b/Ryujinx/GUI/GeneralSettings.glade
@@ -2,29 +2,29 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkWindow" id="GSWin">
+  <object class="GtkDialog" id="GSWin">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Ryujinx - General Settings (Read-Only)</property>
-    <property name="default_height">500</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
     <child>
       <placeholder/>
     </child>
-    <child>
+    <child internal-child="vbox">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkToggleButton" id="SaveToggle">
+                <property name="label" translatable="yes">Save</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">4</property>
-                <property name="label" translatable="yes">Emulation Settings</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <signal name="toggled" handler="SaveToggle_Activated" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -32,10 +32,37 @@
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToggleButton" id="CloseToggle">
+                <property name="label" translatable="yes">Close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <signal name="toggled" handler="CloseToggle_Activated" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
             <child>
               <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="row_spacing">15</property>
+                <property name="column_spacing">15</property>
                 <child>
                   <object class="GtkCheckButton" id="ErrorLogToggle">
                     <property name="label" translatable="yes">Enable Error Logs</property>
@@ -49,58 +76,6 @@
                     <property name="top_attach">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="FileLogToggle">
-                    <property name="label" translatable="yes">Enable File Log</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="FSICToggle">
-                    <property name="label" translatable="yes">Enable FS Integrity Checks</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="AggrToggle">
-                    <property name="label" translatable="yes">Enable Aggressive CPU Options</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="DockedModeToggle">
-                    <property name="label" translatable="yes">Enable Docked Mode</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkCheckButton" id="WarningLogToggle">
                     <property name="label" translatable="yes">Enable Warning Logs</property>
@@ -127,45 +102,6 @@
                     <property name="top_attach">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="DiscordToggle">
-                    <property name="label" translatable="yes">Enable Discord Integration</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="IgnoreToggle">
-                    <property name="label" translatable="yes">Ignore Missing Services</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="VSyncToggle">
-                    <property name="label" translatable="yes">Enable VSync</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">3</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkCheckButton" id="StubLogToggle">
                     <property name="label" translatable="yes">Enable Stub Logs</property>
@@ -188,8 +124,60 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">4</property>
-                    <property name="top_attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="FileLogToggle">
+                    <property name="label" translatable="yes">Enable File Log</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="DiscordToggle">
+                    <property name="label" translatable="yes">Enable Discord Integration</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="DockedModeToggle">
+                    <property name="label" translatable="yes">Enable Docked Mode</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="VSyncToggle">
+                    <property name="label" translatable="yes">Enable VSync</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
                 <child>
@@ -201,8 +189,58 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">4</property>
-                    <property name="top_attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="FSICToggle">
+                    <property name="label" translatable="yes">Enable FS Integrity Checks</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="AggrToggle">
+                    <property name="label" translatable="yes">Enable Aggressive CPU Options</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">3</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="IgnoreToggle">
+                    <property name="label" translatable="yes">Ignore Missing Services</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">System Language:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>
                 <child>
@@ -230,135 +268,31 @@
                     </items>
                   </object>
                   <packing>
-                    <property name="left_attach">4</property>
-                    <property name="top_attach">2</property>
+                    <property name="left_attach">3</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel">
+                  <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">System Language:</property>
+                    <property name="stock">gtk-discard</property>
                   </object>
                   <packing>
-                    <property name="left_attach">3</property>
-                    <property name="top_attach">2</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_bottom">4</property>
-            <property name="label" translatable="yes">GUI Settings</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkCheckButton" id="CustThemeToggle">
-                <property name="label" translatable="yes">Use Custom Theme</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
+            <child type="tab">
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Custom Theme Dir:</property>
+                <property name="label" translatable="yes">Emulation Settings</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">5</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="CustThemeDir">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_bottom">4</property>
-                <property name="label" translatable="yes">Game Directories</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
@@ -374,67 +308,86 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Game Directories</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkCheckButton" id="CustThemeToggle">
+                    <property name="label" translatable="yes">Use Custom Theme</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="CustThemeToggle_Activated" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="padding">10</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Custom Theme Dir:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="padding">5</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="CustThemeDir">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="valign">center</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">GUI Settings</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">5</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="stock">gtk-discard</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="SaveToggle">
-                <property name="label" translatable="yes">Save</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="toggled" handler="SaveToggle_Activated" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleButton" id="CloseToggle">
-                <property name="label" translatable="yes">Close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="toggled" handler="CloseToggle_Activated" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">6</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/Ryujinx/GUI/MainMenu.cs b/Ryujinx/GUI/MainMenu.cs
index 2348d7e8fa..141efebdb9 100644
--- a/Ryujinx/GUI/MainMenu.cs
+++ b/Ryujinx/GUI/MainMenu.cs
@@ -49,7 +49,7 @@ namespace Ryujinx
 
             device = new HLE.Switch(renderer, audioOut);
 
-            Configuration.Load(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.jsonc"));
+            Configuration.Load(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json"));
             Configuration.InitialConfigure(device);
 
             gtkapp = _gtkapp;
diff --git a/Ryujinx/GUI/MainMenu.glade b/Ryujinx/GUI/MainMenu.glade
index 820a92743f..47665c4f98 100644
--- a/Ryujinx/GUI/MainMenu.glade
+++ b/Ryujinx/GUI/MainMenu.glade
@@ -2,16 +2,11 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkWindow" id="MainWin">
+  <object class="GtkApplicationWindow" id="MainWin">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Ryujinx</property>
-    <property name="window_position">center</property>
     <property name="default_width">1280</property>
     <property name="default_height">750</property>
-    <property name="gravity">center</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">True</property>
diff --git a/Ryujinx/GUI/assets/Theme.css b/Ryujinx/GUI/assets/Theme.css
index 63cf860e9a..997f3f11ac 100644
--- a/Ryujinx/GUI/assets/Theme.css
+++ b/Ryujinx/GUI/assets/Theme.css
@@ -26,6 +26,24 @@ separator {
     background: #929394;
 }
 
+notebook {
+    border: none;
+}
+
+    notebook > header {
+        background-color: #2C2F33;
+        border: none;
+    }
+        
+    notebook > header label {
+        color: #F4F6F7;
+    }
+
+notebook > stack:not(:only-child) {
+    background-color: transparent;
+    border-width: 0px;
+}
+
 treeview {
     background-color: #2C2F33;
     color: #F4F6F7;
@@ -193,4 +211,4 @@ scrollbar {
     scrollbar.horizontal slider {
         min-width: 30px;
         min-height: 6px;
-    }
+    }
\ No newline at end of file
diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj
index 24aacd50ff..c24b888c80 100644
--- a/Ryujinx/Ryujinx.csproj
+++ b/Ryujinx/Ryujinx.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Config.jsonc">
+    <None Update="Config.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="GUI\assets\Theme.css">