From 5f13d2db66cf7e9f8c26db8e1ae2328cb43eef89 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 1 Nov 2021 15:34:09 +0000
Subject: [PATCH] Updated augmentation options and variations. Contributed by
 CostyKiller.

---
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 .../augmentation/options/35800-35899.xml      |   2 +-
 .../augmentation/options/35800-35900.xml      | 303 ------------------
 .../augmentation/options/40600-40699.xml      | 165 ++++++----
 .../augmentation/options/40700-40799.xml      | 300 +++++++++++------
 .../augmentation/options/40800-40899.xml      | 300 +++++++++++------
 .../augmentation/options/40900-40999.xml      | 262 ++++++++++-----
 30 files changed, 4789 insertions(+), 2705 deletions(-)
 delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35900.xml

diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40900-40999.xml
index 838935d671..20bc27b091 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,267 +1,353 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40900-40999.xml
index fec6d14209..08d6b9be08 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,268 +1,354 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 	<option id="40988" name="guard_agathion">
 		<!-- Custom use for Guard Agathions -->
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40900-40999.xml
index fec6d14209..08d6b9be08 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,268 +1,354 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 	<option id="40988" name="guard_agathion">
 		<!-- Custom use for Guard Agathions -->
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40900-40999.xml
index fec6d14209..08d6b9be08 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,268 +1,354 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 	<option id="40988" name="guard_agathion">
 		<!-- Custom use for Guard Agathions -->
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40900-40999.xml
index fec6d14209..08d6b9be08 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,268 +1,354 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 	<option id="40988" name="guard_agathion">
 		<!-- Custom use for Guard Agathions -->
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40900-40999.xml
index 838935d671..20bc27b091 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,267 +1,353 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 </list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35899.xml
index 012bf1dfdb..b73436b1a1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35899.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35899.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
 	<option id="35800" name="blood_shadow_retributer">
-		<passive_skill id="35850" level="1" />
+		<passive_skill id="35851" level="1" />
 	</option>
 	<option id="35801" name="abyssal_sculptor">
 		<passive_skill id="35852" level="1" />
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35900.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35900.xml
deleted file mode 100644
index 012bf1dfdb..0000000000
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/35800-35900.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="35800" name="blood_shadow_retributer">
-		<passive_skill id="35850" level="1" />
-	</option>
-	<option id="35801" name="abyssal_sculptor">
-		<passive_skill id="35852" level="1" />
-	</option>
-	<option id="35802" name="abyssal_warrior">
-		<passive_skill id="35853" level="1" />
-	</option>
-	<option id="35803" name="dual_daggers_of_abyss">
-		<passive_skill id="35854" level="1" />
-	</option>
-	<option id="35804" name="abyssal_burst">
-		<passive_skill id="35855" level="1" />
-	</option>
-	<option id="35805" name="abyssal_buster">
-		<passive_skill id="35856" level="1" />
-	</option>
-	<option id="35806" name="krishna_sharpness">
-		<passive_skill id="35857" level="1" />
-	</option>
-	<option id="35807" name="burning_krishna">
-		<passive_skill id="35858" level="1" />
-	</option>
-	<option id="35808" name="heine_cutter">
-		<passive_skill id="35859" level="1" />
-	</option>
-	<option id="35809" name="heine_stormer">
-		<passive_skill id="35860" level="1" />
-	</option>
-	<option id="35810" name="dual_swords_of_heine">
-		<passive_skill id="35861" level="1" />
-	</option>
-	<option id="35811" name="heine_guardian">
-		<passive_skill id="35862" level="1" />
-	</option>
-	<option id="35812" name="heine_caster">
-		<passive_skill id="35863" level="1" />
-	</option>
-	<option id="35813" name="one_handed_wep_training">
-		<passive_skill id="35864" level="1" />
-	</option>
-	<option id="35814" name="two_handed_wep_training">
-		<passive_skill id="35865" level="1" />
-	</option>
-	<option id="35815" name="two_handed_magic_wep_training">
-		<passive_skill id="35866" level="1" />
-	</option>
-	<option id="35816" name="one_handed_magic_wep_training">
-		<passive_skill id="35867" level="1" />
-	</option>
-	<option id="35817" name="high_quality_wep">
-		<passive_skill id="35868" level="1" />
-	</option>
-	<option id="35818" name="legacy_of_giants">
-		<passive_skill id="35869" level="1" />
-	</option>
-	<option id="35819" name="giant_legend">
-		<passive_skill id="35870" level="1" />
-	</option>
-	<option id="35820" name="blacksmith_enhanced_cutter">
-		<passive_skill id="35871" level="1" />
-	</option>
-	<option id="35821" name="blacksmith_enhanced_buster">
-		<passive_skill id="35872" level="1" />
-	</option>
-	<option id="35822" name="weapon_enhancement_1">
-		<passive_skill id="35873" level="1" />
-	</option>
-	<option id="35823" name="armor_basics">
-		<passive_skill id="35874" level="1" />
-	</option>
-	<option id="35824" name="shining_helmet">
-		<passive_skill id="35875" level="1" />
-	</option>
-	<option id="35825" name="heavy_armor_set">
-		<passive_skill id="35876" level="1" />
-	</option>
-	<option id="35826" name="light_armor_set">
-		<passive_skill id="35877" level="1" />
-	</option>
-	<option id="35827" name="robe_armor_set">
-		<passive_skill id="35878" level="1" />
-	</option>
-	<option id="35828" name="minimal_protection">
-		<passive_skill id="35879" level="1" />
-	</option>
-	<option id="35829" name="sigel_knight_symbol">
-		<passive_skill id="35880" level="1" />
-	</option>
-	<option id="35830" name="basic_heavy_armor">
-		<passive_skill id="35881" level="1" />
-	</option>
-	<option id="35831" name="basic_light_armor">
-		<passive_skill id="35882" level="1" />
-	</option>
-	<option id="35832" name="basic_robe_armor">
-		<passive_skill id="35883" level="1" />
-	</option>
-	<option id="35833" name="high_quality_helmet">
-		<passive_skill id="35884" level="1" />
-	</option>
-	<option id="35834" name="high_quality_upper_armor">
-		<passive_skill id="35885" level="1" />
-	</option>
-	<option id="35835" name="high_quality_lower_armor">
-		<passive_skill id="35886" level="1" />
-	</option>
-	<option id="35836" name="high_quality_gloves">
-		<passive_skill id="35887" level="1" />
-	</option>
-	<option id="35837" name="high_quality_shoes">
-		<passive_skill id="35888" level="1" />
-	</option>
-	<option id="35838" name="high_quality_shield">
-		<passive_skill id="35889" level="1" />
-	</option>
-	<option id="35839" name="oriharukon_gloves">
-		<passive_skill id="35890" level="1" />
-	</option>
-	<option id="35840" name="dragon_scale_gloves">
-		<passive_skill id="35891" level="1" />
-	</option>
-	<option id="35841" name="angel_feather_gloves">
-		<passive_skill id="35892" level="1" />
-	</option>
-	<option id="35842" name="eternal_armor">
-		<passive_skill id="35893" level="1" />
-	</option>
-	<option id="35843" name="leviathan_armor">
-		<passive_skill id="35894" level="1" />
-	</option>
-	<option id="35844" name="trinity">
-		<passive_skill id="35895" level="1" />
-	</option>
-	<option id="35845" name="archangel_accessories">
-		<passive_skill id="35896" level="1" />
-	</option>
-	<option id="35846" name="valakas_legacy">
-		<passive_skill id="35897" level="1" />
-	</option>
-	<option id="35847" name="antharas_legacy">
-		<passive_skill id="35898" level="1" />
-	</option>
-	<option id="35848" name="lindvior_legacy">
-		<passive_skill id="35899" level="1" />
-	</option>
-	<option id="35849" name="archangel_necklace">
-		<passive_skill id="35900" level="1" />
-	</option>
-	<option id="35850" name="archangel_earring">
-		<passive_skill id="35901" level="1" />
-	</option>
-	<option id="35851" name="archangel_ring">
-		<passive_skill id="35902" level="1" />
-	</option>
-	<option id="35852" name="guardian_angel_necklace">
-		<passive_skill id="35903" level="1" />
-	</option>
-	<option id="35853" name="guardian_angel_earring">
-		<passive_skill id="35904" level="1" />
-	</option>
-	<option id="35854" name="guardian_angel_ring">
-		<passive_skill id="35905" level="1" />
-	</option>
-	<option id="35855" name="fallen_angel_ring">
-		<passive_skill id="35906" level="1" />
-	</option>
-	<option id="35856" name="shining_accessories">
-		<passive_skill id="35907" level="1" />
-	</option>
-	<option id="35857" name="agathion_unity">
-		<passive_skill id="35908" level="1" />
-	</option>
-	<option id="35858" name="heine_valuables">
-		<passive_skill id="35909" level="1" />
-	</option>
-	<option id="35859" name="aiming_at_victory">
-		<passive_skill id="35910" level="1" />
-	</option>
-	<option id="35860" name="pile_of_gemstones">
-		<passive_skill id="35911" level="1" />
-	</option>
-	<option id="35861" name="dragon_power_shirt">
-		<passive_skill id="35912" level="1" />
-	</option>
-	<option id="35862" name="hero_shining_circlet">
-		<passive_skill id="35913" level="1" />
-	</option>
-	<option id="35863" name="ertheia_blessing">
-		<passive_skill id="35914" level="1" />
-	</option>
-	<option id="35864" name="warehouse_for_artifacts">
-		<passive_skill id="35915" level="1" />
-	</option>
-	<option id="35865" name="warehouse_for_shining_treasures">
-		<passive_skill id="35916" level="1" />
-	</option>
-	<option id="35866" name="warehouse_for_talismans">
-		<passive_skill id="35917" level="1" />
-	</option>
-	<option id="35867" name="prime_energy_of_talisman">
-		<passive_skill id="35918" level="1" />
-	</option>
-	<option id="35868" name="warehouse_for_shining_treasures_2">
-		<passive_skill id="35919" level="1" />
-	</option>
-	<option id="35869" name="ready_for_battle">
-		<passive_skill id="35920" level="1" />
-	</option>
-	<option id="35870" name="save_us">
-		<passive_skill id="35921" level="1" />
-	</option>
-	<option id="35871" name="superior_cat_eye">
-		<passive_skill id="35922" level="1" />
-	</option>
-	<option id="35872" name="the_hardest_gemstone">
-		<passive_skill id="35923" level="1" />
-	</option>
-	<option id="35873" name="shining_power">
-		<passive_skill id="35924" level="1" />
-	</option>
-	<option id="35874" name="mammon_creation">
-		<passive_skill id="35925" level="1" />
-	</option>
-	<option id="35875" name="constellation_of_summer_and_winter">
-		<passive_skill id="35926" level="1" />
-	</option>
-	<option id="35876" name="good_teammate">
-		<passive_skill id="35927" level="1" />
-	</option>
-	<option id="35877" name="advance_on_rune_castle">
-		<passive_skill id="35928" level="1" />
-	</option>
-	<option id="35878" name="advance_on_giran_castle">
-		<passive_skill id="35929" level="1" />
-	</option>
-	<option id="35879" name="advance_on_aden_castle">
-		<passive_skill id="35930" level="1" />
-	</option>
-	<option id="35880" name="rune_castle_guardian_choice">
-		<passive_skill id="35931" level="1" />
-	</option>
-	<option id="35881" name="giran_castle_guardian_choice">
-		<passive_skill id="35932" level="1" />
-	</option>
-	<option id="35882" name="aden_castle_guardian_choice">
-		<passive_skill id="35933" level="1" />
-	</option>
-	<option id="35883" name="guardian_gift">
-		<passive_skill id="35934" level="1" />
-	</option>
-	<option id="35884" name="well_balanced_artifact">
-		<passive_skill id="35935" level="1" />
-	</option>
-	<option id="35885" name="high_grade_skill_block">
-		<passive_skill id="35936" level="1" />
-	</option>
-	<option id="35886" name="mid_grade_skill_block">
-		<passive_skill id="35937" level="1" />
-	</option>
-	<option id="35887" name="low_grade_skill_block">
-		<passive_skill id="35938" level="1" />
-	</option>
-	<option id="35888" name="kain_power">
-		<passive_skill id="35939" level="1" />
-	</option>
-	<option id="35889" name="mermoden_power">
-		<passive_skill id="35940" level="1" />
-	</option>
-	<option id="35890" name="shining_legendary_symbol">
-		<passive_skill id="35941" level="1" />
-	</option>
-	<option id="35891" name="weak_symbol">
-		<passive_skill id="35942" level="1" />
-	</option>
-	<option id="35892" name="dark_armor_crystal">
-		<passive_skill id="35943" level="1" />
-	</option>
-	<option id="35893" name="red_armor_crystal">
-		<passive_skill id="35944" level="1" />
-	</option>
-	<option id="35894" name="fire_water_earth_wind_holiness_darkness">
-		<passive_skill id="35945" level="1" />
-	</option>
-	<option id="35895" name="embrace_the_wind">
-		<passive_skill id="35946" level="1" />
-	</option>
-	<option id="35896" name="riding_the_wind">
-		<passive_skill id="35947" level="1" />
-	</option>
-	<option id="35897" name="aden_basic_knowledge">
-		<passive_skill id="35948" level="1" />
-	</option>
-	<option id="35898" name="purge">
-		<passive_skill id="35949" level="1" />
-	</option>
-	<option id="35899" name="adventurer">
-		<passive_skill id="35950" level="1" />
-	</option>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40600-40699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40600-40699.xml
index 201b97eb81..5d37b0d898 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40600-40699.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40600-40699.xml
@@ -180,169 +180,224 @@
 		<!-- Reflect 9% of received damage -->
 		<passive_skill id="27949" level="3" />
 	</option>
-	<option id="40645" name="gc_opt">
+	<option id="40645" name="cloak_opt">
 		<!-- P. Atk. +69 -->
+		<passive_skill id="27950" level="1" />
 	</option>
-	<option id="40646" name="gc_opt">
+	<option id="40646" name="cloak_opt">
 		<!-- P. Atk. +82 -->
+		<passive_skill id="27950" level="2" />
 	</option>
-	<option id="40647" name="gc_opt">
+	<option id="40647" name="cloak_opt">
 		<!-- P. Atk. +107 -->
+		<passive_skill id="27950" level="3" />
 	</option>
-	<option id="40648" name="gc_opt">
+	<option id="40648" name="cloak_opt">
 		<!-- P. Atk. +132 -->
+		<passive_skill id="27950" level="4" />
 	</option>
-	<option id="40649" name="gc_opt">
+	<option id="40649" name="cloak_opt">
 		<!-- P. Atk. +157 -->
+		<passive_skill id="27950" level="5" />
 	</option>
-	<option id="40650" name="gc_opt">
+	<option id="40650" name="cloak_opt">
 		<!-- P. Atk. +188 -->
+		<passive_skill id="27950" level="6" />
 	</option>
-	<option id="40651" name="gc_opt">
+	<option id="40651" name="cloak_opt">
 		<!-- P. Atk. +220 -->
+		<passive_skill id="27950" level="7" />
 	</option>
-	<option id="40652" name="gc_opt">
+	<option id="40652" name="cloak_opt">
 		<!-- P. Atk. +251 -->
+		<passive_skill id="27950" level="8" />
 	</option>
-	<option id="40653" name="gc_opt">
+	<option id="40653" name="cloak_opt">
 		<!-- P. Atk. +314 -->
+		<passive_skill id="27950" level="9" />
 	</option>
-	<option id="40654" name="gc_opt">
+	<option id="40654" name="cloak_opt">
 		<!-- P. Atk. +628 -->
+		<passive_skill id="27950" level="10" />
 	</option>
-	<option id="40655" name="gc_opt">
+	<option id="40655" name="cloak_opt">
 		<!-- M. Atk. +74 -->
+		<passive_skill id="27951" level="1" />
 	</option>
-	<option id="40656" name="gc_opt">
+	<option id="40656" name="cloak_opt">
 		<!-- M. Atk. +87 -->
+		<passive_skill id="27951" level="2" />
 	</option>
-	<option id="40657" name="gc_opt">
+	<option id="40657" name="cloak_opt">
 		<!-- M. Atk. +114 -->
+		<passive_skill id="27951" level="3" />
 	</option>
-	<option id="40658" name="gc_opt">
+	<option id="40658" name="cloak_opt">
 		<!-- M. Atk. +141 -->
+		<passive_skill id="27951" level="4" />
 	</option>
-	<option id="40659" name="gc_opt">
+	<option id="40659" name="cloak_opt">
 		<!-- M. Atk. +168 -->
+		<passive_skill id="27951" level="5" />
 	</option>
-	<option id="40660" name="gc_opt">
+	<option id="40660" name="cloak_opt">
 		<!-- M. Atk. +201 -->
+		<passive_skill id="27951" level="6" />
 	</option>
-	<option id="40661" name="gc_opt">
+	<option id="40661" name="cloak_opt">
 		<!-- M. Atk. +235 -->
+		<passive_skill id="27951" level="7" />
 	</option>
-	<option id="40662" name="gc_opt">
+	<option id="40662" name="cloak_opt">
 		<!-- M. Atk. +269 -->
+		<passive_skill id="27951" level="8" />
 	</option>
-	<option id="40663" name="gc_opt">
+	<option id="40663" name="cloak_opt">
 		<!-- M. Atk. +336 -->
+		<passive_skill id="27951" level="9" />
 	</option>
-	<option id="40664" name="gc_opt">
+	<option id="40664" name="cloak_opt">
 		<!-- M. Atk. +672 -->
+		<passive_skill id="27951" level="10" />
 	</option>
-	<option id="40665" name="gc_opt">
+	<option id="40665" name="cloak_opt">
 		<!-- Atk. Spd. +10 -->
+		<passive_skill id="27952" level="1" />
 	</option>
-	<option id="40666" name="gc_opt">
+	<option id="40666" name="cloak_opt">
 		<!-- Atk. Spd. +12 -->
+		<passive_skill id="27952" level="2" />
 	</option>
-	<option id="40667" name="gc_opt">
+	<option id="40667" name="cloak_opt">
 		<!-- Atk. Spd. +15 -->
+		<passive_skill id="27952" level="3" />
 	</option>
-	<option id="40668" name="gc_opt">
+	<option id="40668" name="cloak_opt">
 		<!-- Atk. Spd. +19 -->
+		<passive_skill id="27952" level="4" />
 	</option>
-	<option id="40669" name="gc_opt">
+	<option id="40669" name="cloak_opt">
 		<!-- Atk. Spd. +23 -->
+		<passive_skill id="27952" level="5" />
 	</option>
-	<option id="40670" name="gc_opt">
+	<option id="40670" name="cloak_opt">
 		<!-- Atk. Spd. +27 -->
+		<passive_skill id="27952" level="6" />
 	</option>
-	<option id="40671" name="gc_opt">
+	<option id="40671" name="cloak_opt">
 		<!-- Atk. Spd. +32 -->
+		<passive_skill id="27952" level="7" />
 	</option>
-	<option id="40672" name="gc_opt">
+	<option id="40672" name="cloak_opt">
 		<!-- Atk. Spd. +36 -->
+		<passive_skill id="27952" level="8" />
 	</option>
-	<option id="40673" name="gc_opt">
+	<option id="40673" name="cloak_opt">
 		<!-- Atk. Spd. +45 -->
+		<passive_skill id="27952" level="9" />
 	</option>
-	<option id="40674" name="gc_opt">
+	<option id="40674" name="cloak_opt">
 		<!-- Atk. Spd. +90 -->
+		<passive_skill id="27952" level="10" />
 	</option>
-	<option id="40675" name="gc_opt">
+	<option id="40675" name="cloak_opt">
 		<!-- Casting Spd. +10 -->
+		<passive_skill id="27953" level="1" />
 	</option>
-	<option id="40676" name="gc_opt">
+	<option id="40676" name="cloak_opt">
 		<!-- Casting Spd. +12 -->
+		<passive_skill id="27953" level="2" />
 	</option>
-	<option id="40677" name="gc_opt">
+	<option id="40677" name="cloak_opt">
 		<!-- Casting Spd. +15 -->
+		<passive_skill id="27953" level="3" />
 	</option>
-	<option id="40678" name="gc_opt">
+	<option id="40678" name="cloak_opt">
 		<!-- Casting Spd. +19 -->
+		<passive_skill id="27953" level="4" />
 	</option>
-	<option id="40679" name="gc_opt">
+	<option id="40679" name="cloak_opt">
 		<!-- Casting Spd. +23 -->
+		<passive_skill id="27953" level="5" />
 	</option>
-	<option id="40680" name="gc_opt">
+	<option id="40680" name="cloak_opt">
 		<!-- Casting Spd. +27 -->
+		<passive_skill id="27953" level="6" />
 	</option>
-	<option id="40681" name="gc_opt">
+	<option id="40681" name="cloak_opt">
 		<!-- Casting Spd. +32 -->
+		<passive_skill id="27953" level="7" />
 	</option>
-	<option id="40682" name="gc_opt">
+	<option id="40682" name="cloak_opt">
 		<!-- Casting Spd. +36 -->
+		<passive_skill id="27953" level="8" />
 	</option>
-	<option id="40683" name="gc_opt">
+	<option id="40683" name="cloak_opt">
 		<!-- Casting Spd. +45 -->
+		<passive_skill id="27953" level="9" />
 	</option>
-	<option id="40684" name="gc_opt">
+	<option id="40684" name="cloak_opt">
 		<!-- Casting Spd. +90 -->
+		<passive_skill id="27953" level="10" />
 	</option>
-	<option id="40685" name="gc_opt">
+	<option id="40685" name="cloak_opt">
 		<!-- P. Accuracy +1 -->
+		<passive_skill id="27954" level="1" />
 	</option>
-	<option id="40686" name="gc_opt">
+	<option id="40686" name="cloak_opt">
 		<!-- P. Accuracy +2 -->
+		<passive_skill id="27954" level="2" />
 	</option>
-	<option id="40687" name="gc_opt">
+	<option id="40687" name="cloak_opt">
 		<!-- P. Accuracy +3 -->
+		<passive_skill id="27954" level="3" />
 	</option>
-	<option id="40688" name="gc_opt">
+	<option id="40688" name="cloak_opt">
 		<!-- P. Accuracy +4 -->
+		<passive_skill id="27954" level="4" />
 	</option>
-	<option id="40689" name="gc_opt">
+	<option id="40689" name="cloak_opt">
 		<!-- P. Accuracy +5 -->
+		<passive_skill id="27954" level="5" />
 	</option>
-	<option id="40690" name="gc_opt">
+	<option id="40690" name="cloak_opt">
 		<!-- M. Accuracy +1 -->
+		<passive_skill id="27955" level="1" />
 	</option>
-	<option id="40691" name="gc_opt">
+	<option id="40691" name="cloak_opt">
 		<!-- M. Accuracy +2 -->
+		<passive_skill id="27955" level="2" />
 	</option>
-	<option id="40692" name="gc_opt">
+	<option id="40692" name="cloak_opt">
 		<!-- M. Accuracy +3 -->
+		<passive_skill id="27955" level="3" />
 	</option>
-	<option id="40693" name="gc_opt">
+	<option id="40693" name="cloak_opt">
 		<!-- M. Accuracy +4 -->
+		<passive_skill id="27955" level="4" />
 	</option>
-	<option id="40694" name="gc_opt">
+	<option id="40694" name="cloak_opt">
 		<!-- M. Accuracy +5 -->
+		<passive_skill id="27955" level="5" />
 	</option>
-	<option id="40695" name="gc_opt">
+	<option id="40695" name="cloak_opt">
 		<!-- Max HP +99 -->
+		<passive_skill id="27956" level="1" />
 	</option>
-	<option id="40696" name="gc_opt">
+	<option id="40696" name="cloak_opt">
 		<!-- Max HP +117 -->
+		<passive_skill id="27956" level="2" />
 	</option>
-	<option id="40697" name="gc_opt">
+	<option id="40697" name="cloak_opt">
 		<!-- Max HP +153 -->
+		<passive_skill id="27956" level="3" />
 	</option>
-	<option id="40698" name="gc_opt">
+	<option id="40698" name="cloak_opt">
 		<!-- Max HP +189 -->
+		<passive_skill id="27956" level="4" />
 	</option>
-	<option id="40699" name="gc_opt">
+	<option id="40699" name="cloak_opt">
 		<!-- Max HP +225 -->
+		<passive_skill id="27956" level="5" />
 	</option>
 </list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40700-40799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40700-40799.xml
index a3996df164..9e1c5a95dc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40700-40799.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40700-40799.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40700" name="gc_opt">
+	<option id="40700" name="cloak_opt">
 		<!-- Max HP +270 -->
+		<passive_skill id="27956" level="6" />
 	</option>
-	<option id="40701" name="gc_opt">
+	<option id="40701" name="cloak_opt">
 		<!-- Max HP +315 -->
+		<passive_skill id="27956" level="7" />
 	</option>
-	<option id="40702" name="gc_opt">
+	<option id="40702" name="cloak_opt">
 		<!-- Max HP +360 -->
+		<passive_skill id="27956" level="8" />
 	</option>
-	<option id="40703" name="gc_opt">
+	<option id="40703" name="cloak_opt">
 		<!-- Max HP +450 -->
+		<passive_skill id="27956" level="9" />
 	</option>
-	<option id="40704" name="gc_opt">
+	<option id="40704" name="cloak_opt">
 		<!-- Max HP +900 -->
+		<passive_skill id="27956" level="10" />
 	</option>
-	<option id="40705" name="gc_opt">
+	<option id="40705" name="cloak_opt">
 		<!-- Max MP +99 -->
+		<passive_skill id="27957" level="1" />
 	</option>
-	<option id="40706" name="gc_opt">
+	<option id="40706" name="cloak_opt">
 		<!-- Max MP +117 -->
+		<passive_skill id="27957" level="2" />
 	</option>
-	<option id="40707" name="gc_opt">
+	<option id="40707" name="cloak_opt">
 		<!-- Max MP +153 -->
+		<passive_skill id="27957" level="3" />
 	</option>
-	<option id="40708" name="gc_opt">
+	<option id="40708" name="cloak_opt">
 		<!-- Max MP +189 -->
+		<passive_skill id="27957" level="4" />
 	</option>
-	<option id="40709" name="gc_opt">
+	<option id="40709" name="cloak_opt">
 		<!-- Max MP +225 -->
+		<passive_skill id="27957" level="5" />
 	</option>
-	<option id="40710" name="gc_opt">
+	<option id="40710" name="cloak_opt">
 		<!-- Max MP +270 -->
+		<passive_skill id="27957" level="6" />
 	</option>
-	<option id="40711" name="gc_opt">
+	<option id="40711" name="cloak_opt">
 		<!-- Max MP +315 -->
+		<passive_skill id="27957" level="7" />
 	</option>
-	<option id="40712" name="gc_opt">
+	<option id="40712" name="cloak_opt">
 		<!-- Max MP +360 -->
+		<passive_skill id="27957" level="8" />
 	</option>
-	<option id="40713" name="gc_opt">
+	<option id="40713" name="cloak_opt">
 		<!-- Max MP +450 -->
+		<passive_skill id="27957" level="9" />
 	</option>
-	<option id="40714" name="gc_opt">
+	<option id="40714" name="cloak_opt">
 		<!-- Max MP +900 -->
+		<passive_skill id="27957" level="10" />
 	</option>
-	<option id="40715" name="gc_opt">
+	<option id="40715" name="cloak_opt">
 		<!-- Max CP +99 -->
+		<passive_skill id="27958" level="1" />
 	</option>
-	<option id="40716" name="gc_opt">
+	<option id="40716" name="cloak_opt">
 		<!-- Max CP +117 -->
+		<passive_skill id="27958" level="2" />
 	</option>
-	<option id="40717" name="gc_opt">
+	<option id="40717" name="cloak_opt">
 		<!-- Max CP +153 -->
+		<passive_skill id="27958" level="3" />
 	</option>
-	<option id="40718" name="gc_opt">
+	<option id="40718" name="cloak_opt">
 		<!-- Max CP +189 -->
+		<passive_skill id="27958" level="4" />
 	</option>
-	<option id="40719" name="gc_opt">
+	<option id="40719" name="cloak_opt">
 		<!-- Max CP +225 -->
+		<passive_skill id="27958" level="5" />
 	</option>
-	<option id="40720" name="gc_opt">
+	<option id="40720" name="cloak_opt">
 		<!-- Max CP +270 -->
+		<passive_skill id="27958" level="6" />
 	</option>
-	<option id="40721" name="gc_opt">
+	<option id="40721" name="cloak_opt">
 		<!-- Max CP +315 -->
+		<passive_skill id="27958" level="7" />
 	</option>
-	<option id="40722" name="gc_opt">
+	<option id="40722" name="cloak_opt">
 		<!-- Max CP +360 -->
+		<passive_skill id="27958" level="8" />
 	</option>
-	<option id="40723" name="gc_opt">
+	<option id="40723" name="cloak_opt">
 		<!-- Max CP +450 -->
+		<passive_skill id="27958" level="9" />
 	</option>
-	<option id="40724" name="gc_opt">
+	<option id="40724" name="cloak_opt">
 		<!-- Max CP +900 -->
+		<passive_skill id="27958" level="10" />
 	</option>
-	<option id="40725" name="gc_opt">
+	<option id="40725" name="cloak_opt">
 		<!-- STR +1 -->
+		<passive_skill id="27959" level="1" />
 	</option>
-	<option id="40726" name="gc_opt">
+	<option id="40726" name="cloak_opt">
 		<!-- STR +2 -->
+		<passive_skill id="27959" level="2" />
 	</option>
-	<option id="40727" name="gc_opt">
+	<option id="40727" name="cloak_opt">
 		<!-- CON +1 -->
+		<passive_skill id="27960" level="1" />
 	</option>
-	<option id="40728" name="gc_opt">
+	<option id="40728" name="cloak_opt">
 		<!-- CON +2 -->
+		<passive_skill id="27960" level="2" />
 	</option>
-	<option id="40729" name="gc_opt">
+	<option id="40729" name="cloak_opt">
 		<!-- MEN +1 -->
+		<passive_skill id="27961" level="1" />
 	</option>
-	<option id="40730" name="gc_opt">
+	<option id="40730" name="cloak_opt">
 		<!-- MEN +2 -->
+		<passive_skill id="27961" level="2" />
 	</option>
-	<option id="40731" name="gc_opt">
+	<option id="40731" name="cloak_opt">
 		<!-- DEX +1 -->
+		<passive_skill id="27962" level="1" />
 	</option>
-	<option id="40732" name="gc_opt">
+	<option id="40732" name="cloak_opt">
 		<!-- DEX +2 -->
+		<passive_skill id="27962" level="2" />
 	</option>
-	<option id="40733" name="gc_opt">
+	<option id="40733" name="cloak_opt">
 		<!-- WIT +1 -->
+		<passive_skill id="27963" level="1" />
 	</option>
-	<option id="40734" name="gc_opt">
+	<option id="40734" name="cloak_opt">
 		<!-- WIT +2 -->
+		<passive_skill id="27963" level="2" />
 	</option>
-	<option id="40735" name="gc_opt">
+	<option id="40735" name="cloak_opt">
 		<!-- LUC +1 -->
+		<passive_skill id="27964" level="1" />
 	</option>
-	<option id="40736" name="gc_opt">
+	<option id="40736" name="cloak_opt">
 		<!-- LUC +2 -->
+		<passive_skill id="27964" level="2" />
 	</option>
-	<option id="40737" name="gc_opt">
+	<option id="40737" name="cloak_opt">
 		<!-- CHA +1 -->
+		<passive_skill id="27965" level="1" />
 	</option>
-	<option id="40738" name="gc_opt">
+	<option id="40738" name="cloak_opt">
 		<!-- CHA +2 -->
+		<passive_skill id="27965" level="2" />
 	</option>
-	<option id="40739" name="gc_opt">
+	<option id="40739" name="cloak_opt">
 		<!-- INT +1 -->
+		<passive_skill id="27966" level="1" />
 	</option>
-	<option id="40740" name="gc_opt">
+	<option id="40740" name="cloak_opt">
 		<!-- INT +2 -->
+		<passive_skill id="27966" level="2" />
 	</option>
-	<option id="40741" name="gc_opt">
+	<option id="40741" name="cloak_opt">
 		<!-- P. Critical Rate +1.7% -->
+		<passive_skill id="27967" level="1" />
 	</option>
-	<option id="40742" name="gc_opt">
+	<option id="40742" name="cloak_opt">
 		<!-- P. Critical Rate +2% -->
+		<passive_skill id="27967" level="2" />
 	</option>
-	<option id="40743" name="gc_opt">
+	<option id="40743" name="cloak_opt">
 		<!-- P. Critical Rate +2.6% -->
+		<passive_skill id="27967" level="3" />
 	</option>
-	<option id="40744" name="gc_opt">
+	<option id="40744" name="cloak_opt">
 		<!-- P. Critical Rate +3.2% -->
+		<passive_skill id="27967" level="4" />
 	</option>
-	<option id="40745" name="gc_opt">
+	<option id="40745" name="cloak_opt">
 		<!-- P. Critical Rate +3.8% -->
+		<passive_skill id="27967" level="5" />
 	</option>
-	<option id="40746" name="gc_opt">
+	<option id="40746" name="cloak_opt">
 		<!-- P. Critical Rate +4.5% -->
+		<passive_skill id="27967" level="6" />
 	</option>
-	<option id="40747" name="gc_opt">
+	<option id="40747" name="cloak_opt">
 		<!-- P. Critical Rate +5.3% -->
+		<passive_skill id="27967" level="7" />
 	</option>
-	<option id="40748" name="gc_opt">
+	<option id="40748" name="cloak_opt">
 		<!-- P. Critical Rate +6% -->
+		<passive_skill id="27967" level="8" />
 	</option>
-	<option id="40749" name="gc_opt">
+	<option id="40749" name="cloak_opt">
 		<!-- P. Critical Rate +7.5% -->
+		<passive_skill id="27967" level="9" />
 	</option>
-	<option id="40750" name="gc_opt">
+	<option id="40750" name="cloak_opt">
 		<!-- P. Critical Rate +15% -->
+		<passive_skill id="27967" level="10" />
 	</option>
-	<option id="40751" name="gc_opt">
+	<option id="40751" name="cloak_opt">
 		<!-- P. Skill Critical Rate +0.9% -->
+		<passive_skill id="27968" level="1" />
 	</option>
-	<option id="40752" name="gc_opt">
+	<option id="40752" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1% -->
+		<passive_skill id="27968" level="2" />
 	</option>
-	<option id="40753" name="gc_opt">
+	<option id="40753" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.3% -->
+		<passive_skill id="27968" level="3" />
 	</option>
-	<option id="40754" name="gc_opt">
+	<option id="40754" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.6% -->
+		<passive_skill id="27968" level="4" />
 	</option>
-	<option id="40755" name="gc_opt">
+	<option id="40755" name="cloak_opt">
 		<!-- P. Skill Critical Rate +1.9% -->
+		<passive_skill id="27968" level="5" />
 	</option>
-	<option id="40756" name="gc_opt">
+	<option id="40756" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.3% -->
+		<passive_skill id="27968" level="6" />
 	</option>
-	<option id="40757" name="gc_opt">
+	<option id="40757" name="cloak_opt">
 		<!-- P. Skill Critical Rate +2.7% -->
+		<passive_skill id="27968" level="7" />
 	</option>
-	<option id="40758" name="gc_opt">
+	<option id="40758" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3% -->
+		<passive_skill id="27968" level="8" />
 	</option>
-	<option id="40759" name="gc_opt">
+	<option id="40759" name="cloak_opt">
 		<!-- P. Skill Critical Rate +3.8% -->
+		<passive_skill id="27968" level="9" />
 	</option>
-	<option id="40760" name="gc_opt">
+	<option id="40760" name="cloak_opt">
 		<!-- P. Skill Critical Rate +7.5% -->
+		<passive_skill id="27968" level="10" />
 	</option>
-	<option id="40761" name="gc_opt">
+	<option id="40761" name="cloak_opt">
 		<!-- M. Critical Rate +1% -->
+		<passive_skill id="27969" level="1" />
 	</option>
-	<option id="40762" name="gc_opt">
+	<option id="40762" name="cloak_opt">
 		<!-- M. Critical Rate +2% -->
+		<passive_skill id="27969" level="2" />
 	</option>
-	<option id="40763" name="gc_opt">
+	<option id="40763" name="cloak_opt">
 		<!-- M. Critical Rate +3% -->
+		<passive_skill id="27969" level="3" />
 	</option>
-	<option id="40764" name="gc_opt">
+	<option id="40764" name="cloak_opt">
 		<!-- M. Critical Rate +4% -->
+		<passive_skill id="27969" level="4" />
 	</option>
-	<option id="40765" name="gc_opt">
+	<option id="40765" name="cloak_opt">
 		<!-- M. Critical Rate +5% -->
+		<passive_skill id="27969" level="5" />
 	</option>
-	<option id="40766" name="gc_opt">
+	<option id="40766" name="cloak_opt">
 		<!-- M. Critical Rate +6% -->
+		<passive_skill id="27969" level="6" />
 	</option>
-	<option id="40767" name="gc_opt">
+	<option id="40767" name="cloak_opt">
 		<!-- M. Critical Rate +7% -->
+		<passive_skill id="27969" level="7" />
 	</option>
-	<option id="40768" name="gc_opt">
+	<option id="40768" name="cloak_opt">
 		<!-- M. Critical Rate +8% -->
+		<passive_skill id="27969" level="8" />
 	</option>
-	<option id="40769" name="gc_opt">
+	<option id="40769" name="cloak_opt">
 		<!-- M. Critical Rate +9% -->
+		<passive_skill id="27969" level="9" />
 	</option>
-	<option id="40770" name="gc_opt">
+	<option id="40770" name="cloak_opt">
 		<!-- M. Critical Rate +15% -->
+		<passive_skill id="27969" level="10" />
 	</option>
-	<option id="40771" name="gc_opt">
+	<option id="40771" name="cloak_opt">
 		<!-- P. Critical Damage +0.9% -->
+		<passive_skill id="27970" level="1" />
 	</option>
-	<option id="40772" name="gc_opt">
+	<option id="40772" name="cloak_opt">
 		<!-- P. Critical Damage +1% -->
+		<passive_skill id="27970" level="2" />
 	</option>
-	<option id="40773" name="gc_opt">
+	<option id="40773" name="cloak_opt">
 		<!-- P. Critical Damage +1.3% -->
+		<passive_skill id="27970" level="3" />
 	</option>
-	<option id="40774" name="gc_opt">
+	<option id="40774" name="cloak_opt">
 		<!-- P. Critical Damage +1.6% -->
+		<passive_skill id="27970" level="4" />
 	</option>
-	<option id="40775" name="gc_opt">
+	<option id="40775" name="cloak_opt">
 		<!-- P. Critical Damage +1.9% -->
+		<passive_skill id="27970" level="5" />
 	</option>
-	<option id="40776" name="gc_opt">
+	<option id="40776" name="cloak_opt">
 		<!-- P. Critical Damage +2.3% -->
+		<passive_skill id="27970" level="6" />
 	</option>
-	<option id="40777" name="gc_opt">
+	<option id="40777" name="cloak_opt">
 		<!-- P. Critical Damage +2.7% -->
+		<passive_skill id="27970" level="7" />
 	</option>
-	<option id="40778" name="gc_opt">
+	<option id="40778" name="cloak_opt">
 		<!-- P. Critical Damage +3% -->
+		<passive_skill id="27970" level="8" />
 	</option>
-	<option id="40779" name="gc_opt">
+	<option id="40779" name="cloak_opt">
 		<!-- P. Critical Damage +3.8% -->
+		<passive_skill id="27970" level="9" />
 	</option>
-	<option id="40780" name="gc_opt">
+	<option id="40780" name="cloak_opt">
 		<!-- P. Critical Damage +7.5% -->
+		<passive_skill id="27970" level="10" />
 	</option>
-	<option id="40781" name="gc_opt">
+	<option id="40781" name="cloak_opt">
 		<!-- P. Skill Critical Damage +0.9% -->
+		<passive_skill id="27971" level="1" />
 	</option>
-	<option id="40782" name="gc_opt">
+	<option id="40782" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1% -->
+		<passive_skill id="27971" level="2" />
 	</option>
-	<option id="40783" name="gc_opt">
+	<option id="40783" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.3% -->
+		<passive_skill id="27971" level="3" />
 	</option>
-	<option id="40784" name="gc_opt">
+	<option id="40784" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.6% -->
+		<passive_skill id="27971" level="4" />
 	</option>
-	<option id="40785" name="gc_opt">
+	<option id="40785" name="cloak_opt">
 		<!-- P. Skill Critical Damage +1.9% -->
+		<passive_skill id="27971" level="5" />
 	</option>
-	<option id="40786" name="gc_opt">
+	<option id="40786" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.3% -->
+		<passive_skill id="27971" level="6" />
 	</option>
-	<option id="40787" name="gc_opt">
+	<option id="40787" name="cloak_opt">
 		<!-- P. Skill Critical Damage +2.7% -->
+		<passive_skill id="27971" level="7" />
 	</option>
-	<option id="40788" name="gc_opt">
+	<option id="40788" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3% -->
+		<passive_skill id="27971" level="8" />
 	</option>
-	<option id="40789" name="gc_opt">
+	<option id="40789" name="cloak_opt">
 		<!-- P. Skill Critical Damage +3.8% -->
+		<passive_skill id="27971" level="9" />
 	</option>
-	<option id="40790" name="gc_opt">
+	<option id="40790" name="cloak_opt">
 		<!-- P. Skill Critical Damage +7.5% -->
+		<passive_skill id="27971" level="10" />
 	</option>
-	<option id="40791" name="gc_opt">
+	<option id="40791" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="1" />
 	</option>
-	<option id="40792" name="gc_opt">
+	<option id="40792" name="cloak_opt">
 		<!-- M. Critical Damage +1% -->
+		<passive_skill id="27972" level="2" />
 	</option>
-	<option id="40793" name="gc_opt">
+	<option id="40793" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="3" />
 	</option>
-	<option id="40794" name="gc_opt">
+	<option id="40794" name="cloak_opt">
 		<!-- M. Critical Damage +2% -->
+		<passive_skill id="27972" level="4" />
 	</option>
-	<option id="40795" name="gc_opt">
+	<option id="40795" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="5" />
 	</option>
-	<option id="40796" name="gc_opt">
+	<option id="40796" name="cloak_opt">
 		<!-- M. Critical Damage +3% -->
+		<passive_skill id="27972" level="6" />
 	</option>
-	<option id="40797" name="gc_opt">
+	<option id="40797" name="cloak_opt">
 		<!-- M. Critical Damage +4% -->
+		<passive_skill id="27972" level="7" />
 	</option>
-	<option id="40798" name="gc_opt">
+	<option id="40798" name="cloak_opt">
 		<!-- M. Critical Damage +5% -->
+		<passive_skill id="27972" level="8" />
 	</option>
-	<option id="40799" name="gc_opt">
+	<option id="40799" name="cloak_opt">
 		<!-- M. Critical Damage +6% -->
+		<passive_skill id="27972" level="9" />
 	</option>
 </list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40800-40899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40800-40899.xml
index fe5a614a9e..39a77662de 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40800-40899.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40800-40899.xml
@@ -1,303 +1,403 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40800" name="gc_opt">
+	<option id="40800" name="cloak_opt">
 		<!-- M. Critical Damage +7% -->
+		<passive_skill id="27972" level="10" />
 	</option>
-	<option id="40801" name="gc_opt">
+	<option id="40801" name="cloak_opt">
 		<!-- Attack Attribute Bonus +5 -->
+		<passive_skill id="27973" level="1" />
 	</option>
-	<option id="40802" name="gc_opt">
+	<option id="40802" name="cloak_opt">
 		<!-- Attack Attribute Bonus +6 -->
+		<passive_skill id="27973" level="2" />
 	</option>
-	<option id="40803" name="gc_opt">
+	<option id="40803" name="cloak_opt">
 		<!-- Attack Attribute Bonus +7 -->
+		<passive_skill id="27973" level="3" />
 	</option>
-	<option id="40804" name="gc_opt">
+	<option id="40804" name="cloak_opt">
 		<!-- Attack Attribute Bonus +8 -->
+		<passive_skill id="27973" level="4" />
 	</option>
-	<option id="40805" name="gc_opt">
+	<option id="40805" name="cloak_opt">
 		<!-- Attack Attribute Bonus +9 -->
+		<passive_skill id="27973" level="5" />
 	</option>
-	<option id="40806" name="gc_opt">
+	<option id="40806" name="cloak_opt">
 		<!-- Attack Attribute Bonus +10 -->
+		<passive_skill id="27973" level="6" />
 	</option>
-	<option id="40807" name="gc_opt">
+	<option id="40807" name="cloak_opt">
 		<!-- Attack Attribute Bonus +13 -->
+		<passive_skill id="27973" level="7" />
 	</option>
-	<option id="40808" name="gc_opt">
+	<option id="40808" name="cloak_opt">
 		<!-- Attack Attribute Bonus +15 -->
+		<passive_skill id="27973" level="8" />
 	</option>
-	<option id="40809" name="gc_opt">
+	<option id="40809" name="cloak_opt">
 		<!-- Attack Attribute Bonus +18 -->
+		<passive_skill id="27973" level="9" />
 	</option>
-	<option id="40810" name="gc_opt">
+	<option id="40810" name="cloak_opt">
 		<!-- Attack Attribute Bonus +35 -->
+		<passive_skill id="27973" level="10" />
 	</option>
-	<option id="40811" name="gc_opt">
+	<option id="40811" name="cloak_opt">
 		<!-- Stun Attack Success Rate +1.5% -->
+		<passive_skill id="27974" level="1" />
 	</option>
-	<option id="40812" name="gc_opt">
+	<option id="40812" name="cloak_opt">
 		<!-- Stun Attack Success Rate +2.5% -->
+		<passive_skill id="27974" level="2" />
 	</option>
-	<option id="40813" name="gc_opt">
+	<option id="40813" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3% -->
+		<passive_skill id="27974" level="3" />
 	</option>
-	<option id="40814" name="gc_opt">
+	<option id="40814" name="cloak_opt">
 		<!-- Stun Attack Success Rate +3.5% -->
+		<passive_skill id="27974" level="4" />
 	</option>
-	<option id="40815" name="gc_opt">
+	<option id="40815" name="cloak_opt">
 		<!-- Stun Attack Success Rate +4.5% -->
+		<passive_skill id="27974" level="5" />
 	</option>
-	<option id="40816" name="gc_opt">
+	<option id="40816" name="cloak_opt">
 		<!-- Stun Attack Success Rate +5% -->
+		<passive_skill id="27974" level="6" />
 	</option>
-	<option id="40817" name="gc_opt">
+	<option id="40817" name="cloak_opt">
 		<!-- Stun Attack Success Rate +6% -->
+		<passive_skill id="27974" level="7" />
 	</option>
-	<option id="40818" name="gc_opt">
+	<option id="40818" name="cloak_opt">
 		<!-- Stun Attack Success Rate +7.5% -->
+		<passive_skill id="27974" level="8" />
 	</option>
-	<option id="40819" name="gc_opt">
+	<option id="40819" name="cloak_opt">
 		<!-- Stun Attack Success Rate +15% -->
+		<passive_skill id="27974" level="9" />
 	</option>
-	<option id="40820" name="gc_opt">
+	<option id="40820" name="cloak_opt">
 		<!-- Hold Attack Success Rate +1.5% -->
+		<passive_skill id="27975" level="1" />
 	</option>
-	<option id="40821" name="gc_opt">
+	<option id="40821" name="cloak_opt">
 		<!-- Hold Attack Success Rate +2.5% -->
+		<passive_skill id="27975" level="2" />
 	</option>
-	<option id="40822" name="gc_opt">
+	<option id="40822" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3% -->
+		<passive_skill id="27975" level="3" />
 	</option>
-	<option id="40823" name="gc_opt">
+	<option id="40823" name="cloak_opt">
 		<!-- Hold Attack Success Rate +3.5% -->
+		<passive_skill id="27975" level="4" />
 	</option>
-	<option id="40824" name="gc_opt">
+	<option id="40824" name="cloak_opt">
 		<!-- Hold Attack Success Rate +4.5% -->
+		<passive_skill id="27975" level="5" />
 	</option>
-	<option id="40825" name="gc_opt">
+	<option id="40825" name="cloak_opt">
 		<!-- Hold Attack Success Rate +5% -->
+		<passive_skill id="27975" level="6" />
 	</option>
-	<option id="40826" name="gc_opt">
+	<option id="40826" name="cloak_opt">
 		<!-- Hold Attack Success Rate +6% -->
+		<passive_skill id="27975" level="7" />
 	</option>
-	<option id="40827" name="gc_opt">
+	<option id="40827" name="cloak_opt">
 		<!-- Hold Attack Success Rate +7.5% -->
+		<passive_skill id="27975" level="8" />
 	</option>
-	<option id="40828" name="gc_opt">
+	<option id="40828" name="cloak_opt">
 		<!-- Hold Attack Success Rate +15% -->
+		<passive_skill id="27975" level="9" />
 	</option>
-	<option id="40829" name="gc_opt">
+	<option id="40829" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +1.5% -->
+		<passive_skill id="27976" level="1" />
 	</option>
-	<option id="40830" name="gc_opt">
+	<option id="40830" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +2.5% -->
+		<passive_skill id="27976" level="2" />
 	</option>
-	<option id="40831" name="gc_opt">
+	<option id="40831" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3% -->
+		<passive_skill id="27976" level="3" />
 	</option>
-	<option id="40832" name="gc_opt">
+	<option id="40832" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +3.5% -->
+		<passive_skill id="27976" level="4" />
 	</option>
-	<option id="40833" name="gc_opt">
+	<option id="40833" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +4.5% -->
+		<passive_skill id="27976" level="5" />
 	</option>
-	<option id="40834" name="gc_opt">
+	<option id="40834" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +5% -->
+		<passive_skill id="27976" level="6" />
 	</option>
-	<option id="40835" name="gc_opt">
+	<option id="40835" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +6% -->
+		<passive_skill id="27976" level="7" />
 	</option>
-	<option id="40836" name="gc_opt">
+	<option id="40836" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +7.5% -->
+		<passive_skill id="27976" level="8" />
 	</option>
-	<option id="40837" name="gc_opt">
+	<option id="40837" name="cloak_opt">
 		<!-- Bleeding Attack Success Rate +15% -->
+		<passive_skill id="27976" level="9" />
 	</option>
-	<option id="40838" name="gc_opt">
+	<option id="40838" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +1.5% -->
+		<passive_skill id="27977" level="1" />
 	</option>
-	<option id="40839" name="gc_opt">
+	<option id="40839" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +2.5% -->
+		<passive_skill id="27977" level="2" />
 	</option>
-	<option id="40840" name="gc_opt">
+	<option id="40840" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3% -->
+		<passive_skill id="27977" level="3" />
 	</option>
-	<option id="40841" name="gc_opt">
+	<option id="40841" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +3.5% -->
+		<passive_skill id="27977" level="4" />
 	</option>
-	<option id="40842" name="gc_opt">
+	<option id="40842" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +4.5% -->
+		<passive_skill id="27977" level="5" />
 	</option>
-	<option id="40843" name="gc_opt">
+	<option id="40843" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +5% -->
+		<passive_skill id="27977" level="6" />
 	</option>
-	<option id="40844" name="gc_opt">
+	<option id="40844" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +6% -->
+		<passive_skill id="27977" level="7" />
 	</option>
-	<option id="40845" name="gc_opt">
+	<option id="40845" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +7.5% -->
+		<passive_skill id="27977" level="8" />
 	</option>
-	<option id="40846" name="gc_opt">
+	<option id="40846" name="cloak_opt">
 		<!-- Paralysis Attack Success Rate +15% -->
+		<passive_skill id="27977" level="9" />
 	</option>
-	<option id="40847" name="gc_opt">
+	<option id="40847" name="cloak_opt">
 		<!-- Mind Attack Success Rate +1.5% -->
+		<passive_skill id="27978" level="1" />
 	</option>
-	<option id="40848" name="gc_opt">
+	<option id="40848" name="cloak_opt">
 		<!-- Mind Attack Success Rate +2.5% -->
+		<passive_skill id="27978" level="2" />
 	</option>
-	<option id="40849" name="gc_opt">
+	<option id="40849" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3% -->
+		<passive_skill id="27978" level="3" />
 	</option>
-	<option id="40850" name="gc_opt">
+	<option id="40850" name="cloak_opt">
 		<!-- Mind Attack Success Rate +3.5% -->
+		<passive_skill id="27978" level="4" />
 	</option>
-	<option id="40851" name="gc_opt">
+	<option id="40851" name="cloak_opt">
 		<!-- Mind Attack Success Rate +4.5% -->
+		<passive_skill id="27978" level="5" />
 	</option>
-	<option id="40852" name="gc_opt">
+	<option id="40852" name="cloak_opt">
 		<!-- Mind Attack Success Rate +5% -->
+		<passive_skill id="27978" level="6" />
 	</option>
-	<option id="40853" name="gc_opt">
+	<option id="40853" name="cloak_opt">
 		<!-- Mind Attack Success Rate +6% -->
+		<passive_skill id="27978" level="7" />
 	</option>
-	<option id="40854" name="gc_opt">
+	<option id="40854" name="cloak_opt">
 		<!-- Mind Attack Success Rate +7.5% -->
+		<passive_skill id="27978" level="8" />
 	</option>
-	<option id="40855" name="gc_opt">
+	<option id="40855" name="cloak_opt">
 		<!-- Mind Attack Success Rate +15% -->
+		<passive_skill id="27978" level="9" />
 	</option>
-	<option id="40856" name="gc_opt">
+	<option id="40856" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +1.5% -->
+		<passive_skill id="27979" level="1" />
 	</option>
-	<option id="40857" name="gc_opt">
+	<option id="40857" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +2.5% -->
+		<passive_skill id="27979" level="2" />
 	</option>
-	<option id="40858" name="gc_opt">
+	<option id="40858" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3% -->
+		<passive_skill id="27979" level="3" />
 	</option>
-	<option id="40859" name="gc_opt">
+	<option id="40859" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +3.5% -->
+		<passive_skill id="27979" level="4" />
 	</option>
-	<option id="40860" name="gc_opt">
+	<option id="40860" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +4.5% -->
+		<passive_skill id="27979" level="5" />
 	</option>
-	<option id="40861" name="gc_opt">
+	<option id="40861" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +5% -->
+		<passive_skill id="27979" level="6" />
 	</option>
-	<option id="40862" name="gc_opt">
+	<option id="40862" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +6% -->
+		<passive_skill id="27979" level="7" />
 	</option>
-	<option id="40863" name="gc_opt">
+	<option id="40863" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +7.5% -->
+		<passive_skill id="27979" level="8" />
 	</option>
-	<option id="40864" name="gc_opt">
+	<option id="40864" name="cloak_opt">
 		<!-- Sleep Attack Success Rate +15% -->
+		<passive_skill id="27979" level="9" />
 	</option>
-	<option id="40865" name="gc_opt">
+	<option id="40865" name="cloak_opt">
 		<!-- Poison Attack Success Rate +1.5% -->
+		<passive_skill id="27980" level="1" />
 	</option>
-	<option id="40866" name="gc_opt">
+	<option id="40866" name="cloak_opt">
 		<!-- Poison Attack Success Rate +2.5% -->
+		<passive_skill id="27980" level="2" />
 	</option>
-	<option id="40867" name="gc_opt">
+	<option id="40867" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3% -->
+		<passive_skill id="27980" level="3" />
 	</option>
-	<option id="40868" name="gc_opt">
+	<option id="40868" name="cloak_opt">
 		<!-- Poison Attack Success Rate +3.5% -->
+		<passive_skill id="27980" level="4" />
 	</option>
-	<option id="40869" name="gc_opt">
+	<option id="40869" name="cloak_opt">
 		<!-- Poison Attack Success Rate +4.5% -->
+		<passive_skill id="27980" level="5" />
 	</option>
-	<option id="40870" name="gc_opt">
+	<option id="40870" name="cloak_opt">
 		<!-- Poison Attack Success Rate +5% -->
+		<passive_skill id="27980" level="6" />
 	</option>
-	<option id="40871" name="gc_opt">
+	<option id="40871" name="cloak_opt">
 		<!-- Poison Attack Success Rate +6% -->
+		<passive_skill id="27980" level="7" />
 	</option>
-	<option id="40872" name="gc_opt">
+	<option id="40872" name="cloak_opt">
 		<!-- Poison Attack Success Rate +7.5% -->
+		<passive_skill id="27980" level="8" />
 	</option>
-	<option id="40873" name="gc_opt">
+	<option id="40873" name="cloak_opt">
 		<!-- Poison Attack Success Rate +15% -->
+		<passive_skill id="27980" level="9" />
 	</option>
-	<option id="40874" name="gc_opt">
+	<option id="40874" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +1.5% -->
+		<passive_skill id="27981" level="1" />
 	</option>
-	<option id="40875" name="gc_opt">
+	<option id="40875" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +2.5% -->
+		<passive_skill id="27981" level="2" />
 	</option>
-	<option id="40876" name="gc_opt">
+	<option id="40876" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3% -->
+		<passive_skill id="27981" level="3" />
 	</option>
-	<option id="40877" name="gc_opt">
+	<option id="40877" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +3.5% -->
+		<passive_skill id="27981" level="4" />
 	</option>
-	<option id="40878" name="gc_opt">
+	<option id="40878" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +4.5% -->
+		<passive_skill id="27981" level="5" />
 	</option>
-	<option id="40879" name="gc_opt">
+	<option id="40879" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +5% -->
+		<passive_skill id="27981" level="6" />
 	</option>
-	<option id="40880" name="gc_opt">
+	<option id="40880" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +6% -->
+		<passive_skill id="27981" level="7" />
 	</option>
-	<option id="40881" name="gc_opt">
+	<option id="40881" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +7.5% -->
+		<passive_skill id="27981" level="8" />
 	</option>
-	<option id="40882" name="gc_opt">
+	<option id="40882" name="cloak_opt">
 		<!-- Knock Back/Knock Down Attack Success Rate +15% -->
+		<passive_skill id="27981" level="9" />
 	</option>
-	<option id="40883" name="gc_opt">
+	<option id="40883" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +1.5% -->
+		<passive_skill id="27982" level="1" />
 	</option>
-	<option id="40884" name="gc_opt">
+	<option id="40884" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +2.5% -->
+		<passive_skill id="27982" level="2" />
 	</option>
-	<option id="40885" name="gc_opt">
+	<option id="40885" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3% -->
+		<passive_skill id="27982" level="3" />
 	</option>
-	<option id="40886" name="gc_opt">
+	<option id="40886" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +3.5% -->
+		<passive_skill id="27982" level="4" />
 	</option>
-	<option id="40887" name="gc_opt">
+	<option id="40887" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +4.5% -->
+		<passive_skill id="27982" level="5" />
 	</option>
-	<option id="40888" name="gc_opt">
+	<option id="40888" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +5% -->
+		<passive_skill id="27982" level="6" />
 	</option>
-	<option id="40889" name="gc_opt">
+	<option id="40889" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +6% -->
+		<passive_skill id="27982" level="7" />
 	</option>
-	<option id="40890" name="gc_opt">
+	<option id="40890" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +7.5% -->
+		<passive_skill id="27982" level="8" />
 	</option>
-	<option id="40891" name="gc_opt">
+	<option id="40891" name="cloak_opt">
 		<!-- Aerial Yoke Attack Success Rate +15% -->
+		<passive_skill id="27982" level="9" />
 	</option>
-	<option id="40892" name="gc_opt">
+	<option id="40892" name="cloak_opt">
 		<!-- Pull Attack Success Rate +1.5% -->
+		<passive_skill id="27983" level="1" />
 	</option>
-	<option id="40893" name="gc_opt">
+	<option id="40893" name="cloak_opt">
 		<!-- Pull Attack Success Rate +2.5% -->
+		<passive_skill id="27983" level="2" />
 	</option>
-	<option id="40894" name="gc_opt">
+	<option id="40894" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3% -->
+		<passive_skill id="27983" level="3" />
 	</option>
-	<option id="40895" name="gc_opt">
+	<option id="40895" name="cloak_opt">
 		<!-- Pull Attack Success Rate +3.5% -->
+		<passive_skill id="27983" level="4" />
 	</option>
-	<option id="40896" name="gc_opt">
+	<option id="40896" name="cloak_opt">
 		<!-- Pull Attack Success Rate +4.5% -->
+		<passive_skill id="27983" level="5" />
 	</option>
-	<option id="40897" name="gc_opt">
+	<option id="40897" name="cloak_opt">
 		<!-- Pull Attack Success Rate +5% -->
+		<passive_skill id="27983" level="6" />
 	</option>
-	<option id="40898" name="gc_opt">
+	<option id="40898" name="cloak_opt">
 		<!-- Pull Attack Success Rate +6% -->
+		<passive_skill id="27983" level="7" />
 	</option>
-	<option id="40899" name="gc_opt">
+	<option id="40899" name="cloak_opt">
 		<!-- Pull Attack Success Rate +7.5% -->
+		<passive_skill id="27983" level="8" />
 	</option>
 </list>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40900-40999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40900-40999.xml
index 838935d671..20bc27b091 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40900-40999.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/augmentation/options/40900-40999.xml
@@ -1,267 +1,353 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/optionsData.xsd">
-	<option id="40900" name="gc_opt">
+	<option id="40900" name="cloak_opt">
 		<!-- Pull Attack Success Rate +15% -->
+		<passive_skill id="27983" level="9" />
 	</option>
-	<option id="40901" name="gc_opt">
+	<option id="40901" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +1.5% -->
+		<passive_skill id="27984" level="1" />
 	</option>
-	<option id="40902" name="gc_opt">
+	<option id="40902" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +2.5% -->
+		<passive_skill id="27984" level="2" />
 	</option>
-	<option id="40903" name="gc_opt">
+	<option id="40903" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3% -->
+		<passive_skill id="27984" level="3" />
 	</option>
-	<option id="40904" name="gc_opt">
+	<option id="40904" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +3.5% -->
+		<passive_skill id="27984" level="4" />
 	</option>
-	<option id="40905" name="gc_opt">
+	<option id="40905" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +4.5% -->
+		<passive_skill id="27984" level="5" />
 	</option>
-	<option id="40906" name="gc_opt">
+	<option id="40906" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +5% -->
+		<passive_skill id="27984" level="6" />
 	</option>
-	<option id="40907" name="gc_opt">
+	<option id="40907" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +6% -->
+		<passive_skill id="27984" level="7" />
 	</option>
-	<option id="40908" name="gc_opt">
+	<option id="40908" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +7.5% -->
+		<passive_skill id="27984" level="8" />
 	</option>
-	<option id="40909" name="gc_opt">
+	<option id="40909" name="cloak_opt">
 		<!-- Petrification Attack Success Rate +15% -->
+		<passive_skill id="27984" level="9" />
 	</option>
-	<option id="40910" name="gc_opt">
+	<option id="40910" name="cloak_opt">
 		<!-- Max HP +4% -->
+		<passive_skill id="27985" level="1" />
 	</option>
-	<option id="40911" name="gc_opt">
+	<option id="40911" name="cloak_opt">
 		<!-- Max HP +4.5% -->
+		<passive_skill id="27985" level="2" />
 	</option>
-	<option id="40912" name="gc_opt">
+	<option id="40912" name="cloak_opt">
 		<!-- Max HP +5% -->
+		<passive_skill id="27985" level="3" />
 	</option>
-	<option id="40913" name="gc_opt">
+	<option id="40913" name="cloak_opt">
 		<!-- Max MP +4% -->
+		<passive_skill id="27986" level="1" />
 	</option>
-	<option id="40914" name="gc_opt">
+	<option id="40914" name="cloak_opt">
 		<!-- Max MP +4.5% -->
+		<passive_skill id="27986" level="2" />
 	</option>
-	<option id="40915" name="gc_opt">
+	<option id="40915" name="cloak_opt">
 		<!-- Max MP +5% -->
+		<passive_skill id="27986" level="3" />
 	</option>
-	<option id="40916" name="gc_opt">
+	<option id="40916" name="cloak_opt">
 		<!-- Max CP +4% -->
+		<passive_skill id="27987" level="1" />
 	</option>
-	<option id="40917" name="gc_opt">
+	<option id="40917" name="cloak_opt">
 		<!-- Max CP +4.5% -->
+		<passive_skill id="27987" level="2" />
 	</option>
-	<option id="40918" name="gc_opt">
+	<option id="40918" name="cloak_opt">
 		<!-- Max CP +5% -->
+		<passive_skill id="27987" level="3" />
 	</option>
-	<option id="40919" name="gc_opt">
+	<option id="40919" name="cloak_opt">
 		<!-- P. Atk. +4% -->
+		<passive_skill id="27988" level="1" />
 	</option>
-	<option id="40920" name="gc_opt">
+	<option id="40920" name="cloak_opt">
 		<!-- P. Atk. +4.5% -->
+		<passive_skill id="27988" level="2" />
 	</option>
-	<option id="40921" name="gc_opt">
+	<option id="40921" name="cloak_opt">
 		<!-- P. Atk. +5% -->
+		<passive_skill id="27988" level="3" />
 	</option>
-	<option id="40922" name="gc_opt">
+	<option id="40922" name="cloak_opt">
 		<!-- P. Def. +4% -->
+		<passive_skill id="27989" level="1" />
 	</option>
-	<option id="40923" name="gc_opt">
+	<option id="40923" name="cloak_opt">
 		<!-- P. Def. +4.5% -->
+		<passive_skill id="27989" level="2" />
 	</option>
-	<option id="40924" name="gc_opt">
+	<option id="40924" name="cloak_opt">
 		<!-- P. Def. +5% -->
+		<passive_skill id="27989" level="3" />
 	</option>
-	<option id="40925" name="gc_opt">
+	<option id="40925" name="cloak_opt">
 		<!-- Atk. Spd. +4% -->
+		<passive_skill id="27990" level="1" />
 	</option>
-	<option id="40926" name="gc_opt">
+	<option id="40926" name="cloak_opt">
 		<!-- Atk. Spd. +4.5% -->
+		<passive_skill id="27990" level="2" />
 	</option>
-	<option id="40927" name="gc_opt">
+	<option id="40927" name="cloak_opt">
 		<!-- Atk. Spd. +5% -->
+		<passive_skill id="27990" level="3" />
 	</option>
-	<option id="40928" name="gc_opt">
+	<option id="40928" name="cloak_opt">
 		<!-- Speed +10 -->
+		<passive_skill id="27991" level="1" />
 	</option>
-	<option id="40929" name="gc_opt">
+	<option id="40929" name="cloak_opt">
 		<!-- Speed +13 -->
+		<passive_skill id="27991" level="2" />
 	</option>
-	<option id="40930" name="gc_opt">
+	<option id="40930" name="cloak_opt">
 		<!-- Speed +15 -->
+		<passive_skill id="27991" level="3" />
 	</option>
-	<option id="40931" name="gc_opt">
+	<option id="40931" name="cloak_opt">
 		<!-- M. Atk. +4% -->
+		<passive_skill id="27992" level="1" />
 	</option>
-	<option id="40932" name="gc_opt">
+	<option id="40932" name="cloak_opt">
 		<!-- M. Atk. +4.5% -->
+		<passive_skill id="27992" level="2" />
 	</option>
-	<option id="40933" name="gc_opt">
+	<option id="40933" name="cloak_opt">
 		<!-- M. Atk. +5% -->
+		<passive_skill id="27992" level="3" />
 	</option>
-	<option id="40934" name="gc_opt">
+	<option id="40934" name="cloak_opt">
 		<!-- M. Def. +4% -->
+		<passive_skill id="27993" level="1" />
 	</option>
-	<option id="40935" name="gc_opt">
+	<option id="40935" name="cloak_opt">
 		<!-- M. Def. +4.5% -->
+		<passive_skill id="27993" level="2" />
 	</option>
-	<option id="40936" name="gc_opt">
+	<option id="40936" name="cloak_opt">
 		<!-- M. Def. +5% -->
+		<passive_skill id="27993" level="3" />
 	</option>
-	<option id="40937" name="gc_opt">
+	<option id="40937" name="cloak_opt">
 		<!-- Casting Spd. +4% -->
+		<passive_skill id="27994" level="1" />
 	</option>
-	<option id="40938" name="gc_opt">
+	<option id="40938" name="cloak_opt">
 		<!-- Casting Spd. +4.5% -->
+		<passive_skill id="27994" level="2" />
 	</option>
-	<option id="40939" name="gc_opt">
+	<option id="40939" name="cloak_opt">
 		<!-- Casting Spd. +5% -->
+		<passive_skill id="27994" level="3" />
 	</option>
-	<option id="40940" name="gc_opt">
+	<option id="40940" name="cloak_opt">
 		<!-- PvP Damage +4% -->
+		<passive_skill id="27995" level="1" />
 	</option>
-	<option id="40941" name="gc_opt">
+	<option id="40941" name="cloak_opt">
 		<!-- PvP Damage +4.5% -->
+		<passive_skill id="27995" level="2" />
 	</option>
-	<option id="40942" name="gc_opt">
+	<option id="40942" name="cloak_opt">
 		<!-- PvP Damage +5% -->
+		<passive_skill id="27995" level="3" />
 	</option>
-	<option id="40943" name="gc_opt">
+	<option id="40943" name="cloak_opt">
 		<!-- Received PvP Damage -4% -->
+		<passive_skill id="27996" level="1" />
 	</option>
-	<option id="40944" name="gc_opt">
+	<option id="40944" name="cloak_opt">
 		<!-- Received PvP Damage -4.5% -->
+		<passive_skill id="27996" level="2" />
 	</option>
-	<option id="40945" name="gc_opt">
+	<option id="40945" name="cloak_opt">
 		<!-- Received PvP Damage -5% -->
+		<passive_skill id="27996" level="3" />
 	</option>
-	<option id="40946" name="gc_opt">
+	<option id="40946" name="cloak_opt">
 		<!-- PvE Damage +4% -->
+		<passive_skill id="27997" level="1" />
 	</option>
-	<option id="40947" name="gc_opt">
+	<option id="40947" name="cloak_opt">
 		<!-- PvE Damage +4.5% -->
+		<passive_skill id="27997" level="2" />
 	</option>
-	<option id="40948" name="gc_opt">
+	<option id="40948" name="cloak_opt">
 		<!-- PvE Damage +5% -->
+		<passive_skill id="27997" level="3" />
 	</option>
-	<option id="40949" name="gc_opt">
+	<option id="40949" name="cloak_opt">
 		<!-- Received PvE Damage -4% -->
+		<passive_skill id="27998" level="1" />
 	</option>
-	<option id="40950" name="gc_opt">
+	<option id="40950" name="cloak_opt">
 		<!-- Received PvE Damage -4.5% -->
+		<passive_skill id="27998" level="2" />
 	</option>
-	<option id="40951" name="gc_opt">
+	<option id="40951" name="cloak_opt">
 		<!-- Received PvE Damage -5% -->
+		<passive_skill id="27998" level="3" />
 	</option>
-	<option id="40952" name="gc_opt">
+	<option id="40952" name="cloak_opt">
 		<!-- EXP when hunting +4% -->
+		<passive_skill id="27999" level="1" />
 	</option>
-	<option id="40953" name="gc_opt">
+	<option id="40953" name="cloak_opt">
 		<!-- EXP when hunting +4.5% -->
+		<passive_skill id="27999" level="2" />
 	</option>
-	<option id="40954" name="gc_opt">
+	<option id="40954" name="cloak_opt">
 		<!-- EXP when hunting +5% -->
+		<passive_skill id="27999" level="3" />
 	</option>
-	<option id="40955" name="gc_opt">
+	<option id="40955" name="cloak_opt">
 		<!-- SP when hunting +4% -->
+		<passive_skill id="28000" level="1" />
 	</option>
-	<option id="40956" name="gc_opt">
+	<option id="40956" name="cloak_opt">
 		<!-- SP when hunting +4.5% -->
+		<passive_skill id="28000" level="2" />
 	</option>
-	<option id="40957" name="gc_opt">
+	<option id="40957" name="cloak_opt">
 		<!-- SP when hunting +5% -->
+		<passive_skill id="28000" level="3" />
 	</option>
-	<option id="40958" name="gc_opt">
+	<option id="40958" name="cloak_opt">
 		<!-- Chance to recover 4% of damage as HP -->
+		<passive_skill id="28001" level="1" />
 	</option>
-	<option id="40959" name="gc_opt">
+	<option id="40959" name="cloak_opt">
 		<!-- Chance to recover 4.5% of damage as HP -->
+		<passive_skill id="28001" level="2" />
 	</option>
-	<option id="40960" name="gc_opt">
+	<option id="40960" name="cloak_opt">
 		<!-- Chance to recover 5% of damage as HP -->
+		<passive_skill id="28001" level="3" />
 	</option>
-	<option id="40961" name="gc_opt">
+	<option id="40961" name="cloak_opt">
 		<!-- P. Skill MP Consumption -3% -->
+		<passive_skill id="28002" level="1" />
 	</option>
-	<option id="40962" name="gc_opt">
+	<option id="40962" name="cloak_opt">
 		<!-- P. Skill MP Consumption -4% -->
+		<passive_skill id="28002" level="2" />
 	</option>
-	<option id="40963" name="gc_opt">
+	<option id="40963" name="cloak_opt">
 		<!-- P. Skill MP Consumption -5% -->
+		<passive_skill id="28002" level="3" />
 	</option>
-	<option id="40964" name="gc_opt">
+	<option id="40964" name="cloak_opt">
 		<!-- M. Skill MP Consumption -3% -->
+		<passive_skill id="28003" level="1" />
 	</option>
-	<option id="40965" name="gc_opt">
+	<option id="40965" name="cloak_opt">
 		<!-- M. Skill MP Consumption -4% -->
+		<passive_skill id="28003" level="2" />
 	</option>
-	<option id="40966" name="gc_opt">
+	<option id="40966" name="cloak_opt">
 		<!-- M. Skill MP Consumption -5% -->
+		<passive_skill id="28003" level="3" />
 	</option>
-	<option id="40967" name="gc_opt">
+	<option id="40967" name="cloak_opt">
 		<!-- Fixed Damage Resistance +5 -->
+		<passive_skill id="28005" level="1" />
 	</option>
-	<option id="40968" name="gc_opt">
+	<option id="40968" name="cloak_opt">
 		<!-- Fixed Damage Resistance +7 -->
+		<passive_skill id="28005" level="2" />
 	</option>
-	<option id="40969" name="gc_opt">
+	<option id="40969" name="cloak_opt">
 		<!-- Fixed Damage Resistance +10 -->
+		<passive_skill id="28005" level="3" />
 	</option>
-	<option id="40970" name="gc_opt">
+	<option id="40970" name="cloak_opt">
 		<!-- Reflects 3% of all status effects -->
+		<passive_skill id="28004" level="1" />
 	</option>
-	<option id="40971" name="gc_opt">
+	<option id="40971" name="cloak_opt">
 		<!-- Reflects 4% of all status effects -->
+		<passive_skill id="28004" level="2" />
 	</option>
-	<option id="40972" name="gc_opt">
+	<option id="40972" name="cloak_opt">
 		<!-- Reflects 5% of all status effects -->
+		<passive_skill id="28004" level="3" />
 	</option>
-	<option id="40973" name="gc_opt">
+	<option id="40973" name="cloak_opt">
 		<!-- When using a single attack skill, there's a chance for Silence to be activated. -->
 	</option>
-	<option id="40974" name="gc_opt">
+	<option id="40974" name="cloak_opt">
 		<!-- Active Skill: When receiving a fatal attack, CP/HP recovers by 100% for 1 minute. When the effect is applied the buff disappears. -->
 	</option>
-	<option id="40975" name="gc_opt">
+	<option id="40975" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 10000 damage when hit. -->
+		<passive_skill id="28010" level="1" />
 	</option>
-	<option id="40976" name="gc_opt">
+	<option id="40976" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 15000 damage when hit. -->
+		<passive_skill id="28010" level="2" />
 	</option>
-	<option id="40977" name="gc_opt">
+	<option id="40977" name="cloak_opt">
 		<!-- Activates a shield that has a chance to absorb 30000 damage when hit. -->
+		<passive_skill id="28010" level="3" />
 	</option>
-	<option id="40978" name="gc_opt">
+	<option id="40978" name="cloak_opt">
 		<!-- P./M. Skill Power +5% -->
+		<passive_skill id="28012" level="1" />
 	</option>
-	<option id="40979" name="gc_opt">
+	<option id="40979" name="cloak_opt">
 		<!-- P./M. Skill Power +10% -->
+		<passive_skill id="28012" level="2" />
 	</option>
-	<option id="40980" name="gc_opt">
+	<option id="40980" name="cloak_opt">
 		<!-- P./M. Skill Power +15% -->
+		<passive_skill id="28012" level="3" />
 	</option>
-	<option id="40981" name="gc_opt">
+	<option id="40981" name="cloak_opt">
 		<!-- Active Skill: Resurrects from death with full recovery. Buffs/debuffs stay when dying. However, the Noblesse Blessing and Lucky Charms disappear. -->
+		<passive_skill id="28013" level="1" />
 	</option>
-	<option id="40982" name="gc_opt">
+	<option id="40982" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 30 seconds by twisting the space. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28014" level="1" />
 	</option>
-	<option id="40983" name="gc_opt">
+	<option id="40983" name="cloak_opt">
 		<!-- Invincibility activated if damage received when HP is below 30%. -->
+		<passive_skill id="28016" level="1" />
 	</option>
-	<option id="40984" name="gc_opt">
+	<option id="40984" name="cloak_opt">
 		<!-- Has a chance to create a circle around when hit that cancels any ranged attacks and debuffs for 15 seconds by twisting the space, and Speed +100. When hit inside the circle, you will receive damage. -->
+		<passive_skill id="28018" level="1" />
 	</option>
-	<option id="40985" name="gc_opt">
+	<option id="40985" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +2%. -->
+		<passive_skill id="28020" level="1" />
 	</option>
-	<option id="40986" name="gc_opt">
+	<option id="40986" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +10%. -->
+		<passive_skill id="28020" level="2" />
 	</option>
-	<option id="40987" name="gc_opt">
+	<option id="40987" name="cloak_opt">
 		<!-- Bonus EXP obtained in Vitality state +20%. -->
+		<passive_skill id="28020" level="3" />
 	</option>
 </list>