diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01500-01599.xml
index dcada368e2..2350e9236e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01500-01599.xml
@@ -3865,14 +3865,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3895,14 +3895,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3925,14 +3925,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3955,14 +3955,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3989,20 +3989,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01500-01599.xml
index 184633be29..b736ffe591 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01500-01599.xml
index 184633be29..b736ffe591 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01500-01599.xml
index cd23aa6fd5..ca80ece1c9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01500-01599.xml
index e5ab35b2e6..41b88175a9 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01500-01599.xml
index 622f3c0989..2fea2cd67e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 2c0c9396ca..885fe1faad 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -88,7 +88,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01500-01599.xml
index 961a09a6e3..e901695bfd 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index b98dde2b49..4109b70287 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -57,7 +57,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -89,7 +89,7 @@ public class ClassChange extends AbstractEffect
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
 				player.sendPacket(new ExAcquireAPSkillList(player));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01500-01599.xml
index 797b0a349c..be622ead44 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
index 9a65a02e95..43f67963a5 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java
@@ -56,7 +56,7 @@ public class ClassChange extends AbstractEffect
 		if (effected.isPlayer())
 		{
 			final PlayerInstance player = effected.getActingPlayer();
-			// TODO: FIX ME - Executing 1 second later otherwise interupted exception during storeCharBase()
+			// TODO: FIX ME - Executing 100 ms later otherwise interupted exception during storeCharBase()
 			ThreadPool.schedule(() ->
 			{
 				final int activeClass = player.getClassId().getId();
@@ -86,7 +86,7 @@ public class ClassChange extends AbstractEffect
 				player.broadcastUserInfo();
 				player.sendPacket(new AcquireSkillList(player));
 				player.sendPacket(new ExSubjobInfo(player, SubclassInfoType.CLASS_CHANGED));
-			}, 1000);
+			}, 100);
 		}
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01500-01599.xml
index cd23aa6fd5..ca80ece1c9 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01500-01599.xml
@@ -3909,14 +3909,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3939,14 +3939,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3969,14 +3969,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -3999,14 +3999,14 @@
 		<!-- Change the class. -->
 		<icon>icon.skill0810</icon>
 		<operateType>A1</operateType>
-		<hitTime>5000</hitTime>
+		<hitTime>2500</hitTime>
 		<effectPoint>1</effectPoint>
 		<reuseDelay>3000</reuseDelay>
 		<isMagic>2</isMagic>
 		<staticReuse>true</staticReuse>
 		<magicCriticalRate>5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<hitCancelTime>5</hitCancelTime>
+		<hitCancelTime>0</hitCancelTime>
 		<reuseDelayGroup>1566</reuseDelayGroup>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -4033,20 +4033,21 @@
 		<abnormalType>CLASS_CHANGE</abnormalType>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
-		<isMagic>1</isMagic>
+		<isMagic>2</isMagic>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
-		<magicCriticalRate>5</magicCriticalRate>
+		<magicCriticalRate>0</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
 		<hitCancelTime>0</hitCancelTime>
 		<magicLvl>-2</magicLvl>
 		<irreplacableBuff>true</irreplacableBuff>
 		<isDebuff>true</isDebuff>
+		<canBeDispelled>false</canBeDispelled>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockSkill">
-				<magicTypes>1;2;3;4;5</magicTypes>
+				<magicTypes>0;1;2;3;4;5;7;22;</magicTypes>
 			</effect>
 			<effect name="PAtk">
 				<amount>-70</amount>