diff --git a/mirricraft-clearinventory.sk b/mirricraft-clearinventory.sk
new file mode 100644
index 0000000..8068266
--- /dev/null
+++ b/mirricraft-clearinventory.sk
@@ -0,0 +1,10 @@
+# --- Clear Inventory ---
+command /clearinventory:
+    description: Clear Inventory
+    aliases: /clearinv
+    executable by: players
+    trigger:
+        if player has the permission "mirricraft.clearinventory":
+            remove all items from player
+            stop
+        stop
\ No newline at end of file
diff --git a/mirricraft-enderchest.sk b/mirricraft-enderchest.sk
new file mode 100644
index 0000000..b6544e2
--- /dev/null
+++ b/mirricraft-enderchest.sk
@@ -0,0 +1,8 @@
+# --- EnderChest ---
+command /enderchest:
+    description: EnderChest
+    executable by: players
+    trigger:
+        wait 2 tick
+        open the player's ender chest to the player
+        stop
\ No newline at end of file
diff --git a/mirricraft-fly.sk b/mirricraft-fly.sk
new file mode 100644
index 0000000..dab9451
--- /dev/null
+++ b/mirricraft-fly.sk
@@ -0,0 +1,15 @@
+# --- Fly ---
+command /fly [<text>]:
+    description: Fly
+    executable by: players
+    trigger:
+        if player has the permission "mirricraft.fly":
+            if {fly.%player%} is not set:
+                message "&7[&2MirriCraft&7]&r Lento on nyt sallittu"
+                set player's flight mode to true
+                set {fly.%player%} to true
+                stop
+            message "&7[&2MirriCraft&7]&r Lento on pois käytöstä"
+            set player's flight mode to false
+            delete {fly.%player%}
+            stop
\ No newline at end of file
diff --git a/mirricraft-gamemode.sk b/mirricraft-gamemode.sk
new file mode 100644
index 0000000..cdafeb2
--- /dev/null
+++ b/mirricraft-gamemode.sk
@@ -0,0 +1,29 @@
+# --- Game Mode ---
+command /gamemode [<string>]:
+    description: Game Mode
+    aliases: /gm
+    executable by: players
+    trigger:
+        if arg-1 is "0" or "s" or "survival":
+            if player has the permission "mirricraft.gamemode.survival":
+                set gamemode of player to Survival
+                stop
+            stop
+        elseif arg-1 is "1" or "c" or "creative":
+            if player has the permission "mirricraft.gamemode.creative":
+                set gamemode of player to Creative
+                stop
+            stop
+        elseif arg-1 is "2" or "a" or "adventure":
+            if player has the permission "mirricraft.gamemode.adventure":
+                set gamemode of player to Adventure
+                stop
+            stop
+        elseif arg-1 is "3" or "sp" or "spectator":
+            if player has the permission "mirricraft.gamemode.spectator":
+                set gamemode of player to Spectator
+                stop
+            stop
+        else
+            message "&7[&2MirriCraft&7]&r Sy&ouml;t&auml; pelitila"
+        stop
\ No newline at end of file
diff --git a/mirricraft-kitpvp.sk b/mirricraft-kitpvp.sk
new file mode 100644
index 0000000..1904996
--- /dev/null
+++ b/mirricraft-kitpvp.sk
@@ -0,0 +1,43 @@
+# --- KitPVP ---
+on join:
+    if player's world is "minigames":
+        set slot 1 of player's inventory to 1 of chest named "&fKitPVP"
+    stop
+
+on respawn:
+    if player's world is "minigames":
+        set slot 1 of player's inventory to 1 of chest named "&fKitPVP"
+    stop
+
+on leftclick:
+    if player's world is "minigames":
+        if event-item is chest named "&fKitPVP":
+            make player execute command "/kitpvp gui"
+            cancel the event
+            wait 2 tick
+
+on rightclick:
+    if player's world is "minigames":
+        if event-item is chest named "&fKitPVP":
+            make player execute command "/kitpvp gui"
+            cancel the event
+            wait 2 tick
+
+on inventory click:
+    if player's world is "minigames":
+        if event-item is chest named "&fKitPVP":
+            cancel the event
+
+on drop:
+    if player's world is "minigames":
+        if event-item is chest named "&fKitPVP":
+            cancel the event
+
+on pickup:
+    if player's world is "minigames":
+        if event-item is chest named "&fKitPVP":
+            delete event-entity
+
+on death:
+    if player's world is "minigames":
+        clear drops
\ No newline at end of file
diff --git a/mirricraft-old.sk b/mirricraft-old.sk
index 1f96b59..3dc2352 100644
--- a/mirricraft-old.sk
+++ b/mirricraft-old.sk
@@ -225,32 +225,6 @@ command /vip:
         make player execute command "/mirricraft gui vip"
         stop
 
-command /enderchest:
-    description: EnderChest
-    executable by: players
-    trigger:
-        make player execute command "/mirricraft vip enderchest"
-        stop
-
-command /clearinventory:
-    description: Clear Inventory
-    aliases: /clearinv
-    executable by: players
-    trigger:
-        make player execute command "/mirricraft clearinventory"
-        stop
-
-command /fly [<text>]:
-    description: Fly
-    executable by: players
-    trigger:
-        if arg-1 is not set:
-            make player execute command "/mirricraft vip fly"
-            stop
-        else:
-            make player execute command "/mirricraft vip fly %arg-1%"
-            stop
-
 command /visit [<text>]:
     description: Visit
     executable by: players
@@ -262,17 +236,7 @@ command /visit [<text>]:
             make player execute command "/mirricraft visit %arg-1%"
             stop
 
-command /gamemode [<string>]:
-    description: Game Mode
-    aliases: /gm
-    executable by: players
-    trigger:
-        if arg-1 is not set:
-            make player execute command "/mirricraft gamemode"
-            stop
-        else:
-            make player execute command "/mirricraft gamemode %arg-1%"
-            stop
+
 
 #command /disabledcommands:
 #    description: Disabled Commands