diff --git a/assets/common/entity/dungeon/tier-0/bow.ron b/assets/common/entity/dungeon/tier-0/bow.ron
index 7ff0555517..b5520a43db 100644
--- a/assets/common/entity/dungeon/tier-0/bow.ron
+++ b/assets/common/entity/dungeon/tier-0/bow.ron
@@ -9,6 +9,5 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
-        SkillSetAsset("common.skillset.dungeon.tier-0.bow"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-0/staff.ron b/assets/common/entity/dungeon/tier-0/staff.ron
index e1825cf2ec..cbcd59a973 100644
--- a/assets/common/entity/dungeon/tier-0/staff.ron
+++ b/assets/common/entity/dungeon/tier-0/staff.ron
@@ -9,6 +9,5 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-0.gnarling"),
-        SkillSetAsset("common.skillset.dungeon.tier-0.staff"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-1/bow.ron b/assets/common/entity/dungeon/tier-1/bow.ron
index df8961b483..034111c634 100644
--- a/assets/common/entity/dungeon/tier-1/bow.ron
+++ b/assets/common/entity/dungeon/tier-1/bow.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-1.adlet_bow"),
-        SkillSetAsset("common.skillset.dungeon.tier-1.bow"),
+        SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-1/staff.ron b/assets/common/entity/dungeon/tier-1/staff.ron
index 8420431780..668397373d 100644
--- a/assets/common/entity/dungeon/tier-1/staff.ron
+++ b/assets/common/entity/dungeon/tier-1/staff.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-1.adlet_spear"),
-        SkillSetAsset("common.skillset.dungeon.tier-1.staff"),
+        SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-2/bow.ron b/assets/common/entity/dungeon/tier-2/bow.ron
index f780d5c7d0..092d86f2cf 100644
--- a/assets/common/entity/dungeon/tier-2/bow.ron
+++ b/assets/common/entity/dungeon/tier-2/bow.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
-        SkillSetAsset("common.skillset.dungeon.tier-2.bow"),
+        SkillSetAsset("common.skillset.preset.rank2.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-2/staff.ron b/assets/common/entity/dungeon/tier-2/staff.ron
index 4357fa4539..2b3d964709 100644
--- a/assets/common/entity/dungeon/tier-2/staff.ron
+++ b/assets/common/entity/dungeon/tier-2/staff.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-2.sahagin"),
-        SkillSetAsset("common.skillset.dungeon.tier-2.staff"),
+        SkillSetAsset("common.skillset.preset.rank2.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-3/bow.ron b/assets/common/entity/dungeon/tier-3/bow.ron
index 386a4dc500..ea9e8ef889 100644
--- a/assets/common/entity/dungeon/tier-3/bow.ron
+++ b/assets/common/entity/dungeon/tier-3/bow.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
-        SkillSetAsset("common.skillset.dungeon.tier-3.bow"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-3/staff.ron b/assets/common/entity/dungeon/tier-3/staff.ron
index 6d65b13dab..d9bed3b37f 100644
--- a/assets/common/entity/dungeon/tier-3/staff.ron
+++ b/assets/common/entity/dungeon/tier-3/staff.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-3.haniwa"),
-        SkillSetAsset("common.skillset.dungeon.tier-3.staff"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-4/bow.ron b/assets/common/entity/dungeon/tier-4/bow.ron
index 287c849c9a..8e17f2b4e3 100644
--- a/assets/common/entity/dungeon/tier-4/bow.ron
+++ b/assets/common/entity/dungeon/tier-4/bow.ron
@@ -9,6 +9,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-4.myrmidon"),
-        SkillSetAsset("common.skillset.dungeon.tier-4.enemy"),
+        SkillSetAsset("common.skillset.preset.rank4.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-5/beastmaster.ron b/assets/common/entity/dungeon/tier-5/beastmaster.ron
index fc58c78a73..442e3d7ea1 100644
--- a/assets/common/entity/dungeon/tier-5/beastmaster.ron
+++ b/assets/common/entity/dungeon/tier-5/beastmaster.ron
@@ -13,7 +13,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-5.beastmaster"),
-        // TODO: make own skillset for him?
-        SkillSetAsset("common.skillset.dungeon.tier-5.enemy"),
+        SkillSetAsset("common.skillset.preset.rank5.fullskill"),
     ],
 )
diff --git a/assets/common/entity/dungeon/tier-5/cultist.ron b/assets/common/entity/dungeon/tier-5/cultist.ron
index 53ccc29b63..809f842c33 100644
--- a/assets/common/entity/dungeon/tier-5/cultist.ron
+++ b/assets/common/entity/dungeon/tier-5/cultist.ron
@@ -17,6 +17,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.dungeon.tier-5.cultist"),
-        SkillSetAsset("common.skillset.dungeon.tier-5.enemy"),
+        SkillSetAsset("common.skillset.preset.rank5.fullskill"),
     ],
 )
diff --git a/assets/common/entity/spot/dwarf_grave_robber.ron b/assets/common/entity/spot/dwarf_grave_robber.ron
index c9cfb694c2..4aff072f47 100644
--- a/assets/common/entity/spot/dwarf_grave_robber.ron
+++ b/assets/common/entity/spot/dwarf_grave_robber.ron
@@ -8,7 +8,7 @@ EntityConfig (
     hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-3")),
 
     meta: [
-        SkillSetAsset("common.skillset.village.guard"),
         LoadoutAsset("common.loadout.spots.dwarf_graverobber"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/entity/spot/grim_salvager.ron b/assets/common/entity/spot/grim_salvager.ron
index 041151b338..b9422cb27d 100644
--- a/assets/common/entity/spot/grim_salvager.ron
+++ b/assets/common/entity/spot/grim_salvager.ron
@@ -8,7 +8,7 @@ EntityConfig (
     hands: TwoHanded(Item("common.items.weapons.hammer.steel_hammer-0")),
 
     meta: [
-        SkillSetAsset("common.skillset.village.guard"),
         LoadoutAsset("common.loadout.spots.dwarf_graverobber"),
+        SkillSetAsset("common.skillset.preset.rank1.fullskill"),
     ],
 )
diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron
index 9e449d2bdb..c46c082c2a 100644
--- a/assets/common/entity/spot/pirate.ron
+++ b/assets/common/entity/spot/pirate.ron
@@ -8,7 +8,7 @@ EntityConfig (
     hands: Paired(Item("common.items.weapons.sword_1h.iron-2")),
 
     meta: [
-        SkillSetAsset("common.skillset.dungeon.tier-3.sword"),
+        SkillSetAsset("common.skillset.preset.rank2.fullskill"),
         LoadoutAsset("common.loadout.spots.pirate"),
     ],
 )
diff --git a/assets/common/entity/spot/witch_dark.ron b/assets/common/entity/spot/witch_dark.ron
index 19d3992b32..9608a4d4ef 100644
--- a/assets/common/entity/spot/witch_dark.ron
+++ b/assets/common/entity/spot/witch_dark.ron
@@ -8,7 +8,7 @@ EntityConfig (
     hands: TwoHanded(Item("common.items.weapons.sceptre.belzeshrub")),
 
     meta: [
-        SkillSetAsset("common.skillset.dungeon.tier-3.sceptre"),
         LoadoutAsset("common.loadout.spots.witch"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/entity/template.ron b/assets/common/entity/template.ron
index 84d7159364..fc5196676c 100644
--- a/assets/common/entity/template.ron
+++ b/assets/common/entity/template.ron
@@ -13,6 +13,6 @@ EntityConfig (
 
     meta: [
         LoadoutAsset("common.loadout.village.merchant"),
-        SkillSetAsset("common.skillset.village.merchant.merchant"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/entity/village/guard.ron b/assets/common/entity/village/guard.ron
index 1e4caa691e..e4c3a18dd5 100644
--- a/assets/common/entity/village/guard.ron
+++ b/assets/common/entity/village/guard.ron
@@ -12,6 +12,6 @@ EntityConfig (
 
     ])),
     meta: [
-        SkillSetAsset("common.skillset.village.guard"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/entity/village/merchant.ron b/assets/common/entity/village/merchant.ron
index fc1f869927..d386e4508e 100644
--- a/assets/common/entity/village/merchant.ron
+++ b/assets/common/entity/village/merchant.ron
@@ -14,6 +14,6 @@ EntityConfig (
     ])),
 
     meta: [
-        SkillSetAsset("common.skillset.village.merchant.merchant"),
+        SkillSetAsset("common.skillset.preset.rank3.fullskill"),
     ],
 )
diff --git a/assets/common/skillset/dungeon/tier-0/enemy.ron b/assets/common/skillset/dungeon/tier-0/enemy.ron
deleted file mode 100644
index f0a97a83ea..0000000000
--- a/assets/common/skillset/dungeon/tier-0/enemy.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    //You can always add more :P
-    Tree("common.skillset.dungeon.tier-0.bow"),
-    Tree("common.skillset.dungeon.tier-0.staff"),
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-0/staff.ron b/assets/common/skillset/dungeon/tier-0/staff.ron
deleted file mode 100644
index 60bbb942b6..0000000000
--- a/assets/common/skillset/dungeon/tier-0/staff.ron
+++ /dev/null
@@ -1,9 +0,0 @@
-([
-    Group(Weapon(Staff)),
-
-    // Fireball
-    Skill((Staff(BDamage), Some(1))),
-    Skill((Staff(BRegen), Some(1))),
-    Skill((Staff(BRadius), Some(1))),
-
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-1/bow.ron b/assets/common/skillset/dungeon/tier-1/bow.ron
deleted file mode 100644
index 521acd6260..0000000000
--- a/assets/common/skillset/dungeon/tier-1/bow.ron
+++ /dev/null
@@ -1,10 +0,0 @@
-([
-    Group(Weapon(Bow)),
-
-    // Charged
-    Skill((Bow(CDamage), Some(2))),
-    Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(1))),
-    Skill((Bow(CMove), Some(1))),
-
-])
diff --git a/assets/common/skillset/dungeon/tier-1/enemy.ron b/assets/common/skillset/dungeon/tier-1/enemy.ron
deleted file mode 100644
index 7874664548..0000000000
--- a/assets/common/skillset/dungeon/tier-1/enemy.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    //You can always add more :P
-    Tree("common.skillset.dungeon.tier-1.bow"),
-    Tree("common.skillset.dungeon.tier-1.staff"),
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-2/bow.ron b/assets/common/skillset/dungeon/tier-2/bow.ron
deleted file mode 100644
index 369bb83f81..0000000000
--- a/assets/common/skillset/dungeon/tier-2/bow.ron
+++ /dev/null
@@ -1,11 +0,0 @@
-([
-    Group(Weapon(Bow)),
-
-    // Charged
-    Skill((Bow(CDamage), Some(2))),
-    Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(2))),
-    Skill((Bow(CMove), Some(1))),
-
-])
-
diff --git a/assets/common/skillset/dungeon/tier-2/enemy.ron b/assets/common/skillset/dungeon/tier-2/enemy.ron
deleted file mode 100644
index 54af9723dc..0000000000
--- a/assets/common/skillset/dungeon/tier-2/enemy.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    //You can always add more :P
-    Tree("common.skillset.dungeon.tier-2.bow"),
-    Tree("common.skillset.dungeon.tier-2.staff"),
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/bow.ron b/assets/common/skillset/dungeon/tier-3/bow.ron
deleted file mode 100644
index 50ee426093..0000000000
--- a/assets/common/skillset/dungeon/tier-3/bow.ron
+++ /dev/null
@@ -1,11 +0,0 @@
-([
-    Group(Weapon(Bow)),
-
-    // Charged
-    Skill((Bow(CDamage), Some(2))),
-    Skill((Bow(CRegen), Some(2))),
-    Skill((Bow(CKnockback), Some(2))),
-    Skill((Bow(CSpeed), Some(2))),
-    Skill((Bow(CMove), Some(2))),
-
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-3/enemy.ron b/assets/common/skillset/dungeon/tier-3/enemy.ron
deleted file mode 100644
index b5eebc556d..0000000000
--- a/assets/common/skillset/dungeon/tier-3/enemy.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    //You can always add more :P
-    Tree("common.skillset.dungeon.tier-3.bow"),
-    Tree("common.skillset.dungeon.tier-3.staff"),
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-4/enemy.ron b/assets/common/skillset/dungeon/tier-4/enemy.ron
deleted file mode 100644
index 9e7acf32ef..0000000000
--- a/assets/common/skillset/dungeon/tier-4/enemy.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    //You can always add more :P
-    Tree("common.skillset.preset.max.bow"),
-    Tree("common.skillset.preset.max.staff"),
-])
\ No newline at end of file
diff --git a/assets/common/skillset/dungeon/tier-5/enemy.ron b/assets/common/skillset/dungeon/tier-5/enemy.ron
deleted file mode 100644
index 63dcbf0d84..0000000000
--- a/assets/common/skillset/dungeon/tier-5/enemy.ron
+++ /dev/null
@@ -1,8 +0,0 @@
-([
-    // Just gather everything
-    Tree("common.skillset.preset.max.sword"),
-    Tree("common.skillset.preset.max.axe"),
-    Tree("common.skillset.preset.max.hammer"),
-    Tree("common.skillset.preset.max.bow"),
-    Tree("common.skillset.preset.max.sceptre"),
-])
diff --git a/assets/common/skillset/preset/rank1/axe.ron b/assets/common/skillset/preset/rank1/axe.ron
new file mode 100644
index 0000000000..b311c0a8fb
--- /dev/null
+++ b/assets/common/skillset/preset/rank1/axe.ron
@@ -0,0 +1,10 @@
+([
+    Group(Weapon(Axe)),
+
+    // DoubleStrike
+    Skill((Axe(DsDamage), Some(1))),
+    // Spin
+    Skill((Axe(SInfinite), None)),
+    Skill((Axe(SDamage), Some(1))),
+
+])
diff --git a/assets/common/skillset/dungeon/tier-0/bow.ron b/assets/common/skillset/preset/rank1/bow.ron
similarity index 51%
rename from assets/common/skillset/dungeon/tier-0/bow.ron
rename to assets/common/skillset/preset/rank1/bow.ron
index 368cf79286..654828bf17 100644
--- a/assets/common/skillset/dungeon/tier-0/bow.ron
+++ b/assets/common/skillset/preset/rank1/bow.ron
@@ -1,10 +1,14 @@
 ([
     Group(Weapon(Bow)),
 
+    // Projectile Speed
+    Skill((Bow(ProjSpeed), Some(1))),
+
     // Charged
     Skill((Bow(CDamage), Some(1))),
     Skill((Bow(CKnockback), Some(1))),
-    Skill((Bow(CSpeed), Some(1))),
-    Skill((Bow(CMove), Some(1))),
+
+    // Repeater
+    Skill((Bow(RDamage), Some(1))),
 
 ])
diff --git a/assets/common/skillset/preset/rank1/fullskill.ron b/assets/common/skillset/preset/rank1/fullskill.ron
new file mode 100644
index 0000000000..3514e96b6c
--- /dev/null
+++ b/assets/common/skillset/preset/rank1/fullskill.ron
@@ -0,0 +1,9 @@
+([
+    Tree("common.skillset.preset.rank1.axe"),
+    Tree("common.skillset.preset.rank1.bow"),
+    Tree("common.skillset.preset.rank1.general"),
+    Tree("common.skillset.preset.rank1.hammer"),
+    Tree("common.skillset.preset.rank1.sceptre"),
+    Tree("common.skillset.preset.rank1.staff"),
+    Tree("common.skillset.preset.rank1.sword"),
+])
diff --git a/assets/common/skillset/preset/rank1/general.ron b/assets/common/skillset/preset/rank1/general.ron
new file mode 100644
index 0000000000..66c8d5ebd0
--- /dev/null
+++ b/assets/common/skillset/preset/rank1/general.ron
@@ -0,0 +1,4 @@
+([
+    Skill((General(HealthIncrease), Some(2))),
+    Skill((General(EnergyIncrease), Some(1))),
+])
diff --git a/assets/common/skillset/preset/rank1/hammer.ron b/assets/common/skillset/preset/rank1/hammer.ron
new file mode 100644
index 0000000000..28f71d0fcb
--- /dev/null
+++ b/assets/common/skillset/preset/rank1/hammer.ron
@@ -0,0 +1,12 @@
+([
+    Group(Weapon(Hammer)),
+
+    // Single Strike, as single as you are
+    Skill((Hammer(SsKnockback), Some(1))),
+    Skill((Hammer(SsDamage), Some(1))),
+
+    // Charged
+    Skill((Hammer(CDamage), Some(1))),
+    Skill((Hammer(CKnockback), Some(1))),
+
+])
diff --git a/assets/common/skillset/preset/rank1/sceptre.ron b/assets/common/skillset/preset/rank1/sceptre.ron
new file mode 100644
index 0000000000..cadf369907
--- /dev/null
+++ b/assets/common/skillset/preset/rank1/sceptre.ron
@@ -0,0 +1,12 @@
+([
+    Group(Weapon(Sceptre)),
+
+    // Beam
+    Skill((Sceptre(LDamage), Some(1))),
+    Skill((Sceptre(LRange), Some(1))),
+
+    // Heal
+    Skill((Sceptre(HHeal), Some(1))),
+    Skill((Sceptre(HDuration), Some(1))),
+
+])
diff --git a/assets/common/skillset/dungeon/tier-1/staff.ron b/assets/common/skillset/preset/rank1/staff.ron
similarity index 100%
rename from assets/common/skillset/dungeon/tier-1/staff.ron
rename to assets/common/skillset/preset/rank1/staff.ron
diff --git a/assets/common/skillset/preset/rank1/sword.ron b/assets/common/skillset/preset/rank1/sword.ron
new file mode 100644
index 0000000000..1a8ac2670b
--- /dev/null
+++ b/assets/common/skillset/preset/rank1/sword.ron
@@ -0,0 +1,14 @@
+([
+    Group(Weapon(Sword)),
+
+    Skill((Sword(InterruptingAttacks), None)),
+
+    // TripleStrike
+    Skill((Sword(TsCombo), None)),
+    Skill((Sword(TsDamage), Some(1))),
+    Skill((Sword(TsRegen), Some(1))),
+
+    // Dash
+    Skill((Sword(DCost), Some(1))),
+
+])
diff --git a/assets/common/skillset/preset/rank2/axe.ron b/assets/common/skillset/preset/rank2/axe.ron
new file mode 100644
index 0000000000..1de7ffe695
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/axe.ron
@@ -0,0 +1,14 @@
+([
+    Group(Weapon(Axe)),
+
+    // DoubleStrike
+    Skill((Axe(DsCombo), None)),
+    Skill((Axe(DsDamage), Some(1))),
+    Skill((Axe(DsRegen), Some(1))),
+    // Spin
+    Skill((Axe(SInfinite), None)),
+    Skill((Axe(SHelicopter), None)),
+    Skill((Axe(SDamage), Some(1))),
+    Skill((Axe(SSpeed), Some(1))),
+
+])
diff --git a/assets/common/skillset/preset/rank2/bow.ron b/assets/common/skillset/preset/rank2/bow.ron
new file mode 100644
index 0000000000..9909e277d1
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/bow.ron
@@ -0,0 +1,17 @@
+([
+    Group(Weapon(Bow)),
+
+    // Projectile Speed
+    Skill((Bow(ProjSpeed), Some(1))),
+
+    // Charged
+    Skill((Bow(CDamage), Some(1))),
+    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CRegen), Some(1))),
+
+    // Repeater
+    Skill((Bow(RDamage), Some(1))),
+    Skill((Bow(RCost), Some(1))),
+
+])
diff --git a/assets/common/skillset/preset/rank2/fullskill.ron b/assets/common/skillset/preset/rank2/fullskill.ron
new file mode 100644
index 0000000000..11e0b2bf85
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/fullskill.ron
@@ -0,0 +1,9 @@
+([
+    Tree("common.skillset.preset.rank2.axe"),
+    Tree("common.skillset.preset.rank2.bow"),
+    Tree("common.skillset.preset.rank2.general"),
+    Tree("common.skillset.preset.rank2.hammer"),
+    Tree("common.skillset.preset.rank2.sceptre"),
+    Tree("common.skillset.preset.rank2.staff"),
+    Tree("common.skillset.preset.rank2.sword"),
+])
diff --git a/assets/common/skillset/preset/rank2/general.ron b/assets/common/skillset/preset/rank2/general.ron
new file mode 100644
index 0000000000..8849b057e9
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/general.ron
@@ -0,0 +1,4 @@
+([
+    Skill((General(HealthIncrease), Some(4))),
+    Skill((General(EnergyIncrease), Some(2))),
+])
diff --git a/assets/common/skillset/preset/rank2/hammer.ron b/assets/common/skillset/preset/rank2/hammer.ron
new file mode 100644
index 0000000000..5a1904baa4
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/hammer.ron
@@ -0,0 +1,16 @@
+([
+    Group(Weapon(Hammer)),
+
+    // Single Strike, as single as you are
+    Skill((Hammer(SsKnockback), Some(1))),
+    Skill((Hammer(SsDamage), Some(2))),
+    Skill((Hammer(SsRegen), Some(1))),
+    Skill((Hammer(SsSpeed), Some(1))),
+
+    // Charged
+    Skill((Hammer(CDamage), Some(1))),
+    Skill((Hammer(CKnockback), Some(1))),
+    Skill((Hammer(CDrain), Some(1))),
+    Skill((Hammer(CSpeed), Some(1))),
+
+])
diff --git a/assets/common/skillset/preset/rank2/sceptre.ron b/assets/common/skillset/preset/rank2/sceptre.ron
new file mode 100644
index 0000000000..a935e378f9
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/sceptre.ron
@@ -0,0 +1,16 @@
+([
+    Group(Weapon(Sceptre)),
+
+    // Beam
+    Skill((Sceptre(LDamage), Some(1))),
+    Skill((Sceptre(LRange), Some(1))),
+    Skill((Sceptre(LLifesteal), Some(1))),
+    Skill((Sceptre(LRegen), Some(1))),
+
+    // Heal
+    Skill((Sceptre(HHeal), Some(1))),
+    Skill((Sceptre(HDuration), Some(1))),
+    Skill((Sceptre(HRange), Some(1))),
+    Skill((Sceptre(HCost), Some(1))),
+
+])
diff --git a/assets/common/skillset/dungeon/tier-2/staff.ron b/assets/common/skillset/preset/rank2/staff.ron
similarity index 98%
rename from assets/common/skillset/dungeon/tier-2/staff.ron
rename to assets/common/skillset/preset/rank2/staff.ron
index ce6f3ea287..6316e9e71b 100644
--- a/assets/common/skillset/dungeon/tier-2/staff.ron
+++ b/assets/common/skillset/preset/rank2/staff.ron
@@ -10,4 +10,4 @@
     Skill((Staff(FRange), Some(2))),
     Skill((Staff(FDamage), Some(2))),
 
-])
\ No newline at end of file
+])
diff --git a/assets/common/skillset/preset/rank2/sword.ron b/assets/common/skillset/preset/rank2/sword.ron
new file mode 100644
index 0000000000..bd7fdb164c
--- /dev/null
+++ b/assets/common/skillset/preset/rank2/sword.ron
@@ -0,0 +1,17 @@
+([
+    Group(Weapon(Sword)),
+
+    Skill((Sword(InterruptingAttacks), None)),
+
+    // TripleStrike
+    Skill((Sword(TsCombo), None)),
+    Skill((Sword(TsDamage), Some(1))),
+    Skill((Sword(TsRegen), Some(1))),
+    Skill((Sword(TsSpeed), Some(1))),
+
+    // Dash
+    Skill((Sword(DCost), Some(1))),
+    Skill((Sword(DDrain), Some(1))),
+    Skill((Sword(DDamage), Some(1))),
+
+])
diff --git a/assets/common/skillset/preset/rank3/axe.ron b/assets/common/skillset/preset/rank3/axe.ron
new file mode 100644
index 0000000000..752888e1f9
--- /dev/null
+++ b/assets/common/skillset/preset/rank3/axe.ron
@@ -0,0 +1,20 @@
+([
+    Group(Weapon(Axe)),
+
+    // DoubleStrike
+    Skill((Axe(DsCombo), None)),
+    Skill((Axe(DsDamage), Some(1))),
+    Skill((Axe(DsRegen), Some(1))),
+    Skill((Axe(DsSpeed), Some(1))),
+
+    // Spin
+    Skill((Axe(SInfinite), None)),
+    Skill((Axe(SHelicopter), None)),
+    Skill((Axe(SDamage), Some(1))),
+    Skill((Axe(SSpeed), Some(1))),
+    Skill((Axe(SCost), Some(1))),
+
+    // Leap
+    Skill((Axe(UnlockLeap), None)),
+    Skill((Axe(LDamage), Some(1))),
+])
diff --git a/assets/common/skillset/preset/rank3/bow.ron b/assets/common/skillset/preset/rank3/bow.ron
new file mode 100644
index 0000000000..3c90d864e7
--- /dev/null
+++ b/assets/common/skillset/preset/rank3/bow.ron
@@ -0,0 +1,23 @@
+([
+    Group(Weapon(Bow)),
+
+    // Projectile Speed
+    Skill((Bow(ProjSpeed), Some(2))),
+
+    // Charged
+    Skill((Bow(CDamage), Some(1))),
+    Skill((Bow(CKnockback), Some(1))),
+    Skill((Bow(CSpeed), Some(1))),
+    Skill((Bow(CRegen), Some(1))),
+    Skill((Bow(CMove), Some(1))),
+
+    // Repeater
+    Skill((Bow(RDamage), Some(1))),
+    Skill((Bow(RCost), Some(1))),
+    Skill((Bow(RSpeed), Some(1))),
+
+    // Shotgun
+    Skill((Bow(UnlockShotgun), None)),
+    Skill((Bow(SDamage), Some(1))),
+    Skill((Bow(SCost), Some(1))),
+])
diff --git a/assets/common/skillset/preset/rank3/fullskill.ron b/assets/common/skillset/preset/rank3/fullskill.ron
new file mode 100644
index 0000000000..753d51f83c
--- /dev/null
+++ b/assets/common/skillset/preset/rank3/fullskill.ron
@@ -0,0 +1,9 @@
+([
+    Tree("common.skillset.preset.rank3.axe"),
+    Tree("common.skillset.preset.rank3.bow"),
+    Tree("common.skillset.preset.rank3.general"),
+    Tree("common.skillset.preset.rank3.hammer"),
+    Tree("common.skillset.preset.rank3.sceptre"),
+    Tree("common.skillset.preset.rank3.staff"),
+    Tree("common.skillset.preset.rank3.sword"),
+])
diff --git a/assets/common/skillset/preset/rank3/general.ron b/assets/common/skillset/preset/rank3/general.ron
new file mode 100644
index 0000000000..6b1cedbfe0
--- /dev/null
+++ b/assets/common/skillset/preset/rank3/general.ron
@@ -0,0 +1,4 @@
+([
+    Skill((General(HealthIncrease), Some(6))),
+    Skill((General(EnergyIncrease), Some(3))),
+])
diff --git a/assets/common/skillset/preset/rank3/hammer.ron b/assets/common/skillset/preset/rank3/hammer.ron
new file mode 100644
index 0000000000..7bf7799b10
--- /dev/null
+++ b/assets/common/skillset/preset/rank3/hammer.ron
@@ -0,0 +1,21 @@
+([
+    Group(Weapon(Hammer)),
+
+    // Single Strike, as single as you are
+    Skill((Hammer(SsKnockback), Some(2))),
+    Skill((Hammer(SsDamage), Some(2))),
+    Skill((Hammer(SsRegen), Some(1))),
+    Skill((Hammer(SsSpeed), Some(1))),
+
+    // Charged
+    Skill((Hammer(CDamage), Some(2))),
+    Skill((Hammer(CKnockback), Some(1))),
+    Skill((Hammer(CDrain), Some(1))),
+    Skill((Hammer(CSpeed), Some(1))),
+
+    // Leap
+    Skill((Hammer(UnlockLeap), None)),
+    Skill((Hammer(LDamage), Some(1))),
+    Skill((Hammer(LCost), Some(1))),
+    Skill((Hammer(LDistance), Some(1))),
+])
diff --git a/assets/common/skillset/preset/rank3/sceptre.ron b/assets/common/skillset/preset/rank3/sceptre.ron
new file mode 100644
index 0000000000..73ad0437b6
--- /dev/null
+++ b/assets/common/skillset/preset/rank3/sceptre.ron
@@ -0,0 +1,19 @@
+([
+    Group(Weapon(Sceptre)),
+
+    // Beam
+    Skill((Sceptre(LDamage), Some(2))),
+    Skill((Sceptre(LRange), Some(2))),
+    Skill((Sceptre(LLifesteal), Some(1))),
+    Skill((Sceptre(LRegen), Some(1))),
+
+    // Heal
+    Skill((Sceptre(HHeal), Some(2))),
+    Skill((Sceptre(HDuration), Some(1))),
+    Skill((Sceptre(HRange), Some(1))),
+    Skill((Sceptre(HCost), Some(1))),
+    // Ward
+    Skill((Sceptre(UnlockAura), None)),
+    Skill((Sceptre(AStrength), Some(1))),
+    Skill((Sceptre(ADuration), Some(1))),
+])
diff --git a/assets/common/skillset/dungeon/tier-3/staff.ron b/assets/common/skillset/preset/rank3/staff.ron
similarity index 100%
rename from assets/common/skillset/dungeon/tier-3/staff.ron
rename to assets/common/skillset/preset/rank3/staff.ron
diff --git a/assets/common/skillset/village/merchant/sword.ron b/assets/common/skillset/preset/rank3/sword.ron
similarity index 86%
rename from assets/common/skillset/village/merchant/sword.ron
rename to assets/common/skillset/preset/rank3/sword.ron
index 02a33e62bd..a2cf9a4eac 100644
--- a/assets/common/skillset/village/merchant/sword.ron
+++ b/assets/common/skillset/preset/rank3/sword.ron
@@ -18,4 +18,6 @@
 
     // Spin of death
     Skill((Sword(UnlockSpin), None)),
-])
\ No newline at end of file
+    Skill((Sword(SDamage), Some(1))),
+    Skill((Sword(SSpeed), Some(1))),
+])
diff --git a/assets/common/skillset/preset/rank4/axe.ron b/assets/common/skillset/preset/rank4/axe.ron
new file mode 100644
index 0000000000..7d0451fc16
--- /dev/null
+++ b/assets/common/skillset/preset/rank4/axe.ron
@@ -0,0 +1,23 @@
+([
+    Group(Weapon(Axe)),
+
+    // DoubleStrike
+    Skill((Axe(DsCombo), None)),
+    Skill((Axe(DsDamage), Some(2))),
+    Skill((Axe(DsRegen), Some(1))),
+    Skill((Axe(DsSpeed), Some(2))),
+
+    // Spin
+    Skill((Axe(SInfinite), None)),
+    Skill((Axe(SHelicopter), None)),
+    Skill((Axe(SDamage), Some(2))),
+    Skill((Axe(SSpeed), Some(1))),
+    Skill((Axe(SCost), Some(1))),
+
+    // Leap
+    Skill((Axe(UnlockLeap), None)),
+    Skill((Axe(LDamage), Some(1))),
+    Skill((Axe(LKnockback), Some(1))),
+    Skill((Axe(LCost), Some(1))),
+    Skill((Axe(LDistance), Some(1))),
+])
diff --git a/assets/common/skillset/village/merchant/bow.ron b/assets/common/skillset/preset/rank4/bow.ron
similarity index 65%
rename from assets/common/skillset/village/merchant/bow.ron
rename to assets/common/skillset/preset/rank4/bow.ron
index 029ce8ef22..04e6187283 100644
--- a/assets/common/skillset/village/merchant/bow.ron
+++ b/assets/common/skillset/preset/rank4/bow.ron
@@ -1,6 +1,9 @@
 ([
     Group(Weapon(Bow)),
 
+    // Projectile Speed
+    Skill((Bow(ProjSpeed), Some(2))),
+
     // Charged
     Skill((Bow(CDamage), Some(2))),
     Skill((Bow(CKnockback), Some(2))),
@@ -15,4 +18,8 @@
 
     // Shotgun
     Skill((Bow(UnlockShotgun), None)),
-])
\ No newline at end of file
+    Skill((Bow(SDamage), Some(1))),
+    Skill((Bow(SCost), Some(1))),
+    Skill((Bow(SArrows), Some(1))),
+    Skill((Bow(SSpread), Some(1))),
+])
diff --git a/assets/common/skillset/preset/rank4/fullskill.ron b/assets/common/skillset/preset/rank4/fullskill.ron
new file mode 100644
index 0000000000..a5b36733f1
--- /dev/null
+++ b/assets/common/skillset/preset/rank4/fullskill.ron
@@ -0,0 +1,9 @@
+([
+    Tree("common.skillset.preset.rank4.axe"),
+    Tree("common.skillset.preset.rank4.bow"),
+    Tree("common.skillset.preset.rank4.general"),
+    Tree("common.skillset.preset.rank4.hammer"),
+    Tree("common.skillset.preset.rank4.sceptre"),
+    Tree("common.skillset.preset.rank4.staff"),
+    Tree("common.skillset.preset.rank4.sword"),
+])
diff --git a/assets/common/skillset/preset/rank4/general.ron b/assets/common/skillset/preset/rank4/general.ron
new file mode 100644
index 0000000000..063b80d8a2
--- /dev/null
+++ b/assets/common/skillset/preset/rank4/general.ron
@@ -0,0 +1,4 @@
+([
+    Skill((General(HealthIncrease), Some(8))),
+    Skill((General(EnergyIncrease), Some(4))),
+])
diff --git a/assets/common/skillset/preset/rank4/hammer.ron b/assets/common/skillset/preset/rank4/hammer.ron
new file mode 100644
index 0000000000..ffe3c8594d
--- /dev/null
+++ b/assets/common/skillset/preset/rank4/hammer.ron
@@ -0,0 +1,23 @@
+([
+    Group(Weapon(Hammer)),
+
+    // Single Strike, as single as you are
+    Skill((Hammer(SsKnockback), Some(2))),
+    Skill((Hammer(SsDamage), Some(2))),
+    Skill((Hammer(SsRegen), Some(2))),
+    Skill((Hammer(SsSpeed), Some(2))),
+
+    // Charged
+    Skill((Hammer(CDamage), Some(2))),
+    Skill((Hammer(CKnockback), Some(2))),
+    Skill((Hammer(CDrain), Some(2))),
+    Skill((Hammer(CSpeed), Some(2))),
+
+    // Leap
+    Skill((Hammer(UnlockLeap), None)),
+    Skill((Hammer(LDamage), Some(1))),
+    Skill((Hammer(LCost), Some(1))),
+    Skill((Hammer(LDistance), Some(1))),
+    Skill((Hammer(LKnockback), Some(1))),
+    Skill((Hammer(LRange), Some(1))),
+])
diff --git a/assets/common/skillset/dungeon/tier-3/sceptre.ron b/assets/common/skillset/preset/rank4/sceptre.ron
similarity index 93%
rename from assets/common/skillset/dungeon/tier-3/sceptre.ron
rename to assets/common/skillset/preset/rank4/sceptre.ron
index d736f740f0..b174970953 100644
--- a/assets/common/skillset/dungeon/tier-3/sceptre.ron
+++ b/assets/common/skillset/preset/rank4/sceptre.ron
@@ -2,7 +2,7 @@
     Group(Weapon(Sceptre)),
 
     // Beam
-    Skill((Sceptre(LDamage), Some(3))),
+    Skill((Sceptre(LDamage), Some(2))),
     Skill((Sceptre(LRange), Some(2))),
     Skill((Sceptre(LLifesteal), Some(2))),
     Skill((Sceptre(LRegen), Some(2))),
diff --git a/assets/common/skillset/village/merchant/staff.ron b/assets/common/skillset/preset/rank4/staff.ron
similarity index 50%
rename from assets/common/skillset/village/merchant/staff.ron
rename to assets/common/skillset/preset/rank4/staff.ron
index 0c3baff6a5..454d0ff6b2 100644
--- a/assets/common/skillset/village/merchant/staff.ron
+++ b/assets/common/skillset/preset/rank4/staff.ron
@@ -2,16 +2,20 @@
     Group(Weapon(Staff)),
 
     // Fireball
-    Skill((Staff(BDamage), Some(3))),
+    Skill((Staff(BDamage), Some(1))),
     Skill((Staff(BRegen), Some(2))),
     Skill((Staff(BRadius), Some(2))),
 
     // Flamethrower
     Skill((Staff(FRange), Some(2))),
-    Skill((Staff(FDamage), Some(2))),
+    Skill((Staff(FDamage), Some(1))),
     Skill((Staff(FDrain), Some(1))),
-    Skill((Staff(FVelocity), Some(1))),
+    Skill((Staff(FVelocity), Some(2))),
 
     // Shockwave
     Skill((Staff(UnlockShockwave), None)),
-])
\ No newline at end of file
+    Skill((Staff(SDamage), Some(1))),
+    Skill((Staff(SKnockback), Some(1))),
+    Skill((Staff(SRange), Some(1))),
+    Skill((Staff(SCost), Some(1))),
+])
diff --git a/assets/common/skillset/dungeon/tier-3/sword.ron b/assets/common/skillset/preset/rank4/sword.ron
similarity index 55%
rename from assets/common/skillset/dungeon/tier-3/sword.ron
rename to assets/common/skillset/preset/rank4/sword.ron
index 19f60c2bd1..8d7ba0abcc 100644
--- a/assets/common/skillset/dungeon/tier-3/sword.ron
+++ b/assets/common/skillset/preset/rank4/sword.ron
@@ -1,18 +1,26 @@
 ([
     Group(Weapon(Sword)),
 
+    Skill((Sword(InterruptingAttacks), None)),
+
     // TripleStrike
     Skill((Sword(TsCombo), None)),
-    Skill((Sword(TsDamage), Some(3))),
+    Skill((Sword(TsDamage), Some(2))),
     Skill((Sword(TsRegen), Some(2))),
+    Skill((Sword(TsSpeed), Some(3))),
 
     // Dash
-    Skill((Sword(DDamage), Some(2))),
     Skill((Sword(DCost), Some(2))),
     Skill((Sword(DDrain), Some(2))),
+    Skill((Sword(DDamage), Some(2))),
+    Skill((Sword(DScaling), Some(2))),
+    Skill((Sword(DSpeed), None)),
+    Skill((Sword(DInfinite), None)),
 
     // Spin of death
     Skill((Sword(UnlockSpin), None)),
     Skill((Sword(SDamage), Some(1))),
+    Skill((Sword(SSpeed), Some(1))),
+    Skill((Sword(SSpins), Some(1))),
     Skill((Sword(SCost), Some(1))),
 ])
diff --git a/assets/common/skillset/preset/max/axe.ron b/assets/common/skillset/preset/rank5/axe.ron
similarity index 100%
rename from assets/common/skillset/preset/max/axe.ron
rename to assets/common/skillset/preset/rank5/axe.ron
diff --git a/assets/common/skillset/preset/max/bow.ron b/assets/common/skillset/preset/rank5/bow.ron
similarity index 100%
rename from assets/common/skillset/preset/max/bow.ron
rename to assets/common/skillset/preset/rank5/bow.ron
diff --git a/assets/common/skillset/preset/rank5/fullskill.ron b/assets/common/skillset/preset/rank5/fullskill.ron
new file mode 100644
index 0000000000..c082fc543c
--- /dev/null
+++ b/assets/common/skillset/preset/rank5/fullskill.ron
@@ -0,0 +1,9 @@
+([
+    Tree("common.skillset.preset.rank5.axe"),
+    Tree("common.skillset.preset.rank5.bow"),
+    Tree("common.skillset.preset.rank5.general"),
+    Tree("common.skillset.preset.rank5.hammer"),
+    Tree("common.skillset.preset.rank5.sceptre"),
+    Tree("common.skillset.preset.rank5.staff"),
+    Tree("common.skillset.preset.rank5.sword"),
+])
diff --git a/assets/common/skillset/preset/max/general.ron b/assets/common/skillset/preset/rank5/general.ron
similarity index 100%
rename from assets/common/skillset/preset/max/general.ron
rename to assets/common/skillset/preset/rank5/general.ron
diff --git a/assets/common/skillset/preset/max/hammer.ron b/assets/common/skillset/preset/rank5/hammer.ron
similarity index 100%
rename from assets/common/skillset/preset/max/hammer.ron
rename to assets/common/skillset/preset/rank5/hammer.ron
diff --git a/assets/common/skillset/preset/max/sceptre.ron b/assets/common/skillset/preset/rank5/sceptre.ron
similarity index 100%
rename from assets/common/skillset/preset/max/sceptre.ron
rename to assets/common/skillset/preset/rank5/sceptre.ron
diff --git a/assets/common/skillset/preset/max/staff.ron b/assets/common/skillset/preset/rank5/staff.ron
similarity index 100%
rename from assets/common/skillset/preset/max/staff.ron
rename to assets/common/skillset/preset/rank5/staff.ron
diff --git a/assets/common/skillset/preset/max/sword.ron b/assets/common/skillset/preset/rank5/sword.ron
similarity index 100%
rename from assets/common/skillset/preset/max/sword.ron
rename to assets/common/skillset/preset/rank5/sword.ron
diff --git a/assets/common/skillset/spots/witch.ron b/assets/common/skillset/spots/witch.ron
deleted file mode 100644
index e43d456499..0000000000
--- a/assets/common/skillset/spots/witch.ron
+++ /dev/null
@@ -1,4 +0,0 @@
-([
-    Tree("common.skillset.preset.max.general"),
-    Tree("common.skillset.preset.max.sceptre"),
-])
diff --git a/assets/common/skillset/village/guard.ron b/assets/common/skillset/village/guard.ron
deleted file mode 100644
index d355af1cde..0000000000
--- a/assets/common/skillset/village/guard.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    Tree("common.skillset.preset.max.sword"),
-    Tree("common.skillset.preset.max.bow"),
-    Tree("common.skillset.preset.max.axe"),
-])
diff --git a/assets/common/skillset/village/merchant/merchant.ron b/assets/common/skillset/village/merchant/merchant.ron
deleted file mode 100644
index eb7778b299..0000000000
--- a/assets/common/skillset/village/merchant/merchant.ron
+++ /dev/null
@@ -1,5 +0,0 @@
-([
-    Tree("common.skillset.village.merchant.sword"),
-    Tree("common.skillset.village.merchant.bow"),
-    Tree("common.skillset.village.merchant.staff"),
-])