diff --git a/src/main/java/constants/skills/BlazeWizard.java b/src/main/java/constants/skills/BlazeWizard.java
index e1990bd203..3f83bde715 100644
--- a/src/main/java/constants/skills/BlazeWizard.java
+++ b/src/main/java/constants/skills/BlazeWizard.java
@@ -25,18 +25,26 @@ package constants.skills;
  * @author BubblesDev
  */
 public class BlazeWizard {
-    public static final int ELEMENTAL_RESET = 12101005;
-    public static final int ELEMENT_AMPLIFICATION = 12110001;
-    public static final int FIRE_STRIKE = 12111006;
-    public static final int FLAME = 12001004;
-    public static final int FLAME_GEAR = 12111005;
-    public static final int IFRIT = 12111004;
+    // 1st job
     public static final int INCREASING_MAX_MP = 12000000;
-    public static final int MAGIC_ARMOR = 12001002;
     public static final int MAGIC_GUARD = 12001001;
+    public static final int MAGIC_ARMOR = 12001002;
+    public static final int MAGIC_CLAW = 12001003;
+    public static final int FLAME = 12001004;
+    // 2nd job
     public static final int MEDITATION = 12101000;
-    public static final int SEAL = 12111002;
     public static final int SLOW = 12101001;
+    public static final int FIRE_ARROW = 12101002;
+    public static final int TELEPORT = 12101003;
     public static final int SPELL_BOOSTER = 12101004;
+    public static final int ELEMENTAL_RESET = 12101005;
     public static final int FIRE_PILLAR = 12101006;
+    // 3rd job
+    public static final int ELEMENTAL_RESISTANCE = 12110000;
+    public static final int ELEMENT_AMPLIFICATION = 12110001;
+    public static final int SEAL = 12111002;
+    public static final int METEOR_SHOWER = 12111003;
+    public static final int IFRIT = 12111004;
+    public static final int FLAME_GEAR = 12111005;
+    public static final int FIRE_STRIKE = 12111006;
 }
\ No newline at end of file
diff --git a/src/main/java/constants/skills/DawnWarrior.java b/src/main/java/constants/skills/DawnWarrior.java
index a947c48a55..fad4878809 100644
--- a/src/main/java/constants/skills/DawnWarrior.java
+++ b/src/main/java/constants/skills/DawnWarrior.java
@@ -25,17 +25,26 @@ package constants.skills;
  * @author BubblesDev
  */
 public class DawnWarrior {
+    // 1st job
     public static final int MAX_HP_INCREASE = 11000000;
     public static final int IRON_BODY = 11001001;
+    public static final int POWER_STRIKE = 11001002;
+    public static final int SLASH_BLAST = 11001003;
     public static final int SOUL = 11001004;
+    // 2nd job
     public static final int SWORD_MASTERY = 11100000;
     public static final int SWORD_BOOSTER = 11101001;
     public static final int FINAL_ATTACK = 11101002;
     public static final int RAGE = 11101003;
+    public static final int SOUL_BLADE = 11101004;
+    public static final int SOUL_RUSH = 11101005;
+    // 3rd job
     public static final int INCREASED_MP_RECOVERY = 11110000;
     public static final int COMBO = 11111001;
     public static final int PANIC = 11111002;
     public static final int COMA = 11111003;
+    public static final int BRANDISH = 11111004;
     public static final int ADVANCED_COMBO = 11110005;
+    public static final int SOUL_DRIVER = 11111006;
     public static final int SOUL_CHARGE = 11111007;
 }
\ No newline at end of file
diff --git a/src/main/java/constants/skills/NightWalker.java b/src/main/java/constants/skills/NightWalker.java
index 7447d94f0a..cac276618a 100644
--- a/src/main/java/constants/skills/NightWalker.java
+++ b/src/main/java/constants/skills/NightWalker.java
@@ -25,20 +25,27 @@ package constants.skills;
  * @author BubblesDev
  */
 public class NightWalker {
-    public static final int ALCHEMIST = 14110003;
-    public static final int DISORDER = 14001002;
+    // 1st job
+    public static final int NIMBLE_BODY = 14000000;
+    public static final int KEEN_EYES = 14000001;
+    public static final int DISORDER = 14000002;
     public static final int DARK_SIGHT = 14001003;
     public static final int LUCKY_SEVEN = 14001004;
     public static final int DARKNESS = 14001005;
-    public static final int CLAW_BOOSTER = 14101002;
+    // 2nd job
     public static final int CLAW_MASTERY = 14100000;
     public static final int CRITICAL_THROW = 14100001;
+    public static final int CLAW_BOOSTER = 14101002;
     public static final int HASTE = 14101003;
-    public static final int POISON_BOMB = 14111006;
+    public static final int FLASH_JUMP = 14101004;
+    public static final int VANISH = 14100005;
+    public static final int VAMPIRE = 14101006;
+    // 3rd job
     public static final int SHADOW_PARTNER = 14111000;
     public static final int SHADOW_WEB = 14111001;
-    public static final int VANISH = 14100005;
-    public static final int FLASH_JUMP = 14101004;
-    public static final int VAMPIRE = 14101006;
+    public static final int AVENGER = 14111002;
+    public static final int ALCHEMIST = 14110003;
     public static final int VENOM = 14110004;
+    public static final int TRIPLE_THROW = 14110005;
+    public static final int POISON_BOMB = 14111006;
 }
diff --git a/src/main/java/constants/skills/ThunderBreaker.java b/src/main/java/constants/skills/ThunderBreaker.java
index 403f43d8a6..54c9a675b1 100644
--- a/src/main/java/constants/skills/ThunderBreaker.java
+++ b/src/main/java/constants/skills/ThunderBreaker.java
@@ -25,18 +25,27 @@ package constants.skills;
  * @author BubblesDev
  */
 public class ThunderBreaker {
+    // 1st job
+    public static final int QUICK_MOTION = 15000000;
+    public static final int FIRST_STRIKE = 15001001;
+    public static final int SOMERSAULT_KICK = 15001002;
     public static final int DASH = 15001003;
+    public static final int LIGHTNING = 15001004;
+    // 2nd job
     public static final int IMPROVE_MAX_HP = 15100000;
     public static final int KNUCKLER_MASTERY = 15100001;
-    public static final int ENERGY_CHARGE = 15100004;
     public static final int KNUCKLER_BOOSTER = 15101002;
     public static final int CORKSCREW_BLOW = 15101003;
-    public static final int LIGHTNING = 15001004;
+    public static final int ENERGY_CHARGE = 15100004;
+    public static final int ENERGY_BLAST = 15101005;
     public static final int LIGHTNING_CHARGE = 15101006;
-    public static final int ENERGY_DRAIN = 15111001;
+    // 3rd job
+    public static final int CRITICAL_PUNCH = 15110000;
     public static final int TRANSFORMATION = 15111002;
+    public static final int BARRAGE = 15111004;
     public static final int SPEED_INFUSION = 15111005;
+    public static final int SHOCK_WAVE = 15111003;
+    public static final int ENERGY_DRAIN = 15111001;
     public static final int SPARK = 15111006;
     public static final int SHARK_WAVE = 15111007;
-    public static final int BARRAGE = 15111004;
 }
diff --git a/src/main/java/constants/skills/WindArcher.java b/src/main/java/constants/skills/WindArcher.java
index 8071f159e5..30a2dd5dc4 100644
--- a/src/main/java/constants/skills/WindArcher.java
+++ b/src/main/java/constants/skills/WindArcher.java
@@ -25,18 +25,27 @@ package constants.skills;
  * @author BubblesDev
  */
 public class WindArcher {
+    // 1st job
     public static final int CRITICAL_SHOT = 13000000;
+    public static final int EYE_OF_AMAZON = 13000001;
     public static final int FOCUS = 13001002;
+    public static final int DOUBLE_SHOT = 13001003;
     public static final int STORM = 13001004;
+    // 2nd job
     public static final int BOW_MASTERY = 13100000;
     public static final int BOW_BOOSTER = 13101001;
     public static final int FINAL_ATTACK = 13101002;
     public static final int SOUL_ARROW = 13101003;
+    public static final int THRUST = 13100004;
     public static final int STORM_BREAK = 13101005;
     public static final int WIND_WALK = 13101006;
+    // 3rd job
+    public static final int ARROW_RAIN = 13111000;
     public static final int HURRICANE = 13111002;
+    public static final int BOW_EXPERT = 13110003;
     public static final int PUPPET = 13111004;
     public static final int EAGLE_EYE = 13111005;
     public static final int WIND_PIERCING = 13111006;
     public static final int WIND_SHOT = 13111007;
+    public static final int STRAFE = 13111001;
 }
\ No newline at end of file