diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
index 1ff43033c..517720f53 100644
--- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
+++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
@@ -48,7 +48,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Memorize Gwen the Guardian's builds",
 						C.Reset + "Then recreate them in a short amount of time.",
 						C.Reset + "The least correct builder is eliminated.",
-				}, "SB", "Speed Builders", new SelectSBButton(this));
+				}, "SB", "Speed_Builders", new SelectSBButton(this));
 
 		add(4, Material.BOOK_AND_QUILL, C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary", new String[]
 				{
@@ -57,7 +57,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Players take turns at drawing a random",
 						C.Reset + "word. Whoever guesses it within the time",
 						C.Reset + "limit gets some points!",
-				}, "DMT", "Draw My Thing", new SelectDMTButton(this));
+				}, "DMT", "Draw_My_Thing", new SelectDMTButton(this));
 
 		add(6, Material.TNT, C.cYellowB + "Dragon Escape " + C.cGray + "Fast Paced Parkour", new String[]
 				{
@@ -83,7 +83,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Search for chests to find loot and ",
 						C.Reset + "fight others to be the last man standing. ",
 						C.Reset + "Stay away from the borders!",
-				}, new String[] {"HG", "SG2"}, "Survival Games", new SelectSGButton(this));
+				}, new String[] {"HG", "SG2"}, "Survival_Games", new SelectSGButton(this));
 
 		add(13, Material.FEATHER, (byte) 0, C.cYellowB + "Skywars " + C.cGray + "Solo/Team Survival", new String[]
 				{
@@ -133,7 +133,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Customize one of five exciting champions",
 						C.Reset + "and battle with the opposing team to the",
 						C.Reset + "last man standing.",
-				}, "TDM", "Team Deathmatch", new SelectTDMButton(this));
+				}, "TDM", "Team_Deathmatch", new SelectTDMButton(this));
 
 		add(24, Material.DIAMOND_CHESTPLATE, C.cYellowB + "Castle Siege " + C.cGray + "Team Game", new String[]
 				{
@@ -141,7 +141,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Defenders must protect King Sparklez",
 						C.Reset + "from the endless waves of Undead",
 						C.Reset + "until the sun rises!",
-				}, "CS", "Castle Siege", new SelectCSButton(this));
+				}, "CS", "Castle_Siege", new SelectCSButton(this));
 
 		add(26, Material.GRASS, C.cYellowB + "Block Hunt " + C.cGray + "Cat and Mouse", new String[]
 				{
@@ -149,7 +149,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Hide as blocks/animals, upgrade your ",
 						C.Reset + "weapon and fight to survive against",
 						C.Reset + "the Hunters!",
-				}, "BH", "Block Hunt", new SelectBHButton(this));
+				}, "BH", "Block_Hunt", new SelectBHButton(this));
 
 		add(28, Material.TNT, C.cYellowB + "MineStrike " + C.cGray + "Team Survival", new String[]
 				{
@@ -159,7 +159,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "and blow them up!",
 				}, "MS", "MineStrike", new SelectMSButton(this));
 
-		add(30, _superSmashCycle.get(_ssmIndex).clone(), null, null, new String[] {"SSM", "SSM2"}, "Smash Mobs", new SelectSSMButton(this));
+		add(30, _superSmashCycle.get(_ssmIndex).clone(), null, null, new String[] {"SSM", "SSM2"}, "Smash_Mobs", new SelectSSMButton(this));
 
 		String[] games = new String[] {"MIN", "DR", "DE", "PB", "TF", "RUN", "SN", "DT", "SQ", "SA", "SS",
 				"OITQ", "BB", "MB", "EVO", "GLD", "BL"};
@@ -171,7 +171,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						C.Reset + "Players are given a Build Theme and ",
 						C.Reset + "must use blocks, monsters and more",
 						C.Reset + "to create a masterpiece!",
-				}, "BLD", "Master Builders", new SelectBLDButton(this));
+				}, "BLD", "Master_Builders", new SelectBLDButton(this));
 
 		add(39, Material.SKULL_ITEM, (byte) 3, C.cYellowB + "Player Servers " + C.cGray + "Player Hosted Games", new String[]
 				{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index e75edf107..531b5045f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -22,10 +22,7 @@ import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.events.PlayerGameRespawnEvent;
 import nautilus.game.arcade.events.PlayerStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam.PlayerState;
-import nautilus.game.arcade.kit.Kit;
-import nautilus.game.arcade.kit.KitAvailability;
-import nautilus.game.arcade.kit.Perk;
-import nautilus.game.arcade.kit.ProgressingKit;
+import nautilus.game.arcade.kit.*;
 import nautilus.game.arcade.managers.GameLobbyManager;
 import nautilus.game.arcade.managers.chat.ChatStatData;
 import nautilus.game.arcade.scoreboard.GameScoreboard;
@@ -887,7 +884,7 @@ public abstract class Game implements Listener
 		{
 			kit.ApplyKit(player);
 		}
-		else
+		else if (!(kit instanceof ChampionsKit))
 		{
 			player.closeInventory();
 		}