diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_fighter.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_fighter.htm
index f4763ceff8..be352871ac 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_fighter.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_fighter.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_mage.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_mage.htm
index 36837e209d..201c24a98e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_mage.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dark_elf_mage.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dwarf.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dwarf.htm
index d35c61b3cc..12c0dce614 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dwarf.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/dwarf.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_fighter.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_fighter.htm
index 79b568ae23..1e3dff9c63 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_fighter.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_fighter.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_mage.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_mage.htm
index 8e92091431..adfab74ecf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_mage.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/elf_mage.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_fighter.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_fighter.htm
index 133e67e115..505f03b7e4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_fighter.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_fighter.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_mage.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_mage.htm
index 54fd5779cc..d50648a954 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_mage.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/human_mage.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/kamael.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/kamael.htm
new file mode 100644
index 0000000000..d8df260de8
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/kamael.htm
@@ -0,0 +1,50 @@
+<html><body>
+<title>//setclass  Menu</title>
+<table width="260"><tr>
+<td width="40"><center><button value="Back to Main Menu" action="bypass -h admin_admin" width="292" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
+</tr></table>
+<table width="260" border="0" bgcolor="000000">
+<tr>
+<td><button value="Human F." action="bypass -h admin_html setclass/human_fighter.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Human M." action="bypass -h admin_html setclass/human_mage.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Elf F." action="bypass -h admin_html setclass/elf_fighter.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Elf M." action="bypass -h admin_html setclass/elf_mage.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+<tr>
+<td><button value="Dark Elf F." action="bypass -h admin_html setclass/dark_elf_fighter.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Dark Elf M." action="bypass -h admin_html setclass/dark_elf_mage.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Orc F." action="bypass -h admin_html setclass/orc_fighter.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Orc M." action="bypass -h admin_html setclass/orc_mage.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+<tr>
+<td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<table width="308" border="0" bgcolor="999999">
+<tr>
+<td><center><button value="Soldier" action="bypass -h admin_setclass 192" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
+</tr>
+</table>
+<table width="302" border="0" bgcolor="666666">
+<tr>
+<td><button value="Trooper" action="bypass -h admin_setclass 125" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Soul Finder" action="bypass -h admin_setclass 193" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Warder" action="bypass -h admin_setclass 126" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<table width="302" border="0" bgcolor="0066FF">
+<tr>
+<td><button value="Berserker" action="bypass -h admin_setclass 127" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Soul Breaker" action="bypass -h admin_setclass 194" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Soul Ranger" action="bypass -h admin_setclass 130" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<table width="302" border="0" bgcolor="0066FF">
+<tr>
+<td><button value="Doombringer" action="bypass -h admin_setclass 131" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Soul Hound" action="bypass -h admin_setclass 195" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Trickster" action="bypass -h admin_setclass 134" width="86" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_fighter.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_fighter.htm
index da7f865faa..ddbb84e62d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_fighter.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_fighter.htm
@@ -19,6 +19,7 @@
 <tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_mage.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_mage.htm
index 5d0dfc125a..0b2a4223fc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_mage.htm
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/setclass/orc_mage.htm
@@ -18,6 +18,7 @@
 </tr>
 <tr>
 <td><button value="Dwarf" action="bypass -h admin_html setclass/dwarf.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Kamael" action="bypass -h admin_html setclass/kamael.htm" width="70" height="15" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
 <table width="302" border="0" bgcolor="999999">
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/1stClass/Warden.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/1stClass/Warder.xml
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/1stClass/Warden.xml
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/1stClass/Warder.xml
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/2ndClass/Arbalester.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/2ndClass/SoulRanger.xml
similarity index 100%
rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/2ndClass/Arbalester.xml
rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/skillTrees/2ndClass/SoulRanger.xml
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/ClassId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/ClassId.java
index cea861cc2a..1b4d3e90a0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/ClassId.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/ClassId.java
@@ -145,15 +145,15 @@ public enum ClassId implements IIdentifiable
 	
 	TROOPER(125, false, Race.KAMAEL, KAMAEL_SOLDIER),
 	SOUL_FINDER(193, false, Race.KAMAEL, KAMAEL_SOLDIER),
-	WARDEN(126, false, Race.KAMAEL, KAMAEL_SOLDIER),
+	WARDER(126, false, Race.KAMAEL, KAMAEL_SOLDIER),
 	
 	BERSERKER(127, false, Race.KAMAEL, TROOPER),
 	SOUL_BREAKER(194, false, Race.KAMAEL, SOUL_FINDER),
-	ARBALESTER(130, false, Race.KAMAEL, WARDEN),
+	SOUL_RANGER(130, false, Race.KAMAEL, WARDER),
 	
 	DOOMBRINGER(131, false, Race.KAMAEL, BERSERKER),
 	SOUL_HOUND(195, false, Race.KAMAEL, SOUL_BREAKER),
-	TRICKSTER(134, false, Race.KAMAEL, ARBALESTER);
+	TRICKSTER(134, false, Race.KAMAEL, SOUL_RANGER);
 	
 	/** The Identifier of the Class */
 	private final int _id;