diff --git a/_arena_lib/arena_callbacks.lua b/_arena_lib/arena_callbacks.lua
index 822b63d..5410469 100644
--- a/_arena_lib/arena_callbacks.lua
+++ b/_arena_lib/arena_callbacks.lua
@@ -17,8 +17,8 @@ arena_lib.on_load("skywars", function(arena)
   for pl_name in pairs(arena.players) do
     local player = minetest.get_player_by_name(pl_name)
 
-    skywars.show_kit_selector(pl_name, arena)
     create_glass_cage(player)
+    player:get_inventory():add_item("main", "skywars:kit_selector")
   end
 end)
 
@@ -41,6 +41,7 @@ arena_lib.on_start("skywars", function(arena)
       jump=1
     })
     skywars.activate_enderpearl(player, arena)
+    player:get_inventory():remove_item("main", "skywars:kit_selector") 
   end
 end)
 
@@ -49,6 +50,7 @@ end)
 arena_lib.on_celebration("skywars", function(arena, winner_name)
   for pl_name in pairs(arena.players) do
     local player = minetest.get_player_by_name(pl_name)
+    
     remove_privs(pl_name)
     skywars.block_enderpearl(player, arena)
   end
diff --git a/_kits/kit_items.lua b/_kits/kit_items.lua
new file mode 100644
index 0000000..2aafa1c
--- /dev/null
+++ b/_kits/kit_items.lua
@@ -0,0 +1,15 @@
+minetest.register_craftitem("skywars:kit_selector", {
+    description = skywars.T("Kit Selector"),
+    inventory_image = "kit_selector.png",
+    stack_max = 1,
+    on_drop = function() return nil end,
+    on_use =
+        function(_, player, pointed_thing)
+            local pl_name = player:get_player_name()
+            local arena = arena_lib.get_arena_by_player(pl_name)
+
+            if not arena or not arena.in_loading then return end
+
+            skywars.show_kit_selector(pl_name, arena)
+        end
+})
diff --git a/init.lua b/init.lua
index 1383b8a..a8ba1f0 100644
--- a/init.lua
+++ b/init.lua
@@ -43,3 +43,4 @@ dofile(minetest.get_modpath("skywars") .. "/_chest_handler/treasures.lua")
 dofile(minetest.get_modpath("skywars") .. "/_map_handler/map_manager.lua")
 dofile(minetest.get_modpath("skywars") .. "/_arena_lib/arena_callbacks.lua")
 dofile(minetest.get_modpath("skywars") .. "/_kits/formspec.lua")
+dofile(minetest.get_modpath("skywars") .. "/_kits/kit_items.lua")
diff --git a/textures/kit_selector.png b/textures/kit_selector.png
new file mode 100644
index 0000000..d7f2cb5
Binary files /dev/null and b/textures/kit_selector.png differ
diff --git a/textures/sw_timer.png b/textures/sw_timer.png
index c9beded..516c8ea 100644
Binary files a/textures/sw_timer.png and b/textures/sw_timer.png differ