diff --git a/Assets/Scripts/InputSystem/ControllerTypes/InputJoyconPair.cs b/Assets/Scripts/InputSystem/ControllerTypes/InputJoyconPair.cs
index faaabd099..9c642c5ce 100644
--- a/Assets/Scripts/InputSystem/ControllerTypes/InputJoyconPair.cs
+++ b/Assets/Scripts/InputSystem/ControllerTypes/InputJoyconPair.cs
@@ -392,8 +392,22 @@ namespace HeavenStudio.InputSystem
             Color colour;
             m.SetColor("_BodyColor", ColorUtility.TryParseHtmlString("#2F353A", out colour) ? colour : Color.white);
             m.SetColor("_BtnColor", ColorUtility.TryParseHtmlString("#2F353A", out colour) ? colour : Color.white);
-            m.SetColor("_LGripColor", leftController.GetBodyColor());
-            m.SetColor("_RGripColor", rightController.GetBodyColor());
+            if (leftController == null)
+            {
+                m.SetColor("_LGripColor", Color.white);
+            }
+            else
+            {
+                m.SetColor("_LGripColor", leftController.GetBodyColor());
+            }
+            if (rightController == null)
+            {
+                m.SetColor("_RGripColor", Color.white);
+            }
+            else
+            {
+                m.SetColor("_RGripColor", rightController.GetBodyColor());
+            }
         }
 
         public override void SetPlayer(int? playerNum)
diff --git a/Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs b/Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs
index 7af09e09c..1e3de4247 100644
--- a/Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs
+++ b/Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs
@@ -127,15 +127,19 @@ namespace HeavenStudio.Editor
                             if (possibleController.GetLastButtonDown(true) == ButtonMaskZL && possibleController.GetJoyshockType() is TypeJoyConLeft)
                             {
                                 pair.SetLeftController(possibleController);
+                                pair.SetMaterialProperties(controllerMat);
                             }
                             else if (possibleController.GetLastButtonDown(true) == ButtonMaskZR && possibleController.GetJoyshockType() is TypeJoyConRight)
                             {
                                 pair.SetRightController(possibleController);
+                                pair.SetMaterialProperties(controllerMat);
                             }
                         }
                         if (pair.HasControllers())
                         {
                             pairSearchItem.SetActive(false);
+                            pair.SetMaterialProperties(controllerMat);
+                            pair.OnSelected();
                         }
                     }
                 }
diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
index df03f7293..85466177b 100644
--- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
+++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs
@@ -13,7 +13,6 @@ namespace HeavenStudio
 
             Minigames.Minigame game;
 
-            Debug.Log("Running game loader RvlBadmintonLoader");
             game = RvlBadmintonLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -24,7 +23,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlBadmintonLoader failed!");
             }
 
-            Debug.Log("Running game loader CtrBearLoader");
             game = CtrBearLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -35,7 +33,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader CtrBearLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlBoardMeetingLoader");
             game = RvlBoardMeetingLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -46,7 +43,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlBoardMeetingLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrFlickLoader");
             game = NtrFlickLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -57,7 +53,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrFlickLoader failed!");
             }
 
-            Debug.Log("Running game loader CtrCatchLoader");
             game = CtrCatchLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -68,7 +63,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader CtrCatchLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlBookLoader");
             game = RvlBookLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -79,7 +73,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlBookLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbClapLoader");
             game = AgbClapLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -90,7 +83,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbClapLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrCoinLoader");
             game = NtrCoinLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -101,7 +93,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrCoinLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrCropLoader");
             game = NtrCropLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -112,7 +103,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrCropLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrDjLoader");
             game = NtrDjLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -123,7 +113,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrDjLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrDogNinjaLoader");
             game = NtrDogNinjaLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -134,7 +123,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrDogNinjaLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlDoubleDateLoader");
             game = RvlDoubleDateLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -145,7 +133,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlDoubleDateLoader failed!");
             }
 
-            Debug.Log("Running game loader CtrDrummingLoader");
             game = CtrDrummingLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -156,7 +143,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader CtrDrummingLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrIdolLoader");
             game = NtrIdolLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -167,7 +153,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrIdolLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbFireworkLoader");
             game = AgbFireworkLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -178,7 +163,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbFireworkLoader failed!");
             }
 
-            Debug.Log("Running game loader CtrFirstContact");
             game = CtrFirstContact.AddGame(eventCaller);
             if (game != null)
             {
@@ -189,7 +173,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader CtrFirstContact failed!");
             }
 
-            Debug.Log("Running game loader RvlFlipperFlopLoader");
             game = RvlFlipperFlopLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -200,7 +183,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlFlipperFlopLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlForkLoader");
             game = RvlForkLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -211,7 +193,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlForkLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrGleeClubLoader");
             game = NtrGleeClubLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -222,7 +203,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrGleeClubLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlNewKarateLoader");
             game = RvlNewKarateLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -233,7 +213,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlNewKarateLoader failed!");
             }
 
-            Debug.Log("Running game loader CtrTeppanLoader");
             game = CtrTeppanLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -244,7 +223,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader CtrTeppanLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlRocketLoader");
             game = RvlRocketLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -255,7 +233,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlRocketLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrBackbeatLoader");
             game = NtrBackbeatLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -266,7 +243,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrBackbeatLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbMannequinFactoryLoader");
             game = AgbMannequinFactoryLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -277,7 +253,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbMannequinFactoryLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlManzaiLoader");
             game = RvlManzaiLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -288,7 +263,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlManzaiLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbMarcherLoader");
             game = AgbMarcherLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -299,7 +273,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbMarcherLoader failed!");
             }
 
-            Debug.Log("Running game loader PcoMeatLoader");
             game = PcoMeatLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -310,7 +283,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader PcoMeatLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlMonkeyWatchLoader");
             game = RvlMonkeyWatchLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -321,7 +293,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlMonkeyWatchLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbUpbeatLoader");
             game = AgbUpbeatLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -332,7 +303,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbUpbeatLoader failed!");
             }
 
-            Debug.Log("Running game loader ntrMunchyMonkLoader");
             game = ntrMunchyMonkLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -343,7 +313,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader ntrMunchyMonkLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbNightWalkLoader");
             game = AgbNightWalkLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -354,7 +323,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbNightWalkLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrOctopusMachineLoader");
             game = NtrOctopusMachineLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -365,7 +333,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrOctopusMachineLoader failed!");
             }
 
-            Debug.Log("Running game loader CtrPillowLoader");
             game = CtrPillowLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -376,7 +343,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader CtrPillowLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbQuizShowLoader");
             game = AgbQuizShowLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -387,7 +353,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbQuizShowLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrPingpongLoader");
             game = NtrPingpongLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -398,7 +363,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrPingpongLoader failed!");
             }
 
-            Debug.Log("Running game loader PcoSomenLoader");
             game = PcoSomenLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -409,7 +373,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader PcoSomenLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbHairLoader");
             game = AgbHairLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -420,7 +383,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbHairLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlRingsideLoader");
             game = RvlRingsideLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -431,7 +393,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlRingsideLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrRockersLoader");
             game = NtrRockersLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -442,7 +403,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrRockersLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrSamuraiLoader");
             game = NtrSamuraiLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -453,7 +413,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrSamuraiLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlSeeSawLoader");
             game = RvlSeeSawLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -464,7 +423,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlSeeSawLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbGhostLoader");
             game = AgbGhostLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -475,7 +433,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbGhostLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbBatterLoader");
             game = AgbBatterLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -486,7 +443,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbBatterLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbSpaceDanceLoader");
             game = AgbSpaceDanceLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -497,7 +453,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbSpaceDanceLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrSoccerLoader");
             game = NtrSoccerLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -508,7 +463,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrSoccerLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrSplashdownLoader");
             game = NtrSplashdownLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -519,7 +473,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrSplashdownLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlTambourineLoader");
             game = RvlTambourineLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -530,7 +483,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlTambourineLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbTapLoader");
             game = AgbTapLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -541,7 +493,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbTapLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlTapTroupeLoader");
             game = RvlTapTroupeLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -552,7 +503,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader RvlTapTroupeLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrDazzlesLoader");
             game = NtrDazzlesLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -563,7 +513,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrDazzlesLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbTossBoysLoader");
             game = AgbTossBoysLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -574,7 +523,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbTossBoysLoader failed!");
             }
 
-            Debug.Log("Running game loader TotemClimbLoader");
             game = TotemClimbLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -585,7 +533,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader TotemClimbLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbTramLoader");
             game = AgbTramLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -596,7 +543,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbTramLoader failed!");
             }
 
-            Debug.Log("Running game loader MobTrickLoader");
             game = MobTrickLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -607,7 +553,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader MobTrickLoader failed!");
             }
 
-            Debug.Log("Running game loader NtrTunnelLoader");
             game = NtrTunnelLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -618,7 +563,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrTunnelLoader failed!");
             }
 
-            Debug.Log("Running game loader AgbWaltzLoader");
             game = AgbWaltzLoader.AddGame(eventCaller);
             if (game != null)
             {
@@ -629,7 +573,6 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader AgbWaltzLoader failed!");
             }
 
-            Debug.Log("Running game loader RvlWorkingDoughLoader");
             game = RvlWorkingDoughLoader.AddGame(eventCaller);
             if (game != null)
             {