diff --git a/MMOCore-Dist/src/main/resources/default/classes/arcane-mage.yml b/MMOCore-Dist/src/main/resources/default/classes/arcane-mage.yml
index 176a04c5..24e1eb95 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/arcane-mage.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/arcane-mage.yml
@@ -31,6 +31,16 @@ display:
 # Must match an existing exp curve filename from the 'expcurves' folder
 exp-curve: levels
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
+
 # The maximum level players can reach
 max-level: 100
 
diff --git a/MMOCore-Dist/src/main/resources/default/classes/human.yml b/MMOCore-Dist/src/main/resources/default/classes/human.yml
index 9b8581bd..2e14caf2 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/human.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/human.yml
@@ -20,6 +20,16 @@ options:
 # Must match an existing exp curve filename from the 'expcurves' folder
 exp-curve: levels
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
+
 #The number of skills a player can bound.
 max-bound-active-skills: 5
 
diff --git a/MMOCore-Dist/src/main/resources/default/classes/mage.yml b/MMOCore-Dist/src/main/resources/default/classes/mage.yml
index ddf14d17..b14fb301 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/mage.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/mage.yml
@@ -38,6 +38,15 @@ skill-trees:
 
 exp-table: class_exp_table
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
 # This is the default mana display options, however it is not mandatory
 # to have it in your class config file. Other classes do not have this
 # section and therefore have the default mana display options.
@@ -55,6 +64,8 @@ mana:
         empty: WHITE
     name: 'Mana'
 
+
+
 cast-particle:
     particle: SPELL_INSTANT
 
diff --git a/MMOCore-Dist/src/main/resources/default/classes/marksman.yml b/MMOCore-Dist/src/main/resources/default/classes/marksman.yml
index 0144f4de..0a522be4 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/marksman.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/marksman.yml
@@ -33,6 +33,16 @@ max-level: 100
 
 exp-table: class_exp_table
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
+
 skill-trees:
     - 'general'
     - 'rogue-marksman'
diff --git a/MMOCore-Dist/src/main/resources/default/classes/paladin.yml b/MMOCore-Dist/src/main/resources/default/classes/paladin.yml
index bcde0aba..698411db 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/paladin.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/paladin.yml
@@ -30,6 +30,15 @@ display:
 # Must match an existing exp curve filename from the 'expcurves' folder
 exp-curve: levels
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
 
 skill-trees:
     - 'general'
diff --git a/MMOCore-Dist/src/main/resources/default/classes/rogue.yml b/MMOCore-Dist/src/main/resources/default/classes/rogue.yml
index ee396628..a08e67e3 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/rogue.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/rogue.yml
@@ -33,6 +33,15 @@ max-level: 100
 
 exp-table: class_exp_table
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
 
 skill-trees:
     - 'general'
diff --git a/MMOCore-Dist/src/main/resources/default/classes/warrior.yml b/MMOCore-Dist/src/main/resources/default/classes/warrior.yml
index e58db759..4dcc0250 100644
--- a/MMOCore-Dist/src/main/resources/default/classes/warrior.yml
+++ b/MMOCore-Dist/src/main/resources/default/classes/warrior.yml
@@ -61,6 +61,16 @@ mana:
 
 exp-table: class_exp_table
 
+skill-slots:
+    1:
+        name: "Skill Slot I"
+    2:
+        name: "Skill Slot II"
+    3:
+        name: "Skill Slot III"
+    4:
+        name: "Skill Slot IV"
+
 # Rage charges when dealing weapon and physical damage.
 triggers:
     weapon-damage:
diff --git a/MMOCore-Dist/src/main/resources/default/gui/skill-list.yml b/MMOCore-Dist/src/main/resources/default/gui/skill-list.yml
index ccb46c65..3042f98e 100644
--- a/MMOCore-Dist/src/main/resources/default/gui/skill-list.yml
+++ b/MMOCore-Dist/src/main/resources/default/gui/skill-list.yml
@@ -46,26 +46,9 @@ items:
       - '&eCosts 1 skill reallocation point.'
       - '&e◆ Skill Reallocation Points: &6{points}'
 
-
-  passive-skill-slot:
-    slots: [ 7,16,25,34,43,52 ]
-    function: passive-slot
-    item: BOOK
-
-    # Material used when the slot is empty
-    empty-item: BLUE_DYE
-
-    name: '&aPassive Skill Slot {slot}'
-    no-skill: '&cNone'
-    lore:
-      - '&7Current Passive Skill: &6{skill}'
-      - ''
-      - '&e► Left click to bind {selected}.'
-      - '&e► Right click to unbind.'
-
   skill-slot:
     slots: [ 8,17,26,35,44,53 ]
-    function: active-slot
+    function: slot
     item: BOOK
 
     # Material used when the slot is empty