diff --git a/Demoted/PathOfTheWildMagic-en.txt b/Demoted/PathOfTheWildMagic-en.txt
new file mode 100644
index 0000000000..9965e2e9d1
--- /dev/null
+++ b/Demoted/PathOfTheWildMagic-en.txt
@@ -0,0 +1,21 @@
+Condition/&ConditionPathOfTheWildMagicBolsteringMagicRollDescription=You roll a d3 whenever making an attack roll or an ability check and add the number rolled to the d20 roll.
+Condition/&ConditionPathOfTheWildMagicBolsteringMagicRollTitle=Bolstering Magic: Roll
+Condition/&ConditionPathOfTheWildMagicBolsteringMagicSlotDescription=You gained one random spell slot between levels 1 and 3.
+Condition/&ConditionPathOfTheWildMagicBolsteringMagicSlotTitle=Bolstering Magic: Slot
+Feature/&FeaturePathOfTheWildMagicControlledSurgeDescription=Whenever you roll on the Wild Magic table, you can roll the die twice and choose which of the two effects to unleash. If you roll the same number on both dice, you can ignore the number and choose any effect on the table.
+Feature/&FeaturePathOfTheWildMagicControlledSurgeTitle=Controlled Surge
+Feature/&FeaturePathOfTheWildMagicUnstableBackslashDescription=Immediately after you take damage or fail a saving throw while raging, you can use your reaction to roll on the Wild Magic table and immediately produce the effect rolled. This effect replaces your current Wild Magic effect.
+Feature/&FeaturePathOfTheWildMagicUnstableBackslashTitle=Unstable Backslash
+Feature/&FeatureSetPathOfTheWildMagicWildSurgeDescription=When you enter your rage, roll on the Wild Magic table to determine the magical effect produced. If the effect requires a saving throw, the DC equals 8 + your proficiency bonus + your Constitution modifier.
+Feature/&FeatureSetPathOfTheWildMagicWildSurgeTitle=Wild Surge
+Feature/&PowerPathOfTheWildMagicBolsteringMagicDescription=As an action, you can touch one ally and confer one of the following benefits of your choice:\n• For 10 minutes, the creature can roll a d3 whenever making an attack roll or an ability check and add the number rolled to the d20 roll.\n• Roll a d3. The creature regains one expended spell slot, the level of which equals the number rolled. Once a creature receives this benefit, that creature can’t receive it again until after a long rest.\nYou can take this action a number of times equal to your proficiency bonus, and you regain all expended uses when you finish a long rest.
+Feature/&PowerPathOfTheWildMagicBolsteringMagicRollDescription=As an action, you can touch one ally and for 10 minutes, they can roll a d3 whenever making an attack roll or an ability check and add the number rolled to the d20 roll.
+Feature/&PowerPathOfTheWildMagicBolsteringMagicRollTitle=Bolstering Magic: Roll
+Feature/&PowerPathOfTheWildMagicBolsteringMagicSpellDescription=As an action, you can touch one ally and roll a d3. The creature regains one expended spell slot, the level of which equals the number rolled. Once a creature receives this benefit, that creature can’t receive it again until after a long rest.
+Feature/&PowerPathOfTheWildMagicBolsteringMagicSpellTitle=Bolstering Magic: Spell
+Feature/&PowerPathOfTheWildMagicBolsteringMagicTitle=Bolstering Magic
+Feature/&PowerPathOfTheWildMagicMagicAwarenessDescription=As an action, you can open your awareness to the presence of concentrated magic. Over the next minute, you know the location of any spell or magic item within 60 feet of you.
+Feature/&PowerPathOfTheWildMagicMagicAwarenessTitle=Magic Awareness
+Subclass/&PathOfTheWildMagicDescription=Many places in the multiverse abound with beauty, intense emotion, and rampant magic. the Feywild, the Upper Planes, and other realms of supernatural power radiate with such forces and can profoundly influence people. As folk of deep feeling, barbarians are especially susceptible to these wild influences, with some barbarians being transformed by the magic. These magic-suffused barbarians walk the Path of Wild Magic. Elf, tiefling, and aasimars often seek this path, eager to manifest the otherworldly magic of their ancestors.
+Subclass/&PathOfTheWildMagicTitle=Path of the Wild Magic
+Tooltip/&MustNotHaveBolsteringMagicSpell=Must not have Bolstering Magic slots
diff --git a/Demoted/PathOfTheWildMagic.cs b/Demoted/PathOfTheWildMagic.cs
new file mode 100644
index 0000000000..65a9e83f9d
--- /dev/null
+++ b/Demoted/PathOfTheWildMagic.cs
@@ -0,0 +1,230 @@
+using System.Collections;
+using System.Linq;
+using JetBrains.Annotations;
+using SolastaUnfinishedBusiness.Api.GameExtensions;
+using SolastaUnfinishedBusiness.Behaviors.Specific;
+using SolastaUnfinishedBusiness.Builders;
+using SolastaUnfinishedBusiness.Builders.Features;
+using SolastaUnfinishedBusiness.Interfaces;
+using static RuleDefinitions;
+using static SolastaUnfinishedBusiness.Api.DatabaseHelper;
+
+namespace SolastaUnfinishedBusiness.Subclasses;
+
+[UsedImplicitly]
+public sealed class PathOfTheWildMagic //: AbstractSubclass
+{
+    private const string Name = "PathOfTheWildMagic";
+
+    public PathOfTheWildMagic()
+    {
+        // Magic Awareness
+
+        var powerMagicAwareness = FeatureDefinitionPowerBuilder
+            .Create($"Power{Name}MagicAwareness")
+            .SetGuiPresentation(Category.Feature, SpellDefinitions.DetectMagic)
+            .SetUsesProficiencyBonus(ActivationTime.Action)
+            .SetEffectDescription(
+                EffectDescriptionBuilder
+                    .Create(SpellDefinitions.DetectMagic)
+                    .SetDurationData(DurationType.Minute, 1)
+                    .SetTargetingData(Side.Ally, RangeType.Self, 0, TargetType.Self, 0)
+                    .SetEffectForms(
+                        EffectFormBuilder
+                            .Create()
+                            .SetDivinationForm(
+                                DivinationForm.Type.RevealEntitiesBearingTags,
+                                [], [TagsDefinitions.Magical], 12)
+                            .Build(),
+                        EffectFormBuilder.ConditionForm(ConditionDefinitions.ConditionDetectMagicSight))
+                    .Build())
+            .AddToDB();
+
+        // Wild Surge
+
+        var featureSetWildSurge = FeatureDefinitionFeatureSetBuilder
+            .Create($"FeatureSet{Name}WildSurge")
+            .SetGuiPresentation(Category.Feature)
+            .SetFeatureSet()
+            .AddToDB();
+
+        // Bolstering Magic
+
+        var powerBolsteringMagic = FeatureDefinitionPowerBuilder
+            .Create($"Power{Name}BolsteringMagic")
+            .SetGuiPresentation(Category.Feature)
+            .SetUsesProficiencyBonus(ActivationTime.Action)
+            .SetEffectDescription(
+                EffectDescriptionBuilder
+                    .Create()
+                    .SetTargetingData(Side.Ally, RangeType.Touch, 0, TargetType.IndividualsUnique)
+                    .Build())
+            .AddToDB();
+
+        var conditionBolsteringMagicRoll = ConditionDefinitionBuilder
+            .Create($"Condition{Name}BolsteringMagicRoll")
+            .SetGuiPresentation(Category.Condition)
+            .AddToDB();
+
+        conditionBolsteringMagicRoll.AddCustomSubFeatures(
+            new CustomBehaviorBolsteringMagicRoll(conditionBolsteringMagicRoll));
+
+        var powerBolsteringMagicRoll = FeatureDefinitionPowerSharedPoolBuilder
+            .Create($"Power{Name}BolsteringMagicRoll")
+            .SetGuiPresentation(Category.Feature, hidden: true)
+            .SetSharedPool(ActivationTime.Action, powerBolsteringMagic)
+            .SetEffectDescription(
+                EffectDescriptionBuilder
+                    .Create()
+                    .SetDurationData(DurationType.Minute, 10)
+                    .SetTargetingData(Side.Ally, RangeType.Touch, 0, TargetType.IndividualsUnique)
+                    .SetEffectForms(EffectFormBuilder.ConditionForm(conditionBolsteringMagicRoll))
+                    .Build())
+            .AddToDB();
+
+        var db = DatabaseRepository.GetDatabase<FeatureDefinitionMagicAffinity>();
+        var conditions = new ConditionDefinition[3];
+
+        for (var i = 1; i <= 3; i++)
+        {
+            conditions[i - 1] = ConditionDefinitionBuilder
+                .Create($"Condition{Name}BolsteringMagicSlot{i}")
+                .SetGuiPresentation($"Condition{Name}BolsteringMagicSlot", Category.Condition)
+                .SetSilent(Silent.WhenRemoved)
+                .SetFeatures(db.GetElement($"MagicAffinityAdditionalSpellSlot{i}"))
+                .AddToDB();
+        }
+
+        var powerBolsteringMagicSpell = FeatureDefinitionPowerSharedPoolBuilder
+            .Create($"Power{Name}BolsteringMagicSpell")
+            .SetGuiPresentation(Category.Feature, hidden: true)
+            .SetSharedPool(ActivationTime.Action, powerBolsteringMagic)
+            .SetEffectDescription(
+                EffectDescriptionBuilder
+                    .Create()
+                    .SetDurationData(DurationType.UntilLongRest)
+                    .SetTargetingData(Side.Ally, RangeType.Touch, 0, TargetType.IndividualsUnique)
+                    .SetEffectForms(
+                        EffectFormBuilder
+                            .Create()
+                            .SetConditionForm(
+                                conditions[0],
+                                ConditionForm.ConditionOperation.AddRandom,
+                                false, false, conditions)
+                            .Build())
+                    .Build())
+            .AddCustomSubFeatures(new FilterTargetingCharacterBolsteringMagicSpell(conditions))
+            .AddToDB();
+
+        PowerBundle.RegisterPowerBundle(powerBolsteringMagic, false,
+            powerBolsteringMagicRoll, powerBolsteringMagicSpell);
+
+        var featureSetBolsteringMagic = FeatureDefinitionFeatureSetBuilder
+            .Create($"FeatureSet{Name}BolsteringMagic")
+            .SetGuiPresentation($"Power{Name}BolsteringMagic", Category.Feature)
+            .SetFeatureSet(powerBolsteringMagic, powerBolsteringMagicRoll, powerBolsteringMagicSpell)
+            .AddToDB();
+
+        // Unstable Backslash
+
+        var featureUnstableBackslash = FeatureDefinitionBuilder
+            .Create($"Feature{Name}UnstableBackslash")
+            .SetGuiPresentation(Category.Feature)
+            .AddToDB();
+
+        // Controlled Surge
+
+        var featureControlledSurge = FeatureDefinitionBuilder
+            .Create($"Feature{Name}ControlledSurge")
+            .SetGuiPresentation(Category.Feature)
+            .AddToDB();
+
+        // MAIN
+
+        Subclass = CharacterSubclassDefinitionBuilder
+            .Create(Name)
+            .SetGuiPresentation(Category.Subclass, CharacterSubclassDefinitions.PathBerserker)
+            .AddFeaturesAtLevel(3, powerMagicAwareness, featureSetWildSurge)
+            .AddFeaturesAtLevel(6, featureSetBolsteringMagic)
+            .AddFeaturesAtLevel(10, featureUnstableBackslash)
+            .AddFeaturesAtLevel(14, featureControlledSurge)
+            .AddToDB();
+    }
+
+    internal CharacterClassDefinition Klass => CharacterClassDefinitions.Barbarian;
+
+    internal CharacterSubclassDefinition Subclass { get; }
+
+    internal FeatureDefinitionSubclassChoice SubclassChoice =>
+        FeatureDefinitionSubclassChoices.SubclassChoiceBarbarianPrimalPath;
+
+    // ReSharper disable once UnassignedGetOnlyAutoProperty
+    internal DeityDefinition DeityDefinition { get; }
+
+    private sealed class CustomBehaviorBolsteringMagicRoll(
+        ConditionDefinition conditionBolsteringMagicRoll) : ITryAlterOutcomeAttack, ITryAlterOutcomeAttributeCheck
+    {
+        public IEnumerator OnTryAlterOutcomeAttack(
+            GameLocationBattleManager instance,
+            CharacterAction action,
+            GameLocationCharacter attacker,
+            GameLocationCharacter defender,
+            GameLocationCharacter helper,
+            ActionModifier actionModifier)
+        {
+            if (helper != defender)
+            {
+                yield break;
+            }
+
+            var advantageType = actionModifier.AttackAdvantageTrend switch
+            {
+                > 0 => AdvantageType.Advantage,
+                < 0 => AdvantageType.Disadvantage,
+                _ => AdvantageType.None
+            };
+
+            var roll = RollDie(DieType.D3, advantageType, out _, out _);
+
+            actionModifier.AttacktoHitTrends.Add(
+                new TrendInfo(roll, FeatureSourceType.CharacterFeature, conditionBolsteringMagicRoll.Name,
+                    conditionBolsteringMagicRoll));
+        }
+
+        public IEnumerator OnTryAlterAttributeCheck(
+            GameLocationBattleManager battleManager,
+            AbilityCheckData abilityCheckData,
+            GameLocationCharacter defender,
+            GameLocationCharacter helper,
+            ActionModifier abilityCheckModifier)
+        {
+            if (helper != defender ||
+                abilityCheckData.AbilityCheckRollOutcome != RollOutcome.Failure)
+            {
+                yield break;
+            }
+        }
+    }
+
+    private sealed class FilterTargetingCharacterBolsteringMagicSpell(
+        params ConditionDefinition[] conditions) : IFilterTargetingCharacter
+    {
+        private readonly string[] _conditionNames = conditions.Select(x => x.Name).ToArray();
+
+        public bool EnforceFullSelection => false;
+
+        public bool IsValid(CursorLocationSelectTarget __instance, GameLocationCharacter target)
+        {
+            var isValid = !target.RulesetActor.HasAnyConditionOfType(_conditionNames);
+
+            if (isValid)
+            {
+                return true;
+            }
+
+            __instance.actionModifier.FailureFlags.Add("Tooltip/&MustNotHaveBolsteringMagicSpell");
+
+            return false;
+        }
+    }
+}
diff --git a/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt b/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
index 5380ced1c3..7e6b1257ae 100644
--- a/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
+++ b/Diagnostics/CE-Definitions-GuiPresentation-InvalidSyntaxTranslation-en.txt
@@ -799,7 +799,7 @@ FeatGroupCloseQuarters	Description='You are experienced with fighting in close q
 FeatGroupCreed	Description='Creed of Arun, Creed of Einar, Creed of Maraike, Creed of Misaye, Creed of Pakri, Creed of Solasta'.
 FeatGroupCrusher	Description='Increase your Strength or Constitution by 1, to a maximum of 20.
 When you hit a creature with an attack that deals bludgeoning damage, once per turn you push the enemy by 5ft. When you score a critical hit attack rolls against that creature are made with advantage until the start of your next turn.'.
-FeatGroupDefenseCombat	Description='Always Ready, Cloak and Dagger, Defensive Duelist, Dual Wielder, Fade Away, Monastic Shield Training, Raise Shield, Shield Master, Twin Blade, Unarmored Expert'.
+FeatGroupDefenseCombat	Description='Always Ready, Cloak and Dagger, Defensive Duelist, Dual Wielder, Fade Away, Raise Shield, Shield Bash, Shield Master, Twin Blade, Unarmored Expert'.
 FeatGroupDefenseExpert	Description='Increase one of your mental attributes by 1, to a maximum of 20.
 While you are not wearing any armor, your armor class is equal to 10 + your Dexterity modifier + the selected mental attribute modifier.'.
 FeatGroupDragonFear	Description='When angered, you radiate menace. You gain the following benefits:
@@ -817,7 +817,7 @@ FeatGroupFadeAway	Description='You have learned a magical trick for fading away
 FeatGroupFeyTeleport	Description='Increase one of your mental attributes by 1, to a maximum of 20.
 You can use misty step once per short rest, and you can cast this spell with your spell slots.
 You gain proficiency in Tirmarian.'.
-FeatGroupFightingStyle	Description='Archery, Blind Fighting, Classical Swordplay, Crippling, Defense, Dueling, Executioner, Great Weapon Fighting, Interception, Lunger, Merciless, Protection, Pugilist, Rope it Up, Shield Expert, Superior Technique, Torchbearer, Two Weapon Fighting'.
+FeatGroupFightingStyle	Description='Archery, Astral Reach, Blind Fighting, Classical Swordplay, Crippling, Defense, Dueling, Executioner, Great Weapon Fighting, Interception, Lunger, Protection, Pugilist, Superior Technique, Torchbearer, Two Weapon Fighting'.
 FeatGroupFlamesOfPhlegethos	Description='You learn to call on hellfire to serve your commands. You gain the following benefits:
 • Increase your Intelligence or Charisma by 1, to a maximum of 20.
 • When you roll fire damage for a spell you cast, you can reroll any roll of 1 on the fire damage dice, but you must use the new roll, even if it is another 1.
@@ -842,11 +842,11 @@ You gain the ability to cast the color spray, faerie fire and color burst spells
 FeatGroupMagicInitiate	Description='Choose a class: bard, cleric, druid, sorcerer, warlock, or wizard. You learn two cantrips of your choice from that class's spell list. In addition, choose one 1st-level spell to learn from that same list. Using this feat, you can cast the spell once at its lowest level, and you must finish a long rest before you can cast it in this way again.'.
 FeatGroupMediumArmor	Description='Increase your Strength or Dexterity by 1, to a maximum of 20.
 You gain proficiency with medium armor and shields.'.
-FeatGroupMeleeCombat	Description='Always Ready, Baleful Scion, Blade Mastery, Charger, Crusher, Daunting Push, Defensive Duelist, Devastating Strikes, Distracting Gambit, Elemental Touch, Fell Handed, Fencer, Great Weapon Master, Hammer the Point, Longsword Finesse, Old Tactics, Piercer, Polearm Master, Power Attack, Reckless Attack, Savage Attack, Slasher, Spear Mastery, Trip Attack'.
+FeatGroupMeleeCombat	Description='Always Ready, Baleful Scion, Blade Mastery, Charger, Crusher, Daunting Push, Defensive Duelist, Devastating Strikes, Distracting Gambit, Elemental Touch, Fell Handed, Fencer, Great Weapon Master, Longsword Finesse, Old Tactics, Piercer, Polearm Master, Power Attack, Reckless Attack, Savage Attack, Shield Bash, Slasher, Spear Mastery, Trip Attack'.
 FeatGroupOldTactics	Description='Increase your Strength or Dexterity by 1. Once per round, when a prone enemy within range of your melee weapon stands up you may make an attack of opportunity against the target.'.
 FeatGroupOrcishAggression	Description='Your aggression burns tirelessly. You gain the following benefits:
 • Increase your Strength or Constitution by 1, up to a maximum of 20.
-• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon.'.
+• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon. This feature can be used proficiency bonus times per long rest.'.
 FeatGroupOrcishFury	Description='Your fury burns tirelessly. You gain the following benefits:
 • Increase your Strength or Constitution by 1, up to a maximum of 20.
 • When you hit with an attack made with a simple or martial weapon, you can roll one of the weapon's damage dice an additional time and add it as extra damage of the weapon's damage type. Once you use this ability, you can't use it again until you finish a short or long rest.
@@ -877,7 +877,7 @@ When you hit a creature with an attack that deals slashing damage, you can reduc
 FeatGroupSpellCombat	Description='Baleful Scion, Elemental Adept, Elemental Master, Flawless Concentration, Potent Spellcaster, Powerful Cantrip, Spell Sniper, War Caster'.
 FeatGroupSpellSniper	Description='You learn one cantrip that requires an attack roll. Choose the cantrip from the bard, cleric, druid, sorcerer, warlock, or wizard spell list. When you cast a spell that requires you to make an attack roll, the spell's range is doubled. Your ranged spell attacks ignore half cover and three-quarters cover.'.
 FeatGroupSquatNimbleness	Description='You are uncommonly nimble for your race. Increase your Strength or Dexterity by 1, to a maximum of 20. Increase your walking speed by 5 ft. You gain proficiency or expertise in the Athletics skill if Strength is increased or Acrobatics skill if Dexterity is increased.'.
-FeatGroupSupportCombat	Description='Call for Charge, Chef, Gift of the Chromatic Dragon, Hardy, Healer, Improved Critical, Inspiring Leader, Lucky, Mage Slayer, Menacing, Mender, Poisoner, Precision Focused, Sentinel, Superior Critical, Weapon Master'.
+FeatGroupSupportCombat	Description='Call for Charge, Chef, Gift of the Chromatic Dragon, Hardy, Healer, Improved Critical, Inspiring Leader, Lucky, Mage Slayer, Menacing, Mender, Merciless, Poisoner, Precision Focused, Sentinel, Superior Critical, Thrown Weapons Master, Weapon Master'.
 FeatGroupTelekinetic	Description='Increase one of your mental attributes by 1, to a maximum of 20.
 As a bonus action during combat, you can telekinetically move one creature you can see within 30 ft of you. The target must succeed on a Strength saving throw (DC 8 + your proficiency bonus + your chosen attributes modifier) or be moved 5 ft in a direction of your choosing.'.
 FeatGroupTools	Description='Initiate Alchemist, Initiate Enchanter, Lock Breaker, Master Alchemist, Master Enchanter, Poisoner, Scriber, Toxicologist'.
@@ -887,7 +887,7 @@ FeatGroupToxicologist	Description='Increase one of your mental attributes by 1,
 You gain proficiency with poisoner's kit and Nature, or expertise if already proficient.'.
 FeatGroupTwoHandedCombat	Description='Follow Up Strike, Forestalling Strength, Mighty Blow, Polearm Master, Revenant Blade'.
 FeatGroupTwoWeaponCombat	Description='Ambidextrous, Dual Flurry, Dual Wielder, Twin Blade'.
-FeatGroupUnarmoredCombat	Description='Astral Reach, Crusher, Elemental Touch, Poisonous Skin, Unarmored Expert'.
+FeatGroupUnarmoredCombat	Description='Crusher, Elemental Touch, Poisonous Skin, Unarmored Expert'.
 FeatGroupVerdantTouched	Description='Increase one of your mental attributes by 1, to a maximum of 20.
 You gain the ability to cast the barkskin, entangle, and goodberry spells once per long rest, and you can cast these spells with your spell slots.'.
 FeatGroupWeaponMaster	Description='You have practiced extensively with a variety of weapons, gaining the following benefits:
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFarStep.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFarStep.json
index 061bba524b..c37fe8d4f2 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFarStep.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFarStep.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9028,
+  "id": 9026,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightResume.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightResume.json
index dedd547243..c89ed379d3 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightResume.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightResume.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9030,
+  "id": 9028,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightSuspend.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightSuspend.json
index 97e2f3e8d4..e290fe81b0 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightSuspend.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionFlightSuspend.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9031,
+  "id": 9029,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionHailOfArrows.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionHailOfArrows.json
index 4e05f8962a..cf81010c10 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionHailOfArrows.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionHailOfArrows.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9033,
+  "id": 9031,
   "actionType": "Main",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyDawn.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyDawn.json
index 881fa86112..0bc1d2a72a 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyDawn.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyDawn.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9062,
+  "id": 9060,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyFaithfulHound.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyFaithfulHound.json
index 674c1d3880..a90fddd78d 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyFaithfulHound.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyFaithfulHound.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9056,
+  "id": 9054,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeapon.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeapon.json
index 6162cc385a..ebcdee117a 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeapon.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeapon.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9058,
+  "id": 9056,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeaponFree.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeaponFree.json
index e2f457f705..74c0d90635 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeaponFree.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPactWeaponFree.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9059,
+  "id": 9057,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPetalStorm.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPetalStorm.json
index a052a762d2..b2b6d1ee69 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPetalStorm.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionProxyPetalStorm.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9057,
+  "id": 9055,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionTempestFury.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionTempestFury.json
index 403d0f05f5..165f9bedf2 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionTempestFury.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionTempestFury.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9047,
+  "id": 9045,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionUseHeroicInspiration.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionUseHeroicInspiration.json
index 12627d200d..f7a4b2cf8b 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionUseHeroicInspiration.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ActionUseHeroicInspiration.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9048,
+  "id": 9046,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/AmazingDisplayToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/AmazingDisplayToggle.json
index 263a3d06e6..7dc4b22568 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/AmazingDisplayToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/AmazingDisplayToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9055,
+  "id": 9053,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BalefulScionToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BalefulScionToggle.json
index 2f150ce775..79985f6b8b 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BalefulScionToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BalefulScionToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9063,
+  "id": 9061,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BrutalStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BrutalStrikeToggle.json
index e3dcba113e..786c44ad9d 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BrutalStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/BrutalStrikeToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9052,
+  "id": 9050,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CastSignatureSpellsMain.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CastSignatureSpellsMain.json
deleted file mode 100644
index f2d86b4fbc..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CastSignatureSpellsMain.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9013,
-  "actionType": "Main",
-  "actionScope": "All",
-  "pairedActionId": "NoAction",
-  "usesPerTurn": -1,
-  "classNameOverride": "CastSpell",
-  "requiresAuthorization": false,
-  "stealthBreakerBehavior": "RollIfTargets",
-  "feedbackOnHoverType": "LineOfSight",
-  "iterativeTargeting": false,
-  "canTriggerBattle": false,
-  "parameter": "SelectInvocation",
-  "formType": "Large",
-  "overrideGuiActionType": false,
-  "overridenGuiActionType": "Main",
-  "focusCameraOnAction": true,
-  "addedConditionName": "",
-  "removedConditionName": "",
-  "preventsSerialization": true,
-  "baseActionForFailureTooltips": null,
-  "activatedPower": null,
-  "displayPowerTooltip": false,
-  "dieType": "D10",
-  "abilityScore": "Dexterity",
-  "addLevel": false,
-  "maxCells": 1,
-  "targetType": "Sphere",
-  "targetParameter": 1,
-  "matchingCondition": "",
-  "particlePrefab": {
-    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": "",
-    "m_SubObjectType": ""
-  },
-  "soundEvent": {
-    "$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
-    "WwiseObjectReference": null,
-    "idInternal": 0,
-    "valueGuidInternal": {
-      "$type": "System.Byte[], mscorlib",
-      "$value": ""
-    }
-  },
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Action/&CastSignatureSpellsTitle",
-    "description": "Action/&CastSignatureSpellsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "89619822-0cda-51d5-b942-f554e01bfc9c",
-      "m_SubObjectName": null,
-      "m_SubObjectType": null
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 10,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "6359cd25-fe50-58d4-96e3-ac254323cfd8",
-  "contentPack": 9999,
-  "name": "CastSignatureSpellsMain"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CastSpellMasteryMain.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CastSpellMasteryMain.json
deleted file mode 100644
index 0d53b84183..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CastSpellMasteryMain.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9014,
-  "actionType": "Main",
-  "actionScope": "All",
-  "pairedActionId": "NoAction",
-  "usesPerTurn": -1,
-  "classNameOverride": "CastSpell",
-  "requiresAuthorization": false,
-  "stealthBreakerBehavior": "RollIfTargets",
-  "feedbackOnHoverType": "LineOfSight",
-  "iterativeTargeting": false,
-  "canTriggerBattle": false,
-  "parameter": "SelectInvocation",
-  "formType": "Large",
-  "overrideGuiActionType": false,
-  "overridenGuiActionType": "Main",
-  "focusCameraOnAction": true,
-  "addedConditionName": "",
-  "removedConditionName": "",
-  "preventsSerialization": true,
-  "baseActionForFailureTooltips": null,
-  "activatedPower": null,
-  "displayPowerTooltip": false,
-  "dieType": "D10",
-  "abilityScore": "Dexterity",
-  "addLevel": false,
-  "maxCells": 1,
-  "targetType": "Sphere",
-  "targetParameter": 1,
-  "matchingCondition": "",
-  "particlePrefab": {
-    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-    "m_AssetGUID": "",
-    "m_SubObjectName": "",
-    "m_SubObjectType": ""
-  },
-  "soundEvent": {
-    "$type": "AK.Wwise.Event, AK.Wwise.Unity.API.WwiseTypes",
-    "WwiseObjectReference": null,
-    "idInternal": 0,
-    "valueGuidInternal": {
-      "$type": "System.Byte[], mscorlib",
-      "$value": ""
-    }
-  },
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Action/&CastSpellMasteryTitle",
-    "description": "Action/&CastSpellMasteryDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "89619822-0cda-51d5-b942-f554e01bfc9c",
-      "m_SubObjectName": null,
-      "m_SubObjectType": null
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 10,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "b84732e6-bfb3-5555-8301-48542befdfad",
-  "contentPack": 9999,
-  "name": "CastSpellMasteryMain"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatRageStart.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatRageStart.json
index b2f91845c3..a3617207d3 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatRageStart.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatRageStart.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9015,
+  "id": 9013,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatWildShape.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatWildShape.json
index 80d6a99040..1928fc0597 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatWildShape.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CombatWildShape.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9016,
+  "id": 9014,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CompellingStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CompellingStrikeToggle.json
index e05c4caff9..2910425706 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CompellingStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CompellingStrikeToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9017,
+  "id": 9015,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CoordinatedAssaultToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CoordinatedAssaultToggle.json
index 047d446494..3640af96c9 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CoordinatedAssaultToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CoordinatedAssaultToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9018,
+  "id": 9016,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOff.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOff.json
index ddce1cc5be..ef094cdb86 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOff.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOff.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9019,
+  "id": 9017,
   "actionType": "Bonus",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOn.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOn.json
index 1db2b564b1..e5b2f4c216 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOn.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CrystalDefenseOn.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9020,
+  "id": 9018,
   "actionType": "Main",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CunningStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CunningStrikeToggle.json
index ddbf2998ac..b304b4c4a1 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CunningStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/CunningStrikeToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9021,
+  "id": 9019,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DestructiveWrathToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DestructiveWrathToggle.json
index 87fe102183..8df972f2a5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DestructiveWrathToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DestructiveWrathToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9060,
+  "id": 9058,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingFree.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingFree.json
index 0bfc38131a..a430c2fff2 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingFree.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingFree.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9022,
+  "id": 9020,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingReaction.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingReaction.json
index c1378865b9..231c642772 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingReaction.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DoNothingReaction.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9023,
+  "id": 9021,
   "actionType": "Reaction",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DragonHideToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DragonHideToggle.json
index 4ba920acb5..a235d2dacf 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DragonHideToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DragonHideToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9054,
+  "id": 9052,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DyingLightToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DyingLightToggle.json
index 4aa1cb213e..4e19681c45 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DyingLightToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/DyingLightToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9024,
+  "id": 9022,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityBonus.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityBonus.json
index 672dfa361f..13649d01f7 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityBonus.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityBonus.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9025,
+  "id": 9023,
   "actionType": "Bonus",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityMain.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityMain.json
index 7845097a62..b47b95de38 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityMain.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityMain.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9026,
+  "id": 9024,
   "actionType": "Main",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityNoCost.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityNoCost.json
index 62153e09b4..3a036bf525 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityNoCost.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/EldritchVersatilityNoCost.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9027,
+  "id": 9025,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/FeatCrusherToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/FeatCrusherToggle.json
index 18c9e5cd33..d9d0dedc8a 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/FeatCrusherToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/FeatCrusherToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9029,
+  "id": 9027,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ForcePoweredStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ForcePoweredStrikeToggle.json
index 10e4c09d32..9810c7700a 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ForcePoweredStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ForcePoweredStrikeToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9051,
+  "id": 9049,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GloomBladeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GloomBladeToggle.json
index 44de6cffbd..344b1396a4 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GloomBladeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/GloomBladeToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9032,
+  "id": 9030,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/HailOfBladesToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/HailOfBladesToggle.json
index bb4625f482..4a1b70e959 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/HailOfBladesToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/HailOfBladesToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9034,
+  "id": 9032,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ImpishWrathToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ImpishWrathToggle.json
index 6bc96e91a3..72b7c42b02 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ImpishWrathToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ImpishWrathToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9035,
+  "id": 9033,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/InventorInfusion.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/InventorInfusion.json
index 4215cbf386..2a20c279ad 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/InventorInfusion.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/InventorInfusion.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9036,
+  "id": 9034,
   "actionType": "Main",
   "actionScope": "Exploration",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MasterfulWhirlToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MasterfulWhirlToggle.json
index a0d2b4f40b..8c10362aa5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MasterfulWhirlToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MasterfulWhirlToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9037,
+  "id": 9035,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MindSculptToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MindSculptToggle.json
index 94f1921f92..64394fe703 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MindSculptToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/MindSculptToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9038,
+  "id": 9036,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/OrcishFuryToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/OrcishFuryToggle.json
index 115326cb59..f6b4dace6f 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/OrcishFuryToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/OrcishFuryToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9053,
+  "id": 9051,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PaladinSmiteToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PaladinSmiteToggle.json
index b3197c5e36..c270725f1c 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PaladinSmiteToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PaladinSmiteToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9039,
+  "id": 9037,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PressTheAdvantageToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PressTheAdvantageToggle.json
index 73c24ac46d..375b50e517 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PressTheAdvantageToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PressTheAdvantageToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9040,
+  "id": 9038,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PushedCustom.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PushedCustom.json
index cbbf3140c6..a1a1113231 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PushedCustom.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/PushedCustom.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9041,
+  "id": 9039,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/SupremeWillToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/SupremeWillToggle.json
index d4d40fefb2..ee9d2c15ee 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/SupremeWillToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/SupremeWillToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9043,
+  "id": 9041,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitBonus.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitBonus.json
index 5ac20fe99a..631b9730b5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitBonus.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitBonus.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9044,
+  "id": 9042,
   "actionType": "Bonus",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitMain.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitMain.json
index 31941dbcdd..0ca4c6d6f1 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitMain.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitMain.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9045,
+  "id": 9043,
   "actionType": "Main",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitNoCost.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitNoCost.json
index 1b1ba91c27..ae5f45553f 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitNoCost.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TacticianGambitNoCost.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9046,
+  "id": 9044,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ThunderousStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ThunderousStrikeToggle.json
index 78be45e33f..acbb7e3814 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ThunderousStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/ThunderousStrikeToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9061,
+  "id": 9059,
   "actionType": "NoCost",
   "actionScope": "All",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TraditionOpenHandQuiveringPalmToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TraditionOpenHandQuiveringPalmToggle.json
index 7d9f18aa7b..13e6a143f0 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TraditionOpenHandQuiveringPalmToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/TraditionOpenHandQuiveringPalmToggle.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9042,
+  "id": 9040,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildlingFeralAgility.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildlingFeralAgility.json
index 6bc561972a..ff5cb7d8b9 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildlingFeralAgility.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/WildlingFeralAgility.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9049,
+  "id": 9047,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/Withdraw.json b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/Withdraw.json
index f8ebc5a631..fe5de377fa 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/Withdraw.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ActionDefinition/Withdraw.json
@@ -1,6 +1,6 @@
 {
   "$type": "ActionDefinition, Assembly-CSharp",
-  "id": 9050,
+  "id": 9048,
   "actionType": "NoCost",
   "actionScope": "Battle",
   "pairedActionId": "NoAction",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
index 1e92141d17..bbd8e6f0b4 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
+++ b/Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
@@ -26,8 +26,6 @@ CastInvocationBonus	ActionDefinition	ActionDefinition	f2d189c0-5e0a-5a69-9ace-b4
 CastInvocationNoCost	ActionDefinition	ActionDefinition	0a4870d5-055f-5c2a-a6bd-e9529bb4a963
 CastPlaneMagicBonus	ActionDefinition	ActionDefinition	c02d5cad-8d69-5b88-8b98-790acbbca5b9
 CastPlaneMagicMain	ActionDefinition	ActionDefinition	77bc881a-c83d-5817-a1b8-b30a01442dfd
-CastSignatureSpellsMain	ActionDefinition	ActionDefinition	6359cd25-fe50-58d4-96e3-ac254323cfd8
-CastSpellMasteryMain	ActionDefinition	ActionDefinition	b84732e6-bfb3-5555-8301-48542befdfad
 CombatRageStart	ActionDefinition	ActionDefinition	9206ca7c-6ae0-59f1-8f28-ffd769a921d9
 CombatWildShape	ActionDefinition	ActionDefinition	24ead3d3-6347-5c8b-99b0-c28850ea83ea
 CompellingStrikeToggle	ActionDefinition	ActionDefinition	0fc75ec8-58df-53ea-98a8-79e9287b8fd5
@@ -986,6 +984,7 @@ ConditionRoguishBladeCallerBladeMark	ConditionDefinition	ConditionDefinition	296
 ConditionRoguishBladeCallerBladeSurge	ConditionDefinition	ConditionDefinition	64014c4e-6508-5baa-b566-1ee4f339a5b1
 ConditionRoguishDarkweaverDarkAssault	ConditionDefinition	ConditionDefinition	68894cc8-47e7-5c99-a339-071dbd471f1f
 ConditionRoguishDuelistDaringDuel	ConditionDefinition	ConditionDefinition	4fcd9fa2-e822-5f30-928e-62e8c4a62702
+ConditionRoguishDuelistReflexiveParty	ConditionDefinition	ConditionDefinition	9433916c-fe93-527f-8d52-046262c601de
 ConditionRoguishOpportunistDebilitated	ConditionDefinition	ConditionDefinition	25efa820-65fc-5a19-b218-2a0e9e8f666f
 ConditionRoguishOpportunistExposed	ConditionDefinition	ConditionDefinition	74edff9f-927e-54c7-be18-7686ae251385
 ConditionRoguishOpportunistImprovedDebilitated	ConditionDefinition	ConditionDefinition	51acc7f0-2dca-5479-a159-a39ee11c18e6
@@ -1006,11 +1005,13 @@ ConditionSenseNormalVision24	ConditionDefinition	ConditionDefinition	1845364e-e9
 ConditionSenseNormalVision48	ConditionDefinition	ConditionDefinition	ac0b7208-ee2b-5ada-8661-ff1ddeecdce9
 ConditionShadarKaiTeleport	ConditionDefinition	ConditionDefinition	0c2aaa03-c876-5caf-8277-54b7332b071d
 ConditionShadowBlade	ConditionDefinition	ConditionDefinition	7f7a5735-9143-5616-a6d5-659c5da3026d
+ConditionSignatureSpells	ConditionDefinition	ConditionDefinition	7d490159-e05b-5c67-ab55-1763b1188d63
 ConditionSkinOfRetribution	ConditionDefinition	ConditionDefinition	756ee728-5506-5f03-b552-b94004839697
 ConditionSorcerousSorrAkkathBloodOfSorrAkkath	ConditionDefinition	ConditionDefinition	dc2b991d-480d-56a3-8811-9dddcf7d32e5
 ConditionSoulBladeHexAttacker	ConditionDefinition	ConditionDefinition	16816bb1-0f32-5c0f-9d63-a7b35f16b50f
 ConditionSoulBladeHexDefender	ConditionDefinition	ConditionDefinition	bb7f4c4e-c04d-52de-9f24-a18c7bd6a3f4
 ConditionSoulBladeSummonPactWeapon	ConditionDefinition	ConditionDefinition	119483dd-d06f-5045-87f4-1b5366ddd871
+ConditionSpellMastery	ConditionDefinition	ConditionDefinition	78a099a3-4b49-5f9c-bb8d-cbcf91232bf7
 ConditionSpellShieldArcaneDeflection	ConditionDefinition	ConditionDefinition	7580a117-7912-5b1d-bd1c-552ff726506b
 ConditionSpellShieldBladeWeaving	ConditionDefinition	ConditionDefinition	655837d2-1d38-5fa1-8cdd-977811349cf0
 ConditionSpellShieldProtectiveBarrier	ConditionDefinition	ConditionDefinition	15bb39a2-9970-5409-bda6-824abc9148a9
@@ -1119,6 +1120,7 @@ FeatArcanePrecision	FeatDefinition	FeatDefinition	4b00a7f0-8ecc-5ac1-84a5-6a96b7
 FeatArcanist	FeatDefinition	FeatDefinition	b3de15dc-e66c-5e9b-9de6-3be9dca25482
 FeatArchery	FeatDefinitionWithPrerequisites	FeatDefinition	f1386edb-5dc2-59f3-b379-a506a35108bc
 FeatAstralArms	FeatDefinition	FeatDefinition	d52d661c-6596-5206-95de-0687bc6a2d42
+FeatAstralReach	FeatDefinitionWithPrerequisites	FeatDefinition	f54d8d34-36e9-5245-a407-b4d96d7a58f1
 FeatAthleteDex	FeatDefinition	FeatDefinition	7d1a1ff0-cf50-53af-8f88-bb6be05a9975
 FeatAthleteStr	FeatDefinition	FeatDefinition	5bce2e12-4225-51af-8c26-9a487dc50851
 FeatAwakenTheBeastWithinCharisma	FeatDefinitionWithPrerequisites	FeatDefinition	899e09aa-87ea-5dbc-9cb1-1570459d5a80
@@ -1726,7 +1728,6 @@ AttributeModifierCollegeOfAudacityDefensiveWhirl	FeatureDefinitionAttributeModif
 AttributeModifierCollegeOfEleganceElegantFightingArmorClass	FeatureDefinitionAttributeModifier	FeatureDefinition	4a0d527c-57c7-543a-bb6e-a8c0437d5fca
 AttributeModifierCollegeOfEleganceEvasiveFootwork	FeatureDefinitionAttributeModifier	FeatureDefinition	901b7c53-384b-58d7-9e18-3167da9809bc
 AttributeModifierCollegeOfGutsArcaneDeflection	FeatureDefinitionAttributeModifier	FeatureDefinition	3f818f1c-df44-52de-b54f-efe328fc947b
-AttributeModifierCripplingACDebuff	FeatureDefinitionAttributeModifier	FeatureDefinition	45dd6abf-0d7c-5563-b3ec-a9d3252159ff
 AttributeModifierDarkelfCharismaAbilityScoreIncrease	FeatureDefinitionAttributeModifier	FeatureDefinition	a704f26a-c7c9-5a71-b2b3-ebbf48d7da21
 AttributeModifierDeadMasterUndeadChains	FeatureDefinitionAttributeModifier	FeatureDefinition	c366c121-0945-5b6b-873a-de2cca24ce07
 AttributeModifierDivineHeartDivineFortitude	FeatureDefinitionAttributeModifier	FeatureDefinition	2f756e50-4c39-50d8-b104-7a5dfbd2233e
@@ -2114,6 +2115,7 @@ EquipmentAffinityOligathPowerfulBuild	FeatureDefinitionEquipmentAffinity	Feature
 EquipmentAffinityWendigoPowerfulBuild	FeatureDefinitionEquipmentAffinity	FeatureDefinition	d2f8cd80-99eb-552d-b605-99c3aae673f8
 FeatureAdaptiveStrategy	FeatureDefinition	FeatureDefinition	233c2b1c-b40f-58b9-99dd-7ef75bd1159b
 FeatureAlwaysReady	FeatureDefinition	FeatureDefinition	4f421b5c-5783-5b84-861c-08700dea1535
+FeatureAstralReach	FeatureDefinition	FeatureDefinition	038ffe12-debd-5087-bb29-627893d8a094
 FeatureBardSuperiorInspiration	FeatureDefinition	FeatureDefinition	e9869341-0ef1-545b-847f-92f5231d49ae
 FeatureCaveWyrmkinChargingStrike	FeatureDefinition	FeatureDefinition	ed7d158f-c1b3-5a2a-9523-277e5a52089c
 FeatureCaveWyrmkinPowerfulClaws	FeatureDefinition	FeatureDefinition	848a881d-6f83-541e-b9c2-e071dfb4b0f1
@@ -2486,6 +2488,7 @@ FeatureWayOfZenArcheryKiEmpoweredArrows	FeatureDefinition	FeatureDefinition	3799
 FeatureWayOfZenArcheryUnerringPrecision	FeatureDefinition	FeatureDefinition	cc60f69d-f5bd-590f-bf6c-e74f2c1af67f
 FeatureWendigoNaturalLunger	FeatureDefinition	FeatureDefinition	bd3955cc-4299-54e5-8d3e-0b69fa9dd1dd
 FeatureWildlingClaws	FeatureDefinition	FeatureDefinition	fbb8a01e-8eca-57d1-9963-0ccd16a789cc
+FeatureWizardSpellMastery	FeatureDefinition	FeatureDefinition	17f73bcd-e536-5b14-9222-7ba2edbf88ab
 FeatureZenArcher	FeatureDefinitionAttackModifier	FeatureDefinition	e592b0d3-9a0c-56b4-b0ad-9aaca5718ccc
 FightingStyleChoiceBarbarian	FeatureDefinitionFightingStyleChoice	FeatureDefinition	d44fe52d-97d1-5023-b849-6c5be8660f18
 FightingStyleChoiceCollegeOfAudacity	FeatureDefinitionFightingStyleChoice	FeatureDefinition	ea186247-64a7-5ace-834e-d551f68a5b54
@@ -2521,7 +2524,6 @@ GrantInvocationsRetinueTouchedWisdom	FeatureDefinitionGrantInvocations	FeatureDe
 GrantInvocationsShadowTouchedCharisma	FeatureDefinitionGrantInvocations	FeatureDefinition	345b1967-91c5-56f6-8b93-004159b27b41
 GrantInvocationsShadowTouchedIntelligence	FeatureDefinitionGrantInvocations	FeatureDefinition	e9c99c0f-40bb-56bf-825d-b604fdc26f25
 GrantInvocationsShadowTouchedWisdom	FeatureDefinitionGrantInvocations	FeatureDefinition	93586491-bdd5-5477-ac80-72b31520c04e
-GrantInvocationsSpellMastery	FeatureDefinitionGrantInvocations	FeatureDefinition	7c3c4938-2d3a-5082-87c8-93a4f776340d
 GrantInvocationsVerdantTouchedCharisma	FeatureDefinitionGrantInvocations	FeatureDefinition	7b030f7a-f3d1-5a41-aa31-9e80b27ac83f
 GrantInvocationsVerdantTouchedIntelligence	FeatureDefinitionGrantInvocations	FeatureDefinition	907a06d2-f1f2-5d7f-9ec2-d7c3cbdf20fd
 GrantInvocationsVerdantTouchedWisdom	FeatureDefinitionGrantInvocations	FeatureDefinition	1fb6f44c-1238-5371-8777-e6cd4db6038d
@@ -2546,7 +2548,6 @@ InvocationPoolPathOfTheElementsElementalFuryChoice	FeatureDefinitionCustomInvoca
 InvocationPoolRangerPreferredEnemy	FeatureDefinitionCustomInvocationPool	FeatureDefinition	f3acc0be-dbe4-594c-9d84-d2695748860c
 InvocationPoolRangerTerrainType	FeatureDefinitionCustomInvocationPool	FeatureDefinition	10cbf2e0-3564-566d-b3b5-7fa2bedbbd1d
 InvocationPoolSorcererDraconicChoice	FeatureDefinitionCustomInvocationPool	FeatureDefinition	db3788bf-6ec1-5edb-9974-1fb987bfa84f
-InvocationPoolWizardSignatureSpells	FeatureDefinitionCustomInvocationPool	FeatureDefinition	65077b25-9277-5c8a-b0c2-50d35aaa7f09
 LightAffinityAncientForestPhotosynthesis	FeatureDefinitionLightAffinity	FeatureDefinition	6a1fe8de-c83b-5fd1-8cf7-702c54af21eb
 LightAffinityDarkelfLightSensitivity	FeatureDefinitionLightAffinity	FeatureDefinition	3c201ed4-9197-5ddd-9045-ecec590dd752
 LightAffinityDarkKoboldLightSensitivity	FeatureDefinitionLightAffinity	FeatureDefinition	ef7792be-cce3-5545-a497-66e316dd5254
@@ -3592,6 +3593,7 @@ PowerWizardGraviturgistDensityIncrease	FeatureDefinitionPower	FeatureDefinition
 PowerWizardGraviturgistEventHorizon	FeatureDefinitionPower	FeatureDefinition	dd8800a8-c154-5719-8925-b4fdccd9bef2
 PowerWizardGraviturgistGravityWell	FeatureDefinitionPower	FeatureDefinition	faf3975c-aac0-5eab-b363-62a253150e4d
 PowerWizardGraviturgistViolentAttraction	FeatureDefinitionPower	FeatureDefinition	643279dd-430f-5388-95a0-5a31d68ca973
+PowerWizardSignatureSpells	FeatureDefinitionPower	FeatureDefinition	a044a9c8-7d24-5dea-83b8-7c918686084e
 ProficiencyAthlete	FeatureDefinitionProficiency	FeatureDefinition	241be27a-e339-5e2b-952c-ec4dd090b461
 ProficiencyAthleteExpertise	FeatureDefinitionProficiency	FeatureDefinition	ca7b11ce-5a52-51c0-93a2-dc05d01d48f4
 ProficiencyBackgroundDevotedSkills	FeatureDefinitionProficiency	FeatureDefinition	6468a3eb-08e7-5d65-b2ed-a57c245c532e
@@ -3636,6 +3638,7 @@ ProficiencyFairyLanguages	FeatureDefinitionProficiency	FeatureDefinition	2825f30
 ProficiencyFeatAcrobat	FeatureDefinitionProficiency	FeatureDefinition	fe1d07bd-a7a1-5c92-804e-e97a96c0a211
 ProficiencyFeatAcrobatExpertise	FeatureDefinitionProficiency	FeatureDefinition	8d12b938-988d-5632-b703-96f9406ad21d
 ProficiencyFeatArchery	FeatureDefinitionProficiency	FeatureDefinition	2f481252-0c16-5606-8c23-28be3fc0eefe
+ProficiencyFeatAstralReach	FeatureDefinitionProficiency	FeatureDefinition	4143d5b8-381a-5953-9ea6-4f331db0142c
 ProficiencyFeatBlindFighting	FeatureDefinitionProficiency	FeatureDefinition	1020f7eb-192a-53e4-bbb6-34dae326338b
 ProficiencyFeatCrippling	FeatureDefinitionProficiency	FeatureDefinition	09f32614-c172-5b6b-8796-e5a14721bc11
 ProficiencyFeatDefense	FeatureDefinitionProficiency	FeatureDefinition	04ce489e-4e42-53cf-b8ef-476a21a43f15
@@ -4547,7 +4550,6 @@ AttributeModifierCollegeOfAudacityDefensiveWhirl	FeatureDefinitionAttributeModif
 AttributeModifierCollegeOfEleganceElegantFightingArmorClass	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	4a0d527c-57c7-543a-bb6e-a8c0437d5fca
 AttributeModifierCollegeOfEleganceEvasiveFootwork	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	901b7c53-384b-58d7-9e18-3167da9809bc
 AttributeModifierCollegeOfGutsArcaneDeflection	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	3f818f1c-df44-52de-b54f-efe328fc947b
-AttributeModifierCripplingACDebuff	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	45dd6abf-0d7c-5563-b3ec-a9d3252159ff
 AttributeModifierDarkelfCharismaAbilityScoreIncrease	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	a704f26a-c7c9-5a71-b2b3-ebbf48d7da21
 AttributeModifierDeadMasterUndeadChains	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	c366c121-0945-5b6b-873a-de2cca24ce07
 AttributeModifierDivineHeartDivineFortitude	FeatureDefinitionAttributeModifier	FeatureDefinitionAttributeModifier	2f756e50-4c39-50d8-b104-7a5dfbd2233e
@@ -6145,6 +6147,7 @@ PowerWizardGraviturgistDensityIncrease	FeatureDefinitionPower	FeatureDefinitionP
 PowerWizardGraviturgistEventHorizon	FeatureDefinitionPower	FeatureDefinitionPower	dd8800a8-c154-5719-8925-b4fdccd9bef2
 PowerWizardGraviturgistGravityWell	FeatureDefinitionPower	FeatureDefinitionPower	faf3975c-aac0-5eab-b363-62a253150e4d
 PowerWizardGraviturgistViolentAttraction	FeatureDefinitionPower	FeatureDefinitionPower	643279dd-430f-5388-95a0-5a31d68ca973
+PowerWizardSignatureSpells	FeatureDefinitionPower	FeatureDefinitionPower	a044a9c8-7d24-5dea-83b8-7c918686084e
 BonusProficiencyDomainSmith	FeatureDefinitionProficiency	FeatureDefinitionProficiency	0caba6ab-34fb-536b-8676-191a32c68455
 BonusProficiencyDomainSmithArtisanToolType	FeatureDefinitionProficiency	FeatureDefinitionProficiency	bcbe633c-cc94-5b67-98ec-357cfa9ef64a
 FeatureMonkWeaponSpecializationBattleaxeType	FeatureDefinitionProficiency	FeatureDefinitionProficiency	836d8882-9011-54b9-8804-ae9d4042e5e5
@@ -6201,6 +6204,7 @@ ProficiencyFairyLanguages	FeatureDefinitionProficiency	FeatureDefinitionProficie
 ProficiencyFeatAcrobat	FeatureDefinitionProficiency	FeatureDefinitionProficiency	fe1d07bd-a7a1-5c92-804e-e97a96c0a211
 ProficiencyFeatAcrobatExpertise	FeatureDefinitionProficiency	FeatureDefinitionProficiency	8d12b938-988d-5632-b703-96f9406ad21d
 ProficiencyFeatArchery	FeatureDefinitionProficiency	FeatureDefinitionProficiency	2f481252-0c16-5606-8c23-28be3fc0eefe
+ProficiencyFeatAstralReach	FeatureDefinitionProficiency	FeatureDefinitionProficiency	4143d5b8-381a-5953-9ea6-4f331db0142c
 ProficiencyFeatBlindFighting	FeatureDefinitionProficiency	FeatureDefinitionProficiency	1020f7eb-192a-53e4-bbb6-34dae326338b
 ProficiencyFeatCrippling	FeatureDefinitionProficiency	FeatureDefinitionProficiency	09f32614-c172-5b6b-8796-e5a14721bc11
 ProficiencyFeatDefense	FeatureDefinitionProficiency	FeatureDefinitionProficiency	04ce489e-4e42-53cf-b8ef-476a21a43f15
@@ -6353,6 +6357,7 @@ TerrainTypeAffinityFeatDungeonDelverForest	FeatureDefinitionTerrainTypeAffinity
 TerrainTypeAffinityFeatDungeonDelverGrassland	FeatureDefinitionTerrainTypeAffinity	FeatureDefinitionTerrainTypeAffinity	eb55b30a-ba2d-5fb8-a717-2cd76935c00b
 TerrainTypeAffinityFeatDungeonDelverMountain	FeatureDefinitionTerrainTypeAffinity	FeatureDefinitionTerrainTypeAffinity	db490e8f-33f7-5342-9184-662355cc2b61
 TerrainTypeAffinityFeatDungeonDelverSwamp	FeatureDefinitionTerrainTypeAffinity	FeatureDefinitionTerrainTypeAffinity	e3fa9fc8-c2b3-5db6-8f0c-5e0ec0177da5
+AstralReach	FightingStyleDefinition	FightingStyleDefinition	2d1a30dc-3ac3-53ad-9f6b-f9ab0223da6f
 BlindFighting	FightingStyleDefinition	FightingStyleDefinition	172ec08f-f7c8-54f0-81bb-917fd5375b6a
 Crippling	FightingStyleDefinition	FightingStyleDefinition	1883dae0-9ef0-550b-a3b9-d169594d4d46
 Executioner	FightingStyleDefinition	FightingStyleDefinition	d64dd596-85ae-5bea-9906-b4f8465249f4
@@ -6892,98 +6897,6 @@ CustomInvocationShadowTouchedInflictWoundsWisdom	InvocationDefinitionCustom	Invo
 CustomInvocationShadowTouchedInvisibilityCharisma	InvocationDefinitionCustom	InvocationDefinition	44227cb1-87df-53a6-b8ac-1d2749020c76
 CustomInvocationShadowTouchedInvisibilityIntelligence	InvocationDefinitionCustom	InvocationDefinition	c561d0ca-8afc-5101-9227-2be7e8acad38
 CustomInvocationShadowTouchedInvisibilityWisdom	InvocationDefinitionCustom	InvocationDefinition	2d76fd53-2ff3-58c7-812d-4e1f2f215236
-CustomInvocationSignatureSpellsBeaconOfHope	InvocationDefinitionCustom	InvocationDefinition	835f86c2-71f6-5041-85dd-b5967223aec6
-CustomInvocationSignatureSpellsBestowCurse	InvocationDefinitionCustom	InvocationDefinition	32f12282-912e-592b-a37f-f5a926bd19a3
-CustomInvocationSignatureSpellsCallLightning	InvocationDefinitionCustom	InvocationDefinition	89efb895-fd9e-582b-87f5-77c11a979096
-CustomInvocationSignatureSpellsConjureAnimals	InvocationDefinitionCustom	InvocationDefinition	68a74fcb-474c-53e6-90d9-e3ed14a734df
-CustomInvocationSignatureSpellsCreateFood	InvocationDefinitionCustom	InvocationDefinition	51801242-c2ed-58f9-80f2-9f2997116cf4
-CustomInvocationSignatureSpellsDaylight	InvocationDefinitionCustom	InvocationDefinition	5c3a5355-5ecc-57ca-b4da-a3f4c63bd3aa
-CustomInvocationSignatureSpellsDispelMagic	InvocationDefinitionCustom	InvocationDefinition	28de83b5-f87f-5e82-8e20-3b86027a8915
-CustomInvocationSignatureSpellsFear	InvocationDefinitionCustom	InvocationDefinition	b73aa88e-f76e-59f1-b516-8533d24367fe
-CustomInvocationSignatureSpellsFireball	InvocationDefinitionCustom	InvocationDefinition	c4196110-503f-591d-b4f5-acdc53267405
-CustomInvocationSignatureSpellsFly	InvocationDefinitionCustom	InvocationDefinition	02b06135-6eca-5424-b9a7-7dc8cb560c13
-CustomInvocationSignatureSpellsHaste	InvocationDefinitionCustom	InvocationDefinition	7adc19dc-b3bc-5abe-b777-07adfdf7f999
-CustomInvocationSignatureSpellsHypnoticPattern	InvocationDefinitionCustom	InvocationDefinition	6187f701-85c8-514f-a302-13636a6836ab
-CustomInvocationSignatureSpellsLightningBolt	InvocationDefinitionCustom	InvocationDefinition	91602108-3367-5774-b12f-5e188dfa7c2f
-CustomInvocationSignatureSpellsMassHealingWord	InvocationDefinitionCustom	InvocationDefinition	6f14841d-d813-5696-9cad-dd087ed35219
-CustomInvocationSignatureSpellsProtectionFromEnergy	InvocationDefinitionCustom	InvocationDefinition	c8fb32a4-544e-5115-8350-4c6feafc5890
-CustomInvocationSignatureSpellsRemoveCurse	InvocationDefinitionCustom	InvocationDefinition	786916ea-0c75-5ad1-addf-2f0396433524
-CustomInvocationSignatureSpellsRevivify	InvocationDefinitionCustom	InvocationDefinition	a0648ab3-a176-5bf9-a5c6-9868d69f65a1
-CustomInvocationSignatureSpellsSleetStorm	InvocationDefinitionCustom	InvocationDefinition	96feb03c-6f10-5161-8454-08f5e8538ece
-CustomInvocationSignatureSpellsSlow	InvocationDefinitionCustom	InvocationDefinition	8d0a417c-fd12-52f0-abf3-15220e39535e
-CustomInvocationSignatureSpellsSpiritGuardians	InvocationDefinitionCustom	InvocationDefinition	49b7c459-aebc-5298-841d-5746a5b666a9
-CustomInvocationSignatureSpellsStinkingCloud	InvocationDefinitionCustom	InvocationDefinition	963a48f2-593b-50da-a6b8-68b70be2e578
-CustomInvocationSignatureSpellsTongues	InvocationDefinitionCustom	InvocationDefinition	59c63020-c6d3-523e-a7c3-4d976bdbb641
-CustomInvocationSignatureSpellsVampiricTouch	InvocationDefinitionCustom	InvocationDefinition	9a8982e3-7587-5ba2-ac75-52c96a227a84
-CustomInvocationSignatureSpellsWindWall	InvocationDefinitionCustom	InvocationDefinition	47be0519-452a-5d9c-a09c-6827ef2a9b08
-CustomInvocationSpellMasteryAcidArrow	InvocationDefinitionCustom	InvocationDefinition	3c1180c3-eaad-54e3-a88e-3479dd2ffa8c
-CustomInvocationSpellMasteryAid	InvocationDefinitionCustom	InvocationDefinition	5eff94c5-5662-5d1d-a788-809fb808ad91
-CustomInvocationSpellMasteryAnimalFriendship	InvocationDefinitionCustom	InvocationDefinition	1a1d0448-d912-52f5-b0e3-8b49eb0b9505
-CustomInvocationSpellMasteryBane	InvocationDefinitionCustom	InvocationDefinition	befc3579-5d81-5dfb-8a87-654b62b259dd
-CustomInvocationSpellMasteryBarkskin	InvocationDefinitionCustom	InvocationDefinition	bbda376f-0306-500e-8347-7fe1b7b54912
-CustomInvocationSpellMasteryBless	InvocationDefinitionCustom	InvocationDefinition	26b229d0-bc50-56fd-95ee-e272f93857ef
-CustomInvocationSpellMasteryBlindness	InvocationDefinitionCustom	InvocationDefinition	55dbca2d-f796-56a5-bdfd-7bd577d6737f
-CustomInvocationSpellMasteryBlur	InvocationDefinitionCustom	InvocationDefinition	3bd96f65-fa05-5998-920b-be1c3aa2faf3
-CustomInvocationSpellMasteryBrandingSmite	InvocationDefinitionCustom	InvocationDefinition	58e57887-e193-5fe5-96e8-15b623b0e7d6
-CustomInvocationSpellMasteryBurningHands	InvocationDefinitionCustom	InvocationDefinition	1258d132-0169-5b32-80b5-377f8b751e5e
-CustomInvocationSpellMasteryCalmEmotions	InvocationDefinitionCustom	InvocationDefinition	45581624-e120-59c6-a9a0-d5203257deb0
-CustomInvocationSpellMasteryCharmPerson	InvocationDefinitionCustom	InvocationDefinition	406e7fed-f41f-5f06-b89b-806384078a82
-CustomInvocationSpellMasteryColorSpray	InvocationDefinitionCustom	InvocationDefinition	4354a7d9-9553-54de-b738-35689cc2d817
-CustomInvocationSpellMasteryComprehendLanguages	InvocationDefinitionCustom	InvocationDefinition	07dd62d1-b524-5874-86cb-a6d18a0a4489
-CustomInvocationSpellMasteryCureWounds	InvocationDefinitionCustom	InvocationDefinition	a42e0df1-1484-585e-838b-063b6107965e
-CustomInvocationSpellMasteryDarkness	InvocationDefinitionCustom	InvocationDefinition	ebb411ce-f24b-5616-905f-21fcf5dd5f9a
-CustomInvocationSpellMasteryDarkvision	InvocationDefinitionCustom	InvocationDefinition	9eadccd6-9a6f-510f-b879-e379ca7990f9
-CustomInvocationSpellMasteryDetectEvilAndGood	InvocationDefinitionCustom	InvocationDefinition	d227ceaf-eb9b-5cda-9f7a-be4c59794255
-CustomInvocationSpellMasteryDetectMagic	InvocationDefinitionCustom	InvocationDefinition	c168534b-53a8-579e-84e3-120e55e45e44
-CustomInvocationSpellMasteryDetectPoisonAndDisease	InvocationDefinitionCustom	InvocationDefinition	58e8b42f-cc54-582e-a076-d3617563295a
-CustomInvocationSpellMasteryDivineFavor	InvocationDefinitionCustom	InvocationDefinition	c130ce1f-95ba-5ec9-b3ef-1396db97d8d0
-CustomInvocationSpellMasteryEnhanceAbility	InvocationDefinitionCustom	InvocationDefinition	566dd4f8-9d33-5708-bb4d-6447533daf1a
-CustomInvocationSpellMasteryEntangle	InvocationDefinitionCustom	InvocationDefinition	17cc8ddd-669b-5fb3-8f92-ad5aa0c85c43
-CustomInvocationSpellMasteryExpeditiousRetreat	InvocationDefinitionCustom	InvocationDefinition	44435ee8-d093-5beb-9c3d-68865fae6fba
-CustomInvocationSpellMasteryFaerieFire	InvocationDefinitionCustom	InvocationDefinition	af9d03bc-f5db-5400-a875-a035556f03d8
-CustomInvocationSpellMasteryFalseLife	InvocationDefinitionCustom	InvocationDefinition	2b652f60-0f81-5528-ac8c-6d762f6d255d
-CustomInvocationSpellMasteryFindTraps	InvocationDefinitionCustom	InvocationDefinition	62130d77-5331-53db-a158-f4def8732bb4
-CustomInvocationSpellMasteryFlameBlade	InvocationDefinitionCustom	InvocationDefinition	d6044907-cb69-5bc1-baad-6b98982d49bb
-CustomInvocationSpellMasteryFlamingSphere	InvocationDefinitionCustom	InvocationDefinition	a36c2c5b-bd82-5ba1-94f7-9840a6e0eba9
-CustomInvocationSpellMasteryFogCloud	InvocationDefinitionCustom	InvocationDefinition	521945cb-db1e-59da-930f-106290a7ea9d
-CustomInvocationSpellMasteryGoodberry	InvocationDefinitionCustom	InvocationDefinition	07a2e51f-3f61-5b09-b3ad-a416cfb2aa55
-CustomInvocationSpellMasteryGrease	InvocationDefinitionCustom	InvocationDefinition	12f6e683-e049-57e2-9095-43058bb127ad
-CustomInvocationSpellMasteryGuidingBolt	InvocationDefinitionCustom	InvocationDefinition	1a47d01e-b4cf-5bb1-9f50-9f13461d3236
-CustomInvocationSpellMasteryHealingWord	InvocationDefinitionCustom	InvocationDefinition	52a36806-fbf7-5d90-9442-5035fe17ee16
-CustomInvocationSpellMasteryHeatMetal	InvocationDefinitionCustom	InvocationDefinition	1dd18338-6ae1-5653-a76a-20bbbdbe9d3c
-CustomInvocationSpellMasteryHeroism	InvocationDefinitionCustom	InvocationDefinition	fb3d35b9-f063-5d27-a109-e9bc33c69901
-CustomInvocationSpellMasteryHideousLaughter	InvocationDefinitionCustom	InvocationDefinition	1983dea1-6a1f-59ae-95f2-85f9b09be9e8
-CustomInvocationSpellMasteryHoldPerson	InvocationDefinitionCustom	InvocationDefinition	583a880b-4e01-5546-b87e-ba60e132a591
-CustomInvocationSpellMasteryHuntersMark	InvocationDefinitionCustom	InvocationDefinition	e79992d5-ac58-57fd-9aad-e05e12dd409a
-CustomInvocationSpellMasteryIdentify	InvocationDefinitionCustom	InvocationDefinition	88033eb3-6645-5363-bde2-4a2dfc774c0a
-CustomInvocationSpellMasteryInflictWounds	InvocationDefinitionCustom	InvocationDefinition	c20a27fb-ec58-532d-bd28-b133d19d7aa9
-CustomInvocationSpellMasteryInvisibility	InvocationDefinitionCustom	InvocationDefinition	e5bf5c9d-5f4f-5d4b-844d-1e458ba5aa61
-CustomInvocationSpellMasteryJump	InvocationDefinitionCustom	InvocationDefinition	fa17859d-4bb7-5416-997f-e53ca3876572
-CustomInvocationSpellMasteryKnock	InvocationDefinitionCustom	InvocationDefinition	a4b8c860-b4db-562d-8a86-305d12513e67
-CustomInvocationSpellMasteryLesserRestoration	InvocationDefinitionCustom	InvocationDefinition	6d4823eb-014e-5900-b99c-d1c8ee4481a2
-CustomInvocationSpellMasteryLevitate	InvocationDefinitionCustom	InvocationDefinition	a149b0e5-7bb2-5743-a145-999871ad762e
-CustomInvocationSpellMasteryLongstrider	InvocationDefinitionCustom	InvocationDefinition	c47f1881-d313-5d81-a215-dedfb49bf932
-CustomInvocationSpellMasteryMageArmor	InvocationDefinitionCustom	InvocationDefinition	73288485-d21c-555b-8723-83e1ca785a20
-CustomInvocationSpellMasteryMagicMissile	InvocationDefinitionCustom	InvocationDefinition	d1dffea8-22ca-5f14-ba1e-6b9e679dc061
-CustomInvocationSpellMasteryMagicWeapon	InvocationDefinitionCustom	InvocationDefinition	ca6685b0-4452-593d-8d45-b979c86e847c
-CustomInvocationSpellMasteryMalediction	InvocationDefinitionCustom	InvocationDefinition	3abcf0f1-c75e-5446-85a4-caa6a6649edb
-CustomInvocationSpellMasteryMistyStep	InvocationDefinitionCustom	InvocationDefinition	49c4e61f-4b80-525c-abf3-701a14385b6f
-CustomInvocationSpellMasteryMoonBeam	InvocationDefinitionCustom	InvocationDefinition	3ce6ff04-78b6-576e-ac97-4a6267e71913
-CustomInvocationSpellMasteryPassWithoutTrace	InvocationDefinitionCustom	InvocationDefinition	61c6ca34-aed4-5e14-b4bf-569e3abcdd94
-CustomInvocationSpellMasteryPrayerOfHealing	InvocationDefinitionCustom	InvocationDefinition	d29b9601-3088-501b-9ccb-87c5d47b2d77
-CustomInvocationSpellMasteryProtectionFromEvilGood	InvocationDefinitionCustom	InvocationDefinition	500ab704-56c6-5564-a6df-cf0711e41b50
-CustomInvocationSpellMasteryProtectionFromPoison	InvocationDefinitionCustom	InvocationDefinition	111a9599-fe5a-5ec1-8a26-d37c3f0a0a2c
-CustomInvocationSpellMasteryRayOfEnfeeblement	InvocationDefinitionCustom	InvocationDefinition	beb4cde4-9a47-5db3-bd4a-e103bfeaa3ce
-CustomInvocationSpellMasteryScorchingRay	InvocationDefinitionCustom	InvocationDefinition	f4ce3105-675b-5f29-847c-f3f23f626e69
-CustomInvocationSpellMasterySeeInvisibility	InvocationDefinitionCustom	InvocationDefinition	19251d13-11a4-5363-8f1f-d455018a8892
-CustomInvocationSpellMasteryShatter	InvocationDefinitionCustom	InvocationDefinition	dc6ad905-37f4-5c97-a594-262de4f148b9
-CustomInvocationSpellMasteryShieldOfFaith	InvocationDefinitionCustom	InvocationDefinition	8ebcd30d-657e-5ab2-9d20-0deb5ef3371d
-CustomInvocationSpellMasterySilence	InvocationDefinitionCustom	InvocationDefinition	a2b66415-11f6-5b34-b269-6fbd2d8af470
-CustomInvocationSpellMasterySleep	InvocationDefinitionCustom	InvocationDefinition	5c141840-ab98-5e99-8ce3-d66183fe354a
-CustomInvocationSpellMasterySpiderClimb	InvocationDefinitionCustom	InvocationDefinition	b06a66f9-7ece-5833-8c64-4507f8217476
-CustomInvocationSpellMasterySpikeGrowth	InvocationDefinitionCustom	InvocationDefinition	aadf562a-839c-5ecc-b01d-de4154457061
-CustomInvocationSpellMasterySpiritualWeapon	InvocationDefinitionCustom	InvocationDefinition	c639b015-c0de-5bd7-8064-c744a91c5e53
-CustomInvocationSpellMasteryThunderwave	InvocationDefinitionCustom	InvocationDefinition	a57b3745-733f-5c2d-af17-49cf02b54aa2
 CustomInvocationVerdantTouchedBarkskinCharisma	InvocationDefinitionCustom	InvocationDefinition	c504ca97-2fe6-5fef-91cf-a76691e805bf
 CustomInvocationVerdantTouchedBarkskinIntelligence	InvocationDefinitionCustom	InvocationDefinition	97b7c216-dea7-59a0-9d02-288ecdca7f2e
 CustomInvocationVerdantTouchedBarkskinWisdom	InvocationDefinitionCustom	InvocationDefinition	61fe900c-7603-5c5a-abb0-71a2152064e2
@@ -11377,8 +11290,10 @@ RestActivityLongRestStopInfusions	RestActivityDefinition	RestActivityDefinition
 RestActivityRespec	RestActivityDefinition	RestActivityDefinition	9adcaf86-4f2d-516c-8690-e4e3995db82b
 RestActivityShortRestIdentify	RestActivityDefinition	RestActivityDefinition	deb11b54-49f8-56d0-949e-4d07207c0feb
 RestActivityShortRestStopInfusions	RestActivityDefinition	RestActivityDefinition	6551ce2e-7787-5d1d-a1f3-1a8deb814ae0
+RestActivitySignatureSpells	RestActivityDefinition	RestActivityDefinition	e9fb14c6-4a84-55d1-ab2f-b71805d7899d
 RestActivitySorcererSorcerousRestoration	RestActivityDefinition	RestActivityDefinition	0969cea1-0f55-5bac-88fe-04c851e37ad9
 RestActivitySpellMasterArcaneDepth	RestActivityDefinition	RestActivityDefinition	ada2cb29-cba7-58ef-a322-115d614ee794
+RestActivitySpellMastery	RestActivityDefinition	RestActivityDefinition	ab92f6eb-8a55-581f-8d9b-28470f5e70c1
 Building_Cabin_12C~SnowyForest~MOD	RoomBlueprint	RoomBlueprint	23f87928-fcf3-5327-a893-fdd8a8614051
 Building_Cabin_12C~WoodLand~MOD	RoomBlueprint	RoomBlueprint	1bbf9ede-da2c-5114-92a1-a02d5ce1b078
 Building_Lodge_24C~SnowyForest~MOD	RoomBlueprint	RoomBlueprint	5ec4cdd0-89a4-585e-892a-1f5f23498cb2
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFightingStyleCrippling.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFightingStyleCrippling.json
index 75a0aaa35f..20d18d1f19 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFightingStyleCrippling.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionFightingStyleCrippling.json
@@ -3,10 +3,7 @@
   "inDungeonEditor": false,
   "parentCondition": "Definition:ConditionHindered:a7ec75561313d2a41aab8635a306ed41",
   "conditionType": "Detrimental",
-  "features": [
-    "Definition:AttributeModifierCripplingACDebuff:45dd6abf-0d7c-5563-b3ec-a9d3252159ff",
-    "Definition:MovementAffinityConditionHindered:d8369308deca3fc47a6a9c3ab5518949"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarChillEnemy.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarChillEnemy.json
index 216269e4df..790f4bb055 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarChillEnemy.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionMoonlitScionLunarChillEnemy.json
@@ -1,17 +1,15 @@
 {
   "$type": "ConditionDefinition, Assembly-CSharp",
   "inDungeonEditor": false,
-  "parentCondition": null,
+  "parentCondition": "Definition:ConditionHindered:a7ec75561313d2a41aab8635a306ed41",
   "conditionType": "Detrimental",
-  "features": [
-    "Definition:MovementAffinityConditionHindered:d8369308deca3fc47a6a9c3ab5518949"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,
   "silentWhenRefreshed": false,
   "terminateWhenRemoved": false,
-  "specialDuration": true,
+  "specialDuration": false,
   "durationType": "Round",
   "durationParameterDie": "D1",
   "durationParameter": 1,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistDisablingStrike.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistDisablingStrike.json
index 748bedc4c8..bf8a78dfc7 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistDisablingStrike.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistDisablingStrike.json
@@ -3,9 +3,7 @@
   "inDungeonEditor": false,
   "parentCondition": "Definition:ConditionHindered:a7ec75561313d2a41aab8635a306ed41",
   "conditionType": "Detrimental",
-  "features": [
-    "Definition:MovementAffinityConditionHindered:d8369308deca3fc47a6a9c3ab5518949"
-  ],
+  "features": [],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
   "silentWhenRemoved": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistImprovedDisablingStrike.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistImprovedDisablingStrike.json
index 6bf0375abd..0f1981fcfd 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistImprovedDisablingStrike.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRangerSurvivalistImprovedDisablingStrike.json
@@ -4,8 +4,7 @@
   "parentCondition": "Definition:ConditionHindered:a7ec75561313d2a41aab8635a306ed41",
   "conditionType": "Detrimental",
   "features": [
-    "Definition:AttributeModifierRangerSurvivalistImprovedDisablingStrike:3eeccab0-8b60-5f3f-b529-256bfe40926b",
-    "Definition:MovementAffinityConditionHindered:d8369308deca3fc47a6a9c3ab5518949"
+    "Definition:AttributeModifierRangerSurvivalistImprovedDisablingStrike:3eeccab0-8b60-5f3f-b529-256bfe40926b"
   ],
   "allowMultipleInstances": false,
   "silentWhenAdded": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRoguishDuelistReflexiveParty.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRoguishDuelistReflexiveParty.json
new file mode 100644
index 0000000000..12c2993b44
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionRoguishDuelistReflexiveParty.json
@@ -0,0 +1,157 @@
+{
+  "$type": "ConditionDefinition, Assembly-CSharp",
+  "inDungeonEditor": false,
+  "parentCondition": null,
+  "conditionType": "Beneficial",
+  "features": [],
+  "allowMultipleInstances": false,
+  "silentWhenAdded": true,
+  "silentWhenRemoved": true,
+  "silentWhenRefreshed": false,
+  "terminateWhenRemoved": false,
+  "specialDuration": false,
+  "durationType": "Hour",
+  "durationParameterDie": "D4",
+  "durationParameter": 1,
+  "forceTurnOccurence": false,
+  "turnOccurence": "EndOfTurn",
+  "specialInterruptions": [
+    "AnyBattleTurnEnd"
+  ],
+  "interruptionRequiresSavingThrow": false,
+  "interruptionSavingThrowComputationMethod": "SaveOverride",
+  "interruptionSavingThrowAbility": "",
+  "interruptionDamageThreshold": 0,
+  "keepConditionIfSavingThrowSucceeds": false,
+  "interruptionSavingThrowAffinity": "None",
+  "conditionTags": [],
+  "recurrentEffectForms": [],
+  "cancellingConditions": [],
+  "additionalDamageWhenHit": false,
+  "additionalDamageTypeDetermination": "Specific",
+  "additionalDamageType": "",
+  "additionalDamageQuantity": "AbilityBonus",
+  "additionalDamageDieType": "D1",
+  "additionalDamageDieNumber": 1,
+  "additionalConditionWhenHit": false,
+  "additionalCondition": null,
+  "additionalConditionDurationType": "Round",
+  "additionalConditionDurationParameter": 1,
+  "additionalConditionTurnOccurenceType": "StartOfTurn",
+  "conditionStartParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionEndParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "recurrentEffectParticleReference": null,
+  "characterShaderReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "particlesBasedOnAncestryDamageType": false,
+  "ancestryType": "Sorcerer",
+  "acidParticleParameters": null,
+  "coldParticleParameters": null,
+  "fireParticleParameters": null,
+  "lightningParticleParameters": null,
+  "poisonParticleParameters": null,
+  "overrideCharacterShaderColors": false,
+  "firstCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "secondCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "timeToWaitBeforeApplyingShader": 0.5,
+  "timeToWaitBeforeRemovingShader": 0.5,
+  "possessive": false,
+  "amountOrigin": "None",
+  "baseAmount": 0,
+  "additiveAmount": false,
+  "sourceAbilityBonusMinValue": 1,
+  "subsequentOnRemoval": null,
+  "subsequentHasSavingThrow": false,
+  "subsequentSavingThrowAbilityScore": "Constitution",
+  "subsequentVariableForDC": "FrenzyExhaustionDC",
+  "subsequentDCIncrease": 5,
+  "effectFormsOnRemoved": [],
+  "forceBehavior": false,
+  "addBehavior": false,
+  "fearSource": false,
+  "battlePackage": null,
+  "explorationPackage": null,
+  "removedFromTheGame": false,
+  "permanentlyRemovedIfExtraPlanar": false,
+  "refundReceivedDamageWhenRemoved": false,
+  "followSourcePosition": false,
+  "disolveCharacterOnDeath": false,
+  "disolveParameters": {
+    "$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp",
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 0.0,
+      "g": 0.0,
+      "b": 0.0,
+      "a": 0.0
+    },
+    "colorWidth": 0.0,
+    "noiseScale": 5.0,
+    "hueScale": 0.0,
+    "vertexOffset": 0.0,
+    "curve": {
+      "$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
+    },
+    "startAfterDeathAnimation": false,
+    "duration": 0.0
+  },
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": true,
+    "title": "Feature/&NoContentTitle",
+    "description": "Feature/&NoContentTitle",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "9433916c-fe93-527f-8d52-046262c601de",
+  "contentPack": 9999,
+  "name": "ConditionRoguishDuelistReflexiveParty"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionSignatureSpells.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionSignatureSpells.json
new file mode 100644
index 0000000000..70b4c3f128
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionSignatureSpells.json
@@ -0,0 +1,155 @@
+{
+  "$type": "ConditionDefinition, Assembly-CSharp",
+  "inDungeonEditor": false,
+  "parentCondition": null,
+  "conditionType": "Beneficial",
+  "features": [],
+  "allowMultipleInstances": false,
+  "silentWhenAdded": true,
+  "silentWhenRemoved": true,
+  "silentWhenRefreshed": false,
+  "terminateWhenRemoved": false,
+  "specialDuration": false,
+  "durationType": "Hour",
+  "durationParameterDie": "D4",
+  "durationParameter": 1,
+  "forceTurnOccurence": false,
+  "turnOccurence": "EndOfTurn",
+  "specialInterruptions": [],
+  "interruptionRequiresSavingThrow": false,
+  "interruptionSavingThrowComputationMethod": "SaveOverride",
+  "interruptionSavingThrowAbility": "",
+  "interruptionDamageThreshold": 0,
+  "keepConditionIfSavingThrowSucceeds": false,
+  "interruptionSavingThrowAffinity": "None",
+  "conditionTags": [],
+  "recurrentEffectForms": [],
+  "cancellingConditions": [],
+  "additionalDamageWhenHit": false,
+  "additionalDamageTypeDetermination": "Specific",
+  "additionalDamageType": "",
+  "additionalDamageQuantity": "AbilityBonus",
+  "additionalDamageDieType": "D1",
+  "additionalDamageDieNumber": 1,
+  "additionalConditionWhenHit": false,
+  "additionalCondition": null,
+  "additionalConditionDurationType": "Round",
+  "additionalConditionDurationParameter": 1,
+  "additionalConditionTurnOccurenceType": "StartOfTurn",
+  "conditionStartParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionEndParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "recurrentEffectParticleReference": null,
+  "characterShaderReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "particlesBasedOnAncestryDamageType": false,
+  "ancestryType": "Sorcerer",
+  "acidParticleParameters": null,
+  "coldParticleParameters": null,
+  "fireParticleParameters": null,
+  "lightningParticleParameters": null,
+  "poisonParticleParameters": null,
+  "overrideCharacterShaderColors": false,
+  "firstCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "secondCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "timeToWaitBeforeApplyingShader": 0.5,
+  "timeToWaitBeforeRemovingShader": 0.5,
+  "possessive": false,
+  "amountOrigin": "None",
+  "baseAmount": 0,
+  "additiveAmount": false,
+  "sourceAbilityBonusMinValue": 1,
+  "subsequentOnRemoval": null,
+  "subsequentHasSavingThrow": false,
+  "subsequentSavingThrowAbilityScore": "Constitution",
+  "subsequentVariableForDC": "FrenzyExhaustionDC",
+  "subsequentDCIncrease": 5,
+  "effectFormsOnRemoved": [],
+  "forceBehavior": false,
+  "addBehavior": false,
+  "fearSource": false,
+  "battlePackage": null,
+  "explorationPackage": null,
+  "removedFromTheGame": false,
+  "permanentlyRemovedIfExtraPlanar": false,
+  "refundReceivedDamageWhenRemoved": false,
+  "followSourcePosition": false,
+  "disolveCharacterOnDeath": false,
+  "disolveParameters": {
+    "$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp",
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 0.0,
+      "g": 0.0,
+      "b": 0.0,
+      "a": 0.0
+    },
+    "colorWidth": 0.0,
+    "noiseScale": 5.0,
+    "hueScale": 0.0,
+    "vertexOffset": 0.0,
+    "curve": {
+      "$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
+    },
+    "startAfterDeathAnimation": false,
+    "duration": 0.0
+  },
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": true,
+    "title": "Feature/&NoContentTitle",
+    "description": "Feature/&NoContentTitle",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "7d490159-e05b-5c67-ab55-1763b1188d63",
+  "contentPack": 9999,
+  "name": "ConditionSignatureSpells"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionSpellMastery.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionSpellMastery.json
new file mode 100644
index 0000000000..50a2e71c43
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionSpellMastery.json
@@ -0,0 +1,155 @@
+{
+  "$type": "ConditionDefinition, Assembly-CSharp",
+  "inDungeonEditor": false,
+  "parentCondition": null,
+  "conditionType": "Beneficial",
+  "features": [],
+  "allowMultipleInstances": false,
+  "silentWhenAdded": true,
+  "silentWhenRemoved": true,
+  "silentWhenRefreshed": false,
+  "terminateWhenRemoved": false,
+  "specialDuration": false,
+  "durationType": "Hour",
+  "durationParameterDie": "D4",
+  "durationParameter": 1,
+  "forceTurnOccurence": false,
+  "turnOccurence": "EndOfTurn",
+  "specialInterruptions": [],
+  "interruptionRequiresSavingThrow": false,
+  "interruptionSavingThrowComputationMethod": "SaveOverride",
+  "interruptionSavingThrowAbility": "",
+  "interruptionDamageThreshold": 0,
+  "keepConditionIfSavingThrowSucceeds": false,
+  "interruptionSavingThrowAffinity": "None",
+  "conditionTags": [],
+  "recurrentEffectForms": [],
+  "cancellingConditions": [],
+  "additionalDamageWhenHit": false,
+  "additionalDamageTypeDetermination": "Specific",
+  "additionalDamageType": "",
+  "additionalDamageQuantity": "AbilityBonus",
+  "additionalDamageDieType": "D1",
+  "additionalDamageDieNumber": 1,
+  "additionalConditionWhenHit": false,
+  "additionalCondition": null,
+  "additionalConditionDurationType": "Round",
+  "additionalConditionDurationParameter": 1,
+  "additionalConditionTurnOccurenceType": "StartOfTurn",
+  "conditionStartParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "conditionEndParticleReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "recurrentEffectParticleReference": null,
+  "characterShaderReference": {
+    "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
+    "m_AssetGUID": "",
+    "m_SubObjectName": null,
+    "m_SubObjectType": null
+  },
+  "particlesBasedOnAncestryDamageType": false,
+  "ancestryType": "Sorcerer",
+  "acidParticleParameters": null,
+  "coldParticleParameters": null,
+  "fireParticleParameters": null,
+  "lightningParticleParameters": null,
+  "poisonParticleParameters": null,
+  "overrideCharacterShaderColors": false,
+  "firstCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "secondCharacterShaderColor": {
+    "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+    "r": 0.0,
+    "g": 0.0,
+    "b": 0.0,
+    "a": 0.0
+  },
+  "timeToWaitBeforeApplyingShader": 0.5,
+  "timeToWaitBeforeRemovingShader": 0.5,
+  "possessive": false,
+  "amountOrigin": "None",
+  "baseAmount": 0,
+  "additiveAmount": false,
+  "sourceAbilityBonusMinValue": 1,
+  "subsequentOnRemoval": null,
+  "subsequentHasSavingThrow": false,
+  "subsequentSavingThrowAbilityScore": "Constitution",
+  "subsequentVariableForDC": "FrenzyExhaustionDC",
+  "subsequentDCIncrease": 5,
+  "effectFormsOnRemoved": [],
+  "forceBehavior": false,
+  "addBehavior": false,
+  "fearSource": false,
+  "battlePackage": null,
+  "explorationPackage": null,
+  "removedFromTheGame": false,
+  "permanentlyRemovedIfExtraPlanar": false,
+  "refundReceivedDamageWhenRemoved": false,
+  "followSourcePosition": false,
+  "disolveCharacterOnDeath": false,
+  "disolveParameters": {
+    "$type": "GraphicsCharacterDefinitions+DisolveParameters, Assembly-CSharp",
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 0.0,
+      "g": 0.0,
+      "b": 0.0,
+      "a": 0.0
+    },
+    "colorWidth": 0.0,
+    "noiseScale": 5.0,
+    "hueScale": 0.0,
+    "vertexOffset": 0.0,
+    "curve": {
+      "$type": "UnityEngine.AnimationCurve, UnityEngine.CoreModule"
+    },
+    "startAfterDeathAnimation": false,
+    "duration": 0.0
+  },
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": true,
+    "title": "Feature/&NoContentTitle",
+    "description": "Feature/&NoContentTitle",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "78a099a3-4b49-5f9c-bb8d-cbcf91232bf7",
+  "contentPack": 9999,
+  "name": "ConditionSpellMastery"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionWitherAndBloom.json b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionWitherAndBloom.json
index c957b0ce4a..ae8b753da3 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionWitherAndBloom.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionWitherAndBloom.json
@@ -3,7 +3,9 @@
   "inDungeonEditor": false,
   "parentCondition": null,
   "conditionType": "Beneficial",
-  "features": [],
+  "features": [
+    "Definition:PowerWitherAndBloom:e67c47a1-390a-584e-b349-a460d5e0d214"
+  ],
   "allowMultipleInstances": false,
   "silentWhenAdded": true,
   "silentWhenRemoved": true,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyDawn.json b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyDawn.json
index 6f260b7ac8..72fff55dd5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyDawn.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyDawn.json
@@ -7,7 +7,7 @@
   "canTriggerPower": false,
   "autoTerminateOnTriggerPower": false,
   "incrementalDamageDice": 0,
-  "actionId": 9062,
+  "actionId": 9060,
   "freeActionId": "NoAction",
   "attackMethod": "CasterSpellAbility",
   "firstAttackIsFree": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyFaithfulHound.json b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyFaithfulHound.json
index 94244d38ca..876b3a32a2 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyFaithfulHound.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyFaithfulHound.json
@@ -7,7 +7,7 @@
   "canTriggerPower": false,
   "autoTerminateOnTriggerPower": false,
   "incrementalDamageDice": 0,
-  "actionId": 9056,
+  "actionId": 9054,
   "freeActionId": "NoAction",
   "attackMethod": "CasterSpellAbility",
   "firstAttackIsFree": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon1.json b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon1.json
index c24b705600..18b0bf230e 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon1.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon1.json
@@ -7,8 +7,8 @@
   "canTriggerPower": false,
   "autoTerminateOnTriggerPower": false,
   "incrementalDamageDice": 0,
-  "actionId": 9058,
-  "freeActionId": 9059,
+  "actionId": 9056,
+  "freeActionId": 9057,
   "attackMethod": "CasterSpellAbility",
   "firstAttackIsFree": true,
   "constrainedToSpellArea": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon2.json b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon2.json
index 78c9e9fd7f..c417a9673a 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon2.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon2.json
@@ -7,8 +7,8 @@
   "canTriggerPower": false,
   "autoTerminateOnTriggerPower": false,
   "incrementalDamageDice": 0,
-  "actionId": 9058,
-  "freeActionId": 9059,
+  "actionId": 9056,
+  "freeActionId": 9057,
   "attackMethod": "CasterSpellAbility",
   "firstAttackIsFree": true,
   "constrainedToSpellArea": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon3.json b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon3.json
index f78a2ce0e9..0d69667f53 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon3.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPactWeapon3.json
@@ -7,8 +7,8 @@
   "canTriggerPower": false,
   "autoTerminateOnTriggerPower": false,
   "incrementalDamageDice": 0,
-  "actionId": 9058,
-  "freeActionId": 9059,
+  "actionId": 9056,
+  "freeActionId": 9057,
   "attackMethod": "CasterSpellAbility",
   "firstAttackIsFree": true,
   "constrainedToSpellArea": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPetalStorm.json b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPetalStorm.json
index 9eb20f4641..ef1f2f8278 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPetalStorm.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/EffectProxyDefinition/ProxyPetalStorm.json
@@ -7,7 +7,7 @@
   "canTriggerPower": false,
   "autoTerminateOnTriggerPower": false,
   "incrementalDamageDice": 0,
-  "actionId": 9057,
+  "actionId": 9055,
   "freeActionId": "NoAction",
   "attackMethod": "ReproduceDamageForms",
   "firstAttackIsFree": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupDefenseCombat.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupDefenseCombat.json
index d40dfbf600..f7d03be94e 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupDefenseCombat.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupDefenseCombat.json
@@ -16,7 +16,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feat/&FeatGroupDefenseCombatTitle",
-    "description": "Always Ready, Cloak and Dagger, Defensive Duelist, Dual Wielder, Fade Away, Monastic Shield Training, Raise Shield, Shield Master, Twin Blade, Unarmored Expert",
+    "description": "Always Ready, Cloak and Dagger, Defensive Duelist, Dual Wielder, Fade Away, Raise Shield, Shield Bash, Shield Master, Twin Blade, Unarmored Expert",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupFightingStyle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupFightingStyle.json
index a19543cf83..499805a2db 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupFightingStyle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupFightingStyle.json
@@ -16,7 +16,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feat/&FeatGroupFightingStyleTitle",
-    "description": "Archery, Blind Fighting, Classical Swordplay, Crippling, Defense, Dueling, Executioner, Great Weapon Fighting, Interception, Lunger, Merciless, Protection, Pugilist, Rope it Up, Shield Expert, Superior Technique, Torchbearer, Two Weapon Fighting",
+    "description": "Archery, Astral Reach, Blind Fighting, Classical Swordplay, Crippling, Defense, Dueling, Executioner, Great Weapon Fighting, Interception, Lunger, Protection, Pugilist, Superior Technique, Torchbearer, Two Weapon Fighting",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupMeleeCombat.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupMeleeCombat.json
index 3d3fa850b9..5607611f60 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupMeleeCombat.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupMeleeCombat.json
@@ -16,7 +16,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feat/&FeatGroupMeleeCombatTitle",
-    "description": "Always Ready, Baleful Scion, Blade Mastery, Charger, Crusher, Daunting Push, Defensive Duelist, Devastating Strikes, Distracting Gambit, Elemental Touch, Fell Handed, Fencer, Great Weapon Master, Hammer the Point, Longsword Finesse, Old Tactics, Piercer, Polearm Master, Power Attack, Reckless Attack, Savage Attack, Slasher, Spear Mastery, Trip Attack",
+    "description": "Always Ready, Baleful Scion, Blade Mastery, Charger, Crusher, Daunting Push, Defensive Duelist, Devastating Strikes, Distracting Gambit, Elemental Touch, Fell Handed, Fencer, Great Weapon Master, Longsword Finesse, Old Tactics, Piercer, Polearm Master, Power Attack, Reckless Attack, Savage Attack, Shield Bash, Slasher, Spear Mastery, Trip Attack",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupSupportCombat.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupSupportCombat.json
index f7b21883a2..8e44af7c52 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupSupportCombat.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupSupportCombat.json
@@ -16,7 +16,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feat/&FeatGroupSupportCombatTitle",
-    "description": "Call for Charge, Chef, Gift of the Chromatic Dragon, Hardy, Healer, Improved Critical, Inspiring Leader, Lucky, Mage Slayer, Menacing, Mender, Poisoner, Precision Focused, Sentinel, Superior Critical, Weapon Master",
+    "description": "Call for Charge, Chef, Gift of the Chromatic Dragon, Hardy, Healer, Improved Critical, Inspiring Leader, Lucky, Mage Slayer, Menacing, Mender, Merciless, Poisoner, Precision Focused, Sentinel, Superior Critical, Thrown Weapons Master, Weapon Master",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupUnarmoredCombat.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupUnarmoredCombat.json
index 74b18196ad..f91071387d 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupUnarmoredCombat.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatGroupUnarmoredCombat.json
@@ -16,7 +16,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feat/&FeatGroupUnarmoredCombatTitle",
-    "description": "Astral Reach, Crusher, Elemental Touch, Poisonous Skin, Unarmored Expert",
+    "description": "Crusher, Elemental Touch, Poisonous Skin, Unarmored Expert",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatAstralReach.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatAstralReach.json
new file mode 100644
index 0000000000..b6ae5ca1c8
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatAstralReach.json
@@ -0,0 +1,44 @@
+{
+  "$type": "FeatDefinitionWithPrerequisites, SolastaUnfinishedBusiness",
+  "compatibleClassesPrerequisite": [],
+  "mustCastSpellsPrerequisite": false,
+  "compatibleRacesPrerequisite": [],
+  "minimalAbilityScorePrerequisite": false,
+  "minimalAbilityScoreValue": 13,
+  "minimalAbilityScoreName": "Strength",
+  "armorProficiencyPrerequisite": false,
+  "armorProficiencyCategory": "",
+  "hasFamilyTag": true,
+  "familyTag": "FightingStyle",
+  "knownFeatsPrerequisite": [],
+  "features": [
+    "Definition:ProficiencyFeatAstralReach:4143d5b8-381a-5953-9ea6-4f331db0142c"
+  ],
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": true,
+    "title": "FightingStyle/&AstralReachTitle",
+    "description": "FightingStyle/&AstralReachDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "4f6a56f5-4155-547e-b1b2-47a4c45b2bdc",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "f54d8d34-36e9-5245-a407-b4d96d7a58f1",
+  "contentPack": 9999,
+  "name": "FeatAstralReach"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatGroupOrcishAggression.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatGroupOrcishAggression.json
index 94e59f388c..c302e513b5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatGroupOrcishAggression.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatGroupOrcishAggression.json
@@ -16,7 +16,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feat/&FeatGroupOrcishAggressionTitle",
-    "description": "Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Strength or Constitution by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon.",
+    "description": "Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Strength or Constitution by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon. This feature can be used proficiency bonus times per long rest.",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatImprovedCritical.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatImprovedCritical.json
index 374e0e8c10..3c5ddcdd93 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatImprovedCritical.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatImprovedCritical.json
@@ -18,7 +18,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feature/&MartialChampionImprovedCriticalTitle",
-    "description": "Feat/&FeatCriticalVirtuosoDescription",
+    "description": "Feature/&MartialChampionImprovedCriticalDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatMerciless.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatMerciless.json
index e6a1f4192c..07a6b699f0 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatMerciless.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatMerciless.json
@@ -8,8 +8,8 @@
   "minimalAbilityScoreName": "Strength",
   "armorProficiencyPrerequisite": false,
   "armorProficiencyCategory": "",
-  "hasFamilyTag": true,
-  "familyTag": "FightingStyle",
+  "hasFamilyTag": false,
+  "familyTag": "",
   "knownFeatsPrerequisite": [],
   "features": [
     "Definition:ProficiencyFeatMerciless:19a654a6-15c9-57af-a93f-f14f5eed5b71"
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatRopeItUp.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatRopeItUp.json
index de2b973c4b..9d884263b2 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatRopeItUp.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatRopeItUp.json
@@ -8,8 +8,8 @@
   "minimalAbilityScoreName": "Strength",
   "armorProficiencyPrerequisite": false,
   "armorProficiencyCategory": "",
-  "hasFamilyTag": true,
-  "familyTag": "FightingStyle",
+  "hasFamilyTag": false,
+  "familyTag": "",
   "knownFeatsPrerequisite": [],
   "features": [
     "Definition:ProficiencyFeatRopeItUp:a85c3f98-b265-5c63-b11f-0e2299e0935c"
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatShieldExpert.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatShieldExpert.json
index e3fe6d58bd..da3b344fbd 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatShieldExpert.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatShieldExpert.json
@@ -8,8 +8,8 @@
   "minimalAbilityScoreName": "Strength",
   "armorProficiencyPrerequisite": false,
   "armorProficiencyCategory": "",
-  "hasFamilyTag": true,
-  "familyTag": "FightingStyle",
+  "hasFamilyTag": false,
+  "familyTag": "",
   "knownFeatsPrerequisite": [],
   "features": [
     "Definition:ProficiencyFeatShieldExpert:6fd6a6d7-783e-52d3-8122-7d906ebcb8cd"
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatSuperiorCritical.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatSuperiorCritical.json
index 78079047b1..267d7ae78c 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatSuperiorCritical.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatSuperiorCritical.json
@@ -18,7 +18,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
     "title": "Feature/&MartialChampionSuperiorCriticalTitle",
-    "description": "Feat/&FeatCriticalVirtuosoDescription",
+    "description": "Feature/&MartialChampionSuperiorCriticalDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierCripplingACDebuff.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinition/FeatureAstralReach.json
similarity index 64%
rename from Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierCripplingACDebuff.json
rename to Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinition/FeatureAstralReach.json
index 22ba85624e..9cf1d20cd1 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierCripplingACDebuff.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinition/FeatureAstralReach.json
@@ -1,12 +1,5 @@
 {
-  "$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
-  "modifiedAttribute": "ArmorClass",
-  "modifierOperation": "Additive",
-  "modifierValue": -1,
-  "modifierAbilityScore": "Constitution",
-  "situationalContext": "None",
-  "minimum1": false,
-  "useBonusFromCaster": false,
+  "$type": "FeatureDefinition, Assembly-CSharp",
   "guiPresentation": {
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": true,
@@ -31,7 +24,7 @@
     "usedInValleyDLC": false
   },
   "contentCopyright": "UserContent",
-  "guid": "45dd6abf-0d7c-5563-b3ec-a9d3252159ff",
+  "guid": "038ffe12-debd-5087-bb29-627893d8a094",
   "contentPack": 9999,
-  "name": "AttributeModifierCripplingACDebuff"
+  "name": "FeatureAstralReach"
 }
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionGrantInvocations/GrantInvocationsSpellMastery.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinition/FeatureWizardSpellMastery.json
similarity index 67%
rename from Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionGrantInvocations/GrantInvocationsSpellMastery.json
rename to Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinition/FeatureWizardSpellMastery.json
index e00e02e00e..ed7ba96438 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionGrantInvocations/GrantInvocationsSpellMastery.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinition/FeatureWizardSpellMastery.json
@@ -1,10 +1,10 @@
 {
-  "$type": "FeatureDefinitionGrantInvocations, SolastaUnfinishedBusiness",
+  "$type": "FeatureDefinition, Assembly-CSharp",
   "guiPresentation": {
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": false,
-    "title": "Feature/&GrantInvocationsSpellMasteryTitle",
-    "description": "Feature/&GrantInvocationsSpellMasteryDescription",
+    "title": "Feature/&FeatureWizardSpellMasteryTitle",
+    "description": "Feature/&FeatureWizardSpellMasteryDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
@@ -24,7 +24,7 @@
     "usedInValleyDLC": false
   },
   "contentCopyright": "UserContent",
-  "guid": "7c3c4938-2d3a-5082-87c8-93a4f776340d",
+  "guid": "17f73bcd-e536-5b14-9222-7ba2edbf88ab",
   "contentPack": 9999,
-  "name": "GrantInvocationsSpellMastery"
+  "name": "FeatureWizardSpellMastery"
 }
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityAmazingDisplayToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityAmazingDisplayToggle.json
index 528c7743f0..2582039497 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityAmazingDisplayToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityAmazingDisplayToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9055
+    9053
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBalefulScionToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBalefulScionToggle.json
index 65c36f57b4..15a22b0848 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBalefulScionToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBalefulScionToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9063
+    9061
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBrutalStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBrutalStrikeToggle.json
index 7b14deed84..431c345b34 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBrutalStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityBrutalStrikeToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9052
+    9050
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCollegeOfValianceHeroicInspiration.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCollegeOfValianceHeroicInspiration.json
index cae09e282a..ebaa121509 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCollegeOfValianceHeroicInspiration.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCollegeOfValianceHeroicInspiration.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9048
+    9046
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCoordinatedAssaultToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCoordinatedAssaultToggle.json
index b00643569f..548ee6c40a 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCoordinatedAssaultToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCoordinatedAssaultToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9018
+    9016
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinConditionCrystalDefense.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinConditionCrystalDefense.json
index f0dc08a49a..10c118b728 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinConditionCrystalDefense.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinConditionCrystalDefense.json
@@ -12,10 +12,10 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9019
+    9017
   ],
   "restrictedActions": [
-    9019
+    9017
   ],
   "actionExecutionModifiers": [],
   "specialBehaviour": "None",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinCrystalDefense.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinCrystalDefense.json
index 2410a9cb96..f2853de12f 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinCrystalDefense.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCrystalWyrmkinCrystalDefense.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9020
+    9018
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCunningStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCunningStrikeToggle.json
index cf62375707..40af8bd671 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCunningStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityCunningStrikeToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9021
+    9019
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDestructiveWrathToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDestructiveWrathToggle.json
index fe548ae517..bc6a705dc5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDestructiveWrathToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDestructiveWrathToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9060
+    9058
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDragonHideToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDragonHideToggle.json
index aa76025ec7..3402299db7 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDragonHideToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDragonHideToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9054
+    9052
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDyingLightToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDyingLightToggle.json
index 7ddb3a6db9..a2c9a038c6 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDyingLightToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityDyingLightToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9024
+    9022
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityFeatCrusherToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityFeatCrusherToggle.json
index 7db99ee7bd..d8e8d30859 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityFeatCrusherToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityFeatCrusherToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9029
+    9027
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityForcePoweredStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityForcePoweredStrikeToggle.json
index 1b9dee7ce3..711d35f48c 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityForcePoweredStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityForcePoweredStrikeToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9051
+    9049
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityGloomBladeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityGloomBladeToggle.json
index 5860283600..e0ad65fd40 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityGloomBladeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityGloomBladeToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9032
+    9030
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityHailOfBladesToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityHailOfBladesToggle.json
index 053c62669e..82979202e5 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityHailOfBladesToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityHailOfBladesToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9034
+    9032
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityImpishWrathToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityImpishWrathToggle.json
index 86000a4820..e4916a2c86 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityImpishWrathToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityImpishWrathToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9035
+    9033
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMartialGuardianCompellingStrike.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMartialGuardianCompellingStrike.json
index 3eafde4521..24c4f37833 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMartialGuardianCompellingStrike.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMartialGuardianCompellingStrike.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9017
+    9015
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMasterfulWhirlToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMasterfulWhirlToggle.json
index 6e16bce21a..95947929ba 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMasterfulWhirlToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityMasterfulWhirlToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9037
+    9035
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityOrcishFuryToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityOrcishFuryToggle.json
index 96910dce6a..8d4919a445 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityOrcishFuryToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityOrcishFuryToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9053
+    9051
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPaladinSmiteToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPaladinSmiteToggle.json
index a9023ae74c..75e0916fca 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPaladinSmiteToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPaladinSmiteToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9039
+    9037
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPathOfTheSavageryPrimalInstinct.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPathOfTheSavageryPrimalInstinct.json
index 9c27f7ceef..58c2db1157 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPathOfTheSavageryPrimalInstinct.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPathOfTheSavageryPrimalInstinct.json
@@ -14,7 +14,7 @@
     "RageStart"
   ],
   "authorizedActions": [
-    9015
+    9013
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPressTheAdvantageToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPressTheAdvantageToggle.json
index dbdb384c9f..de8419c3b8 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPressTheAdvantageToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityPressTheAdvantageToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9040
+    9038
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityShieldExpertShove.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityShieldExpertShove.json
index 2a4e6fcede..d7065aff89 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityShieldExpertShove.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityShieldExpertShove.json
@@ -13,20 +13,7 @@
   "forbiddenActions": [],
   "authorizedActions": [],
   "restrictedActions": [],
-  "actionExecutionModifiers": [
-    {
-      "$type": "ActionDefinitions+ActionExecutionModifier, Assembly-CSharp",
-      "actionId": "Shove",
-      "advantageType": "Advantage",
-      "equipmentContext": "WieldingShield"
-    },
-    {
-      "$type": "ActionDefinitions+ActionExecutionModifier, Assembly-CSharp",
-      "actionId": "ShoveBonus",
-      "advantageType": "Advantage",
-      "equipmentContext": "WieldingShield"
-    }
-  ],
+  "actionExecutionModifiers": [],
   "specialBehaviour": "None",
   "randomBehaviorDie": "D10",
   "randomBehaviourOptions": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionMindSculpt.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionMindSculpt.json
index 0fda1360a7..4e383d3bf1 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionMindSculpt.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionMindSculpt.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9038
+    9036
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionSupremeWill.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionSupremeWill.json
index c4d16f8250..2c350c1473 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionSupremeWill.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinitySorcerousPsionSupremeWill.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9043
+    9041
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityThunderousStrikeToggle.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityThunderousStrikeToggle.json
index 2e203b3f99..6a21104841 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityThunderousStrikeToggle.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityThunderousStrikeToggle.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9061
+    9059
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityTraditionOpenHandQuiveringPalm.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityTraditionOpenHandQuiveringPalm.json
index 98d431991e..7fd8434174 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityTraditionOpenHandQuiveringPalm.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityTraditionOpenHandQuiveringPalm.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9042
+    9040
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfTheTempestTempestFury.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfTheTempestTempestFury.json
index 3b70b52fb3..fa66143cc6 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfTheTempestTempestFury.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfTheTempestTempestFury.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9047
+    9045
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfZenArcheryHailOfArrows.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfZenArcheryHailOfArrows.json
index a7af0d5082..5bbf7fe68c 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfZenArcheryHailOfArrows.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWayOfZenArcheryHailOfArrows.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9033
+    9031
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingFeralAgility.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingFeralAgility.json
index 8b7942cbb9..56ef124b34 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingFeralAgility.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingFeralAgility.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9049
+    9047
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingTired.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingTired.json
index 432b2236e4..7e5d138da3 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingTired.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWildlingTired.json
@@ -11,7 +11,7 @@
   "eitherMainOrBonus": false,
   "maxAttacksNumber": -1,
   "forbiddenActions": [
-    9049
+    9047
   ],
   "authorizedActions": [],
   "restrictedActions": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWithdraw.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWithdraw.json
index 0e9c32dbf2..1d6dfdbc3e 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWithdraw.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionActionAffinity/ActionAffinityWithdraw.json
@@ -12,7 +12,7 @@
   "maxAttacksNumber": -1,
   "forbiddenActions": [],
   "authorizedActions": [
-    9050
+    9048
   ],
   "restrictedActions": [],
   "actionExecutionModifiers": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAdditionalDamage/AdditionalDamageFeatBalefulScion.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAdditionalDamage/AdditionalDamageFeatBalefulScion.json
index 69bcadeff4..2a3fef0f18 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAdditionalDamage/AdditionalDamageFeatBalefulScion.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAdditionalDamage/AdditionalDamageFeatBalefulScion.json
@@ -1,7 +1,7 @@
 {
   "$type": "FeatureDefinitionAdditionalDamage, Assembly-CSharp",
   "notificationTag": "BalefulScion",
-  "limitedUsage": "None",
+  "limitedUsage": "OncePerTurn",
   "firstTargetOnly": true,
   "targetSide": "Enemy",
   "otherSimilarAdditionalDamages": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatBowMastery.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatBowMastery.json
index 5d125947a8..73f658b8c8 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatBowMastery.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatBowMastery.json
@@ -1,14 +1,14 @@
 {
   "$type": "FeatureDefinitionAttackModifier, Assembly-CSharp",
   "triggerCondition": "AlwaysActive",
-  "requiredProperty": "RangeWeapon",
+  "requiredProperty": "None",
   "attackRollModifierMethod": "None",
   "attackRollUseCasterBonus": false,
   "attackRollModifier": 0,
   "attackRollAbilityScore": "",
-  "damageRollModifierMethod": "FlatValue",
+  "damageRollModifierMethod": "None",
   "damageRollUseCasterBonus": false,
-  "damageRollModifier": 1,
+  "damageRollModifier": 0,
   "damageRollAbilityScore": "",
   "additionalDamageDice": 0,
   "canDualWieldNonLight": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatCrossbowMastery.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatCrossbowMastery.json
index f35bd8c065..740de45b99 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatCrossbowMastery.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttackModifier/CustomFeatCrossbowMastery.json
@@ -1,14 +1,14 @@
 {
   "$type": "FeatureDefinitionAttackModifier, Assembly-CSharp",
   "triggerCondition": "AlwaysActive",
-  "requiredProperty": "RangeWeapon",
+  "requiredProperty": "None",
   "attackRollModifierMethod": "None",
   "attackRollUseCasterBonus": false,
   "attackRollModifier": 0,
   "attackRollAbilityScore": "",
-  "damageRollModifierMethod": "FlatValue",
+  "damageRollModifierMethod": "None",
   "damageRollUseCasterBonus": false,
-  "damageRollModifier": 1,
+  "damageRollModifier": 0,
   "damageRollAbilityScore": "",
   "additionalDamageDice": 0,
   "canDualWieldNonLight": false,
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatImprovedCritical.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatImprovedCritical.json
index 33ff70a157..8be65708f6 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatImprovedCritical.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatImprovedCritical.json
@@ -1,8 +1,8 @@
 {
   "$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
   "modifiedAttribute": "CriticalThreshold",
-  "modifierOperation": "Additive",
-  "modifierValue": -1,
+  "modifierOperation": "ForceIfWorse",
+  "modifierValue": 19,
   "modifierAbilityScore": "Constitution",
   "situationalContext": "None",
   "minimum1": false,
@@ -11,7 +11,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": false,
     "title": "Feature/&MartialChampionImprovedCriticalTitle",
-    "description": "Feat/&FeatCriticalVirtuosoDescription",
+    "description": "Feature/&MartialChampionImprovedCriticalDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatSuperiorCritical.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatSuperiorCritical.json
index f13fcf3e62..4551b108e9 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatSuperiorCritical.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAttributeModifier/AttributeModifierFeatSuperiorCritical.json
@@ -1,8 +1,8 @@
 {
   "$type": "FeatureDefinitionAttributeModifier, Assembly-CSharp",
   "modifiedAttribute": "CriticalThreshold",
-  "modifierOperation": "Additive",
-  "modifierValue": -1,
+  "modifierOperation": "ForceIfWorse",
+  "modifierValue": 18,
   "modifierAbilityScore": "Constitution",
   "situationalContext": "None",
   "minimum1": false,
@@ -11,7 +11,7 @@
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": false,
     "title": "Feature/&MartialChampionSuperiorCriticalTitle",
-    "description": "Feat/&FeatCriticalVirtuosoDescription",
+    "description": "Feature/&MartialChampionSuperiorCriticalDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
       "m_AssetGUID": "",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationArmor.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationArmor.json
index 038ed8d295..e7303daf86 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationArmor.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationArmor.json
@@ -39,7 +39,7 @@
       "classLevel": 17,
       "spellsList": [
         "Definition:FarStep:1adf1412-2248-5b36-805b-5076ef23ea04",
-        "Definition:WallOfForce:6caa05c5d18ae2e46bdee90964638865"
+        "Definition:HoldMonster:1c8a63324f25814408ca250ba5ec2d16"
       ]
     }
   ],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationWeapon.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationWeapon.json
index 287b850da6..76e961dee8 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationWeapon.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsInnovationWeapon.json
@@ -39,7 +39,7 @@
       "classLevel": 17,
       "spellsList": [
         "Definition:MassCureWounds:31c98fc81cea919499357f8b2cc26bee",
-        "Definition:WallOfForce:6caa05c5d18ae2e46bdee90964638865"
+        "Definition:Telekinesis:4a9561ac-ffb6-5b44-b94a-24f69e41fd4c"
       ]
     }
   ],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsOathOfAltruism.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsOathOfAltruism.json
index c0e5693fff..d726bcdc55 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsOathOfAltruism.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionAutoPreparedSpells/AutoPreparedSpellsOathOfAltruism.json
@@ -39,7 +39,7 @@
       "classLevel": 17,
       "spellsList": [
         "Definition:HoldMonster:1c8a63324f25814408ca250ba5ec2d16",
-        "Definition:WallOfForce:6caa05c5d18ae2e46bdee90964638865"
+        "Definition:MassCureWounds:31c98fc81cea919499357f8b2cc26bee"
       ]
     }
   ],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerTraditionOpenHandQuiveringPalm.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerTraditionOpenHandQuiveringPalm.json
index 37b0d84546..d7c1641ab8 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerTraditionOpenHandQuiveringPalm.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerTraditionOpenHandQuiveringPalm.json
@@ -295,7 +295,7 @@
   "activationTime": "OnAttackHitMeleeAuto",
   "autoActivationRequiredTargetSenseType": "None",
   "autoActivationRequiredTargetCreatureTag": "None",
-  "autoActivationPowerTag": "9042",
+  "autoActivationPowerTag": "9040",
   "triggeringPower": null,
   "copyTargetingFromTriggeringPower": false,
   "reactionContext": "None",
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerWizardSignatureSpells.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerWizardSignatureSpells.json
new file mode 100644
index 0000000000..ef8e705cf1
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionPower/PowerWizardSignatureSpells.json
@@ -0,0 +1,202 @@
+{
+  "$type": "FeatureDefinitionPower, Assembly-CSharp",
+  "effectDescription": {
+    "$type": "EffectDescription, Assembly-CSharp",
+    "rangeType": "Self",
+    "rangeParameter": 0,
+    "halfDamageOnAMiss": false,
+    "hitAffinitiesByTargetTag": [],
+    "targetType": "Self",
+    "itemSelectionType": "Equiped",
+    "targetParameter": 1,
+    "targetParameter2": 2,
+    "emissiveBorder": "None",
+    "emissiveParameter": 1,
+    "requiresTargetProximity": false,
+    "targetProximityDistance": 6,
+    "targetExcludeCaster": false,
+    "canBePlacedOnCharacter": true,
+    "affectOnlyGround": false,
+    "targetFilteringMethod": "AllCharacterAndGadgets",
+    "targetFilteringTag": "No",
+    "requiresVisibilityForPosition": true,
+    "inviteOptionalAlly": false,
+    "slotTypes": [],
+    "recurrentEffect": "No",
+    "retargetAfterDeath": false,
+    "retargetActionType": "Bonus",
+    "poolFilterDiceNumber": 5,
+    "poolFilterDieType": "D8",
+    "trapRangeType": "Triggerer",
+    "targetConditionName": "",
+    "targetConditionAsset": null,
+    "targetSide": "Enemy",
+    "durationType": "Instantaneous",
+    "durationParameter": 1,
+    "endOfEffect": "EndOfTurn",
+    "hasSavingThrow": false,
+    "disableSavingThrowOnAllies": false,
+    "savingThrowAbility": "Dexterity",
+    "ignoreCover": false,
+    "grantedConditionOnSave": null,
+    "rollSaveOnlyIfRelevantForms": false,
+    "hasShoveRoll": false,
+    "createdByCharacter": false,
+    "difficultyClassComputation": "SpellCastingFeature",
+    "savingThrowDifficultyAbility": "Wisdom",
+    "fixedSavingThrowDifficultyClass": 15,
+    "savingThrowAffinitiesBySense": [],
+    "savingThrowAffinitiesByFamily": [],
+    "damageAffinitiesByFamily": [],
+    "advantageForEnemies": false,
+    "canBeDispersed": false,
+    "hasVelocity": false,
+    "velocityCellsPerRound": 2,
+    "velocityType": "AwayFromSourceOriginalPosition",
+    "restrictedCreatureFamilies": [],
+    "immuneCreatureFamilies": [],
+    "restrictedCharacterSizes": [],
+    "hasLimitedEffectPool": false,
+    "effectPoolAmount": 60,
+    "effectApplication": "All",
+    "effectFormFilters": [],
+    "effectForms": [],
+    "specialFormsDescription": "",
+    "effectAdvancement": {
+      "$type": "EffectAdvancement, Assembly-CSharp",
+      "effectIncrementMethod": "None",
+      "incrementMultiplier": 1,
+      "additionalTargetsPerIncrement": 0,
+      "additionalSubtargetsPerIncrement": 0,
+      "additionalDicePerIncrement": 0,
+      "additionalSpellLevelPerIncrement": 0,
+      "additionalSummonsPerIncrement": 0,
+      "additionalHPPerIncrement": 0,
+      "additionalTempHPPerIncrement": 0,
+      "additionalTargetCellsPerIncrement": 0,
+      "additionalItemBonus": 0,
+      "additionalWeaponDie": 0,
+      "alteredDuration": "None"
+    },
+    "speedType": "Instant",
+    "speedParameter": 10.0,
+    "offsetImpactTimeBasedOnDistance": false,
+    "offsetImpactTimeBasedOnDistanceFactor": 0.1,
+    "offsetImpactTimePerTarget": 0.0,
+    "effectParticleParameters": {
+      "$type": "EffectParticleParameters, Assembly-CSharp",
+      "casterParticleReference": null,
+      "casterSelfParticleReference": null,
+      "casterQuickSpellParticleReference": null,
+      "targetParticleReference": null,
+      "effectParticleReference": null,
+      "effectSubTargetParticleReference": null,
+      "zoneParticleReference": null,
+      "beforeImpactParticleReference": null,
+      "impactParticleReference": null,
+      "activeEffectImpactParticleReference": null,
+      "activeEffectCellStartParticleReference": null,
+      "activeEffectCellParticleReference": null,
+      "activeEffectCellEndParticleReference": null,
+      "activeEffectSurfaceStartParticleReference": null,
+      "activeEffectSurfaceParticleReference": null,
+      "activeEffectSurfaceEndParticleReference": null,
+      "activeEffectSurfaceParticlePerIndex": "",
+      "activeEffectSurfaceParticlePerIndexCount": 0,
+      "emissiveBorderCellStartParticleReference": null,
+      "emissiveBorderCellParticleReference": null,
+      "emissiveBorderCellEndParticleReference": null,
+      "emissiveBorderSurfaceStartParticleReference": null,
+      "emissiveBorderSurfaceParticleReference": null,
+      "emissiveBorderSurfaceEndParticleReference": null,
+      "conditionStartParticleReference": null,
+      "conditionParticleReference": null,
+      "conditionEndParticleReference": null,
+      "forceApplyZoneParticle": false,
+      "applyEmissionColorOnWeapons": false,
+      "emissionColor": {
+        "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+        "r": 0.0,
+        "g": 0.0,
+        "b": 0.0,
+        "a": 0.0
+      },
+      "emissionColorFadeInDuration": 0.0,
+      "emissionColorFadeOutDuration": 0.0
+    },
+    "effectAIParameters": {
+      "$type": "EffectAIParameters, Assembly-CSharp",
+      "aoeScoreMultiplier": 1.0,
+      "cooldownForCaster": 0,
+      "cooldownForBattle": 0,
+      "sortingScoreMultiplier": 1.0,
+      "dynamicCooldown": false
+    },
+    "animationMagicEffect": "Animation0",
+    "lightCounterDispellsEffect": false,
+    "hideSavingThrowAnimation": false
+  },
+  "delegatedToAction": false,
+  "surrogateToSpell": null,
+  "triggeredBySpecialMove": false,
+  "activationTime": "NoCost",
+  "autoActivationRequiredTargetSenseType": "None",
+  "autoActivationRequiredTargetCreatureTag": "",
+  "autoActivationPowerTag": "",
+  "triggeringPower": null,
+  "copyTargetingFromTriggeringPower": false,
+  "reactionContext": "None",
+  "damageTypes": [],
+  "reactionName": "",
+  "reactionActingCharacterParamIdx": 0,
+  "reactionAttackerParamIdx": -1,
+  "hasCastingFailure": false,
+  "castingSuccessComputation": "CasterLevel",
+  "canUseInDialog": false,
+  "disableIfConditionIsOwned": null,
+  "disableIfTargetConditionIsOwned": null,
+  "rechargeRate": "ShortRest",
+  "costPerUse": 1,
+  "spellcastingFeature": null,
+  "usesDetermination": "Fixed",
+  "abilityScoreDetermination": "Explicit",
+  "usesAbilityScoreName": "Charisma",
+  "fixedUsesPerRecharge": 3,
+  "abilityScore": "Intelligence",
+  "attackHitComputation": "AbilityScore",
+  "fixedAttackHit": 0,
+  "abilityScoreBonusToAttack": false,
+  "proficiencyBonusToAttack": false,
+  "uniqueInstance": false,
+  "showCasting": true,
+  "shortTitleOverride": "",
+  "overriddenPower": null,
+  "includeBaseDescription": false,
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "Feature/&PowerWizardSignatureSpellsTitle",
+    "description": "Feature/&PowerWizardSignatureSpellsDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "a044a9c8-7d24-5dea-83b8-7c918686084e",
+  "contentPack": 9999,
+  "name": "PowerWizardSignatureSpells"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionProficiency/ProficiencyFeatAstralReach.json b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionProficiency/ProficiencyFeatAstralReach.json
new file mode 100644
index 0000000000..81e1434ece
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionProficiency/ProficiencyFeatAstralReach.json
@@ -0,0 +1,35 @@
+{
+  "$type": "FeatureDefinitionProficiency, Assembly-CSharp",
+  "proficiencyType": "FightingStyle",
+  "proficiencies": [
+    "AstralReach"
+  ],
+  "forbiddenItemTags": [],
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": true,
+    "title": "FightingStyle/&AstralReachTitle",
+    "description": "FightingStyle/&AstralReachDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "4f6a56f5-4155-547e-b1b2-47a4c45b2bdc",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "4143d5b8-381a-5953-9ea6-4f331db0142c",
+  "contentPack": 9999,
+  "name": "ProficiencyFeatAstralReach"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionCustomInvocationPool/InvocationPoolWizardSignatureSpells.json b/Diagnostics/UnfinishedBusinessBlueprints/FightingStyleDefinition/AstralReach.json
similarity index 58%
rename from Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionCustomInvocationPool/InvocationPoolWizardSignatureSpells.json
rename to Diagnostics/UnfinishedBusinessBlueprints/FightingStyleDefinition/AstralReach.json
index b591d55a1d..dd0d862d42 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/FeatureDefinitionCustomInvocationPool/InvocationPoolWizardSignatureSpells.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/FightingStyleDefinition/AstralReach.json
@@ -1,13 +1,17 @@
 {
-  "$type": "FeatureDefinitionCustomInvocationPool, SolastaUnfinishedBusiness",
+  "$type": "FightingStyleDefinition, Assembly-CSharp",
+  "features": [
+    "Definition:FeatureAstralReach:038ffe12-debd-5087-bb29-627893d8a094"
+  ],
+  "condition": "RangedWeaponAttack",
   "guiPresentation": {
     "$type": "GuiPresentation, Assembly-CSharp",
     "hidden": false,
-    "title": "Feature/&InvocationPoolWizardSignatureSpellsTitle",
-    "description": "Feature/&InvocationPoolWizardSignatureSpellsDescription",
+    "title": "FightingStyle/&AstralReachTitle",
+    "description": "FightingStyle/&AstralReachDescription",
     "spriteReference": {
       "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "",
+      "m_AssetGUID": "4f6a56f5-4155-547e-b1b2-47a4c45b2bdc",
       "m_SubObjectName": null,
       "m_SubObjectType": null
     },
@@ -24,7 +28,7 @@
     "usedInValleyDLC": false
   },
   "contentCopyright": "UserContent",
-  "guid": "65077b25-9277-5c8a-b0c2-50d35aaa7f09",
+  "guid": "2d1a30dc-3ac3-53ad-9f6b-f9ab0223da6f",
   "contentPack": 9999,
-  "name": "InvocationPoolWizardSignatureSpells"
+  "name": "AstralReach"
 }
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsBeaconOfHope.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsBeaconOfHope.json
deleted file mode 100644
index 003ea91a63..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsBeaconOfHope.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:BeaconOfHope:5252b1be2462c8140ada004d265e277b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BeaconOfHopeTitle",
-    "description": "Spell/&BeaconOfHopeDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "fc5fc5cd94bc94b4a9c7bffffbee855f",
-      "m_SubObjectName": "BeaconOfHope",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "835f86c2-71f6-5041-85dd-b5967223aec6",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsBeaconOfHope"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsBestowCurse.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsBestowCurse.json
deleted file mode 100644
index 45c9b255a9..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsBestowCurse.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:BestowCurse:c7af146d2e243eb42910adbddec1d7d3",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BestowCurseTitle",
-    "description": "Spell/&BestowCurseDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "f30129dbab80e4f49837e57fe4064e8d",
-      "m_SubObjectName": "BestowCurse",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "32f12282-912e-592b-a37f-f5a926bd19a3",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsBestowCurse"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsCallLightning.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsCallLightning.json
deleted file mode 100644
index 7a242a7bec..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsCallLightning.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:CallLightning:bbb46df8e1040014ea6bdaf36cc1e82b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&CallLightningTitle",
-    "description": "Spell/&CallLightningDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4b39a720f47d6a6489f97533952457c9",
-      "m_SubObjectName": "CallLightning",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "89efb895-fd9e-582b-87f5-77c11a979096",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsCallLightning"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsConjureAnimals.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsConjureAnimals.json
deleted file mode 100644
index 4f991537fc..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsConjureAnimals.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ConjureAnimals:f0e0d1125df2d554eb10d3dde3a2050d",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ConjureAnimalsTitle",
-    "description": "Spell/&ConjureAnimalsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "b043283d50fe383458a825f8828307f0",
-      "m_SubObjectName": "ConjureAnimals",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "68a74fcb-474c-53e6-90d9-e3ed14a734df",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsConjureAnimals"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsCreateFood.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsCreateFood.json
deleted file mode 100644
index a7e82c6e14..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsCreateFood.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:CreateFood:ec735d1c4c89e0a4eb77dd6422948d3b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&CreateFoodTitle",
-    "description": "Spell/&CreateFoodDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "dd9bc65e5a87c6e41a6c9994139cc5c1",
-      "m_SubObjectName": "CreateFood",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "51801242-c2ed-58f9-80f2-9f2997116cf4",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsCreateFood"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsDaylight.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsDaylight.json
deleted file mode 100644
index 9a45646dd4..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsDaylight.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Daylight:73762817061cfec47b824d2f3a9fc3f6",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DaylightTitle",
-    "description": "Spell/&DaylightDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "fcde104743607a2498191c8b858d472d",
-      "m_SubObjectName": "Daylight",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "5c3a5355-5ecc-57ca-b4da-a3f4c63bd3aa",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsDaylight"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsDispelMagic.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsDispelMagic.json
deleted file mode 100644
index 9a5799b7f7..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsDispelMagic.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:DispelMagic:296e789b353c0324b804bee2c16a419a",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DispelMagicTitle",
-    "description": "Spell/&DispelMagicDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "61b6434ac5f42194da11cf2c80db8321",
-      "m_SubObjectName": "DispelMagic",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "28de83b5-f87f-5e82-8e20-3b86027a8915",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsDispelMagic"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFear.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFear.json
deleted file mode 100644
index 9d80f438ca..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFear.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Fear:cff391ef9dd8106448ed464270dcc9c4",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FearTitle",
-    "description": "Spell/&FearDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "64cd942eb64eafc408351594d6bb52a6",
-      "m_SubObjectName": "Fear",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "b73aa88e-f76e-59f1-b516-8533d24367fe",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsFear"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFireball.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFireball.json
deleted file mode 100644
index b2f37b5fbf..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFireball.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Fireball:3f88bf59a445ce64aa23dfb935750535",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FireballTitle",
-    "description": "Spell/&FireballDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "c462c6ae1b665c74f995647ad5adaf79",
-      "m_SubObjectName": "Fireball",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c4196110-503f-591d-b4f5-acdc53267405",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsFireball"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFly.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFly.json
deleted file mode 100644
index ec5cb6a850..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsFly.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Fly:6c13f5461f5047645a8c165cc0f43f83",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FlyTitle",
-    "description": "Spell/&FlyDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "bd509ecf20184584aa866233551cac90",
-      "m_SubObjectName": "Fly",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "02b06135-6eca-5424-b9a7-7dc8cb560c13",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsFly"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsHaste.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsHaste.json
deleted file mode 100644
index fbee68626d..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsHaste.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Haste:134efafc59c7c58438b711271fb2c785",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HasteTitle",
-    "description": "Spell/&HasteDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "ee4ceed49fd95824eb29d79b3e409385",
-      "m_SubObjectName": "Haste",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "7adc19dc-b3bc-5abe-b777-07adfdf7f999",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsHaste"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsHypnoticPattern.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsHypnoticPattern.json
deleted file mode 100644
index 5b2086229d..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsHypnoticPattern.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:HypnoticPattern:363c0134112bc864b871f0fef729be6b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HypnoticPatternTitle",
-    "description": "Spell/&HypnoticPatternDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "06b84c64c888a3d41b8ecd9a9d88bd3f",
-      "m_SubObjectName": "HypnoticPattern",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "6187f701-85c8-514f-a302-13636a6836ab",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsHypnoticPattern"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsLightningBolt.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsLightningBolt.json
deleted file mode 100644
index fdceda8460..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsLightningBolt.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:LightningBolt:f6e4a759d9257fe429523d7f3e8d9eb3",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&LightningBoltTitle",
-    "description": "Spell/&LightningBoltDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "e3bcc5a91ea27ce47b7c381de2451536",
-      "m_SubObjectName": "LightningBolt",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "91602108-3367-5774-b12f-5e188dfa7c2f",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsLightningBolt"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsMassHealingWord.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsMassHealingWord.json
deleted file mode 100644
index 2df33b4e66..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsMassHealingWord.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:MassHealingWord:1b13f79192a474947a2c0138ded903b3",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MassHealingWordTitle",
-    "description": "Spell/&MassHealingWordDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4ddb7825c66c9094db0cbd1598281c1a",
-      "m_SubObjectName": "MassHealingWord",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "6f14841d-d813-5696-9cad-dd087ed35219",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsMassHealingWord"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsProtectionFromEnergy.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsProtectionFromEnergy.json
deleted file mode 100644
index 8109e32fed..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsProtectionFromEnergy.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ProtectionFromEnergy:8416ac74aea478f498e2d50380376e90",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ProtectionFromEnergyTitle",
-    "description": "Spell/&ProtectionFromEnergyDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "66dd1a2d80918de49a347b6e0e1da99c",
-      "m_SubObjectName": "ProtectionFromEnergy",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c8fb32a4-544e-5115-8350-4c6feafc5890",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsProtectionFromEnergy"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsRemoveCurse.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsRemoveCurse.json
deleted file mode 100644
index 9599fad7d2..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsRemoveCurse.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:RemoveCurse:ecabaf5104767c04b9a6549866fccfa0",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&RemoveCurseTitle",
-    "description": "Spell/&RemoveCurseDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "ad4033b3ea7d2db469a253fb795853d4",
-      "m_SubObjectName": "RemoveCurse",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "786916ea-0c75-5ad1-addf-2f0396433524",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsRemoveCurse"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsRevivify.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsRevivify.json
deleted file mode 100644
index 635c7cf758..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsRevivify.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Revivify:16e7fb95186cf9b41806d15fbacd81af",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&RevivifyTitle",
-    "description": "Spell/&RevivifyDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "24436746e9ef52b40ac3fdc3dd866fc7",
-      "m_SubObjectName": "Revivify",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a0648ab3-a176-5bf9-a5c6-9868d69f65a1",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsRevivify"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSleetStorm.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSleetStorm.json
deleted file mode 100644
index d92f2951b3..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSleetStorm.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:SleetStorm:180d1c76c4d7ace4bae4ab9ad6b21b82",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SleetStormTitle",
-    "description": "Spell/&SleetStormDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "c571f03ae5d85da49b693a0b987e42cf",
-      "m_SubObjectName": "SleetStorm",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "96feb03c-6f10-5161-8454-08f5e8538ece",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsSleetStorm"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSlow.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSlow.json
deleted file mode 100644
index 4d637d85b7..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSlow.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Slow:ee93dd5046aabe14e90ba99da310fbb4",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SlowTitle",
-    "description": "Spell/&SlowDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "15b3b9ebce8c9534f8816eebc12179fe",
-      "m_SubObjectName": "Slow",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "8d0a417c-fd12-52f0-abf3-15220e39535e",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsSlow"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSpiritGuardians.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSpiritGuardians.json
deleted file mode 100644
index e7924e882a..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsSpiritGuardians.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:SpiritGuardians:e44bc16c38bca35458599d87cf6def2d",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SpiritGuardiansTitle",
-    "description": "Spell/&SpiritGuardiansDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "8fb52b8094ebc5843843349f635d8327",
-      "m_SubObjectName": "SpiritGuardians",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "49b7c459-aebc-5298-841d-5746a5b666a9",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsSpiritGuardians"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsStinkingCloud.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsStinkingCloud.json
deleted file mode 100644
index 227f566bfa..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsStinkingCloud.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:StinkingCloud:b62f452e6a757124da5eef6ca9fd46e9",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&StinkingCloudTitle",
-    "description": "Spell/&StinkingCloudDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "7e09812b1baeec448be4d3187861a517",
-      "m_SubObjectName": "StinkingCloud",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "963a48f2-593b-50da-a6b8-68b70be2e578",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsStinkingCloud"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsTongues.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsTongues.json
deleted file mode 100644
index e8e216dd4d..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsTongues.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Tongues:fa71b90885b308f4b8998d433c9e41e8",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&TonguesTitle",
-    "description": "Spell/&TonguesDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "118f0d26a826f9f479df939ce71bbdb2",
-      "m_SubObjectName": "Tongues",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "59c63020-c6d3-523e-a7c3-4d976bdbb641",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsTongues"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsVampiricTouch.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsVampiricTouch.json
deleted file mode 100644
index 0ddfe0d264..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsVampiricTouch.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:VampiricTouch:149a2d0a835fda54b99a710e0dabfd53",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&VampiricTouchTitle",
-    "description": "Spell/&VampiricTouchDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "7261d9799cd30d8438e95e5a09f33343",
-      "m_SubObjectName": "VampiricTouch",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "9a8982e3-7587-5ba2-ac75-52c96a227a84",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsVampiricTouch"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsWindWall.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsWindWall.json
deleted file mode 100644
index be714c0cb1..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSignatureSpellsWindWall.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 1,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:WindWall:c76d03525ff3cff4b81e13884aa155f9",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&WindWallTitle",
-    "description": "Spell/&WindWallDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "a7b5207d24d6b58459f3085a25e8a79b",
-      "m_SubObjectName": "WindWall",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "47be0519-452a-5d9c-a09c-6827ef2a9b08",
-  "contentPack": 9999,
-  "name": "CustomInvocationSignatureSpellsWindWall"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAcidArrow.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAcidArrow.json
deleted file mode 100644
index 27329d58bf..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAcidArrow.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:AcidArrow:f37e9c53e7ea033458b5eba667a67f84",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&AcidArrowTitle",
-    "description": "Spell/&AcidArrowDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "bac5aba25edd19e4dbed40e2b4d075f8",
-      "m_SubObjectName": "AcidArrow",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "3c1180c3-eaad-54e3-a88e-3479dd2ffa8c",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryAcidArrow"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAid.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAid.json
deleted file mode 100644
index 2a77420945..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAid.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Aid:d2af062b671377f449bad1b3f920d331",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&AidTitle",
-    "description": "Spell/&AidDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "f0b4ad7b83123234f94ca22704c686f6",
-      "m_SubObjectName": "Aid",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "5eff94c5-5662-5d1d-a788-809fb808ad91",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryAid"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAnimalFriendship.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAnimalFriendship.json
deleted file mode 100644
index 9442f731e0..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryAnimalFriendship.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:AnimalFriendship:5f03823791376fd48b1868183b041cb3",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&AnimalFriendshipTitle",
-    "description": "Spell/&AnimalFriendshipDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "8e719830f5ac20e4e842c149ca3efda2",
-      "m_SubObjectName": "AnimalFrienship",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "1a1d0448-d912-52f5-b0e3-8b49eb0b9505",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryAnimalFriendship"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBane.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBane.json
deleted file mode 100644
index 137eb0f652..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBane.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Bane:2e60d6f650100a84f917bd5d0e69b356",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BaneTitle",
-    "description": "Spell/&BaneDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4055bc032261a0c44853f4f483238bd0",
-      "m_SubObjectName": "Bane",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "befc3579-5d81-5dfb-8a87-654b62b259dd",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBane"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBarkskin.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBarkskin.json
deleted file mode 100644
index ae996f3d47..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBarkskin.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Barkskin:fcb74f4deaec07b40814328a9d5aa5f6",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BarkskinTitle",
-    "description": "Spell/&BarkskinDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "d3ce862aafb649c4683bce554e9e3a8f",
-      "m_SubObjectName": "Barkskin",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 1,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "bbda376f-0306-500e-8347-7fe1b7b54912",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBarkskin"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBless.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBless.json
deleted file mode 100644
index c48cf51ab8..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBless.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Bless:c2c3de28b2c1e294f9a604cdf03b9fd8",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BlessTitle",
-    "description": "Spell/&BlessDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "a09b3bfa05921d743a1bbe2126c87a68",
-      "m_SubObjectName": "Bless",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "26b229d0-bc50-56fd-95ee-e272f93857ef",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBless"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBlindness.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBlindness.json
deleted file mode 100644
index fefe995d4f..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBlindness.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Blindness:3470e52d7a8b472498ee397e2532db04",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BlindnessTitle",
-    "description": "Spell/&BlindnessDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "2f63c0981457f2c4e80fd3f061cde8b4",
-      "m_SubObjectName": "Blindness",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "55dbca2d-f796-56a5-bdfd-7bd577d6737f",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBlindness"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBlur.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBlur.json
deleted file mode 100644
index 4cc2aafbe0..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBlur.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Blur:277b11af157a3c84292024790e6173b3",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BlurTitle",
-    "description": "Spell/&BlurDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4f5573f27a41c784b9815150702ea342",
-      "m_SubObjectName": "Blur",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "3bd96f65-fa05-5998-920b-be1c3aa2faf3",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBlur"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBrandingSmite.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBrandingSmite.json
deleted file mode 100644
index a42094a8cd..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBrandingSmite.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:BrandingSmite:1da57f03be1764642968c141460fe859",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BrandingSmiteTitle",
-    "description": "Spell/&BrandingSmiteDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "6c0b1ca451cb760448ebc18e9c336cf2",
-      "m_SubObjectName": "BrandingSmite",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "58e57887-e193-5fe5-96e8-15b623b0e7d6",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBrandingSmite"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBurningHands.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBurningHands.json
deleted file mode 100644
index 4f9f4b9812..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryBurningHands.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:BurningHands:a2c42e38e03448e438a2abfc3252352a",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&BurningHandsTitle",
-    "description": "Spell/&BurningHandsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "1d4dfd922bc0f764ca73d11f3b37babc",
-      "m_SubObjectName": "BurningHands",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "1258d132-0169-5b32-80b5-377f8b751e5e",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryBurningHands"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCalmEmotions.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCalmEmotions.json
deleted file mode 100644
index 8a0fde148d..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCalmEmotions.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:CalmEmotions:a879080b607fd75458e0eca2dea58e8a",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&CalmEmotionsTitle",
-    "description": "Spell/&CalmEmotionsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "dc492d05bca42fb439c18a715e754bf4",
-      "m_SubObjectName": "CalmEmotions",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "45581624-e120-59c6-a9a0-d5203257deb0",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryCalmEmotions"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCharmPerson.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCharmPerson.json
deleted file mode 100644
index dbd32778a7..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCharmPerson.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:CharmPerson:9c98e5cba0f8b1649b3217a97cbc111b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&CharmPersonTitle",
-    "description": "Spell/&CharmPersonDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "958131f7100a1fa46b0e3cf34c2c686a",
-      "m_SubObjectName": "CharmPerson",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "406e7fed-f41f-5f06-b89b-806384078a82",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryCharmPerson"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryColorSpray.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryColorSpray.json
deleted file mode 100644
index 7974cfa04f..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryColorSpray.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ColorSpray:72939f681f479494e97e0025f67726fe",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ColorSprayTitle",
-    "description": "Spell/&ColorSprayDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "6ebf6e9c2808dcc4c88f388cb6d0acb3",
-      "m_SubObjectName": "ColorSpray",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "4354a7d9-9553-54de-b738-35689cc2d817",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryColorSpray"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryComprehendLanguages.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryComprehendLanguages.json
deleted file mode 100644
index a679019b7d..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryComprehendLanguages.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ComprehendLanguages:78c2b416e515641468aa1c384db23535",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ComprehendLanguagesTitle",
-    "description": "Spell/&ComprehendLanguagesDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "9ca39da39967152429b3bfa0bdd55ee7",
-      "m_SubObjectName": "ComprehendLanguages",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "07dd62d1-b524-5874-86cb-a6d18a0a4489",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryComprehendLanguages"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCureWounds.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCureWounds.json
deleted file mode 100644
index 92aefdcfb7..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryCureWounds.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:CureWounds:c401c5cf11ac8274f98a0dc809ff5863",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&CureWoundsTitle",
-    "description": "Spell/&CureWoundsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "8689fa89d8b1645488f398a9c622bc11",
-      "m_SubObjectName": "CureWounds",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a42e0df1-1484-585e-838b-063b6107965e",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryCureWounds"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDarkness.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDarkness.json
deleted file mode 100644
index bc23171ea9..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDarkness.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Darkness:b8d5ac9f43f55be479da08cd37744584",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DarknessTitle",
-    "description": "Spell/&DarknessDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "deca396a70b17b7429b1ae44224cacab",
-      "m_SubObjectName": "Darkness",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "ebb411ce-f24b-5616-905f-21fcf5dd5f9a",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryDarkness"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDarkvision.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDarkvision.json
deleted file mode 100644
index fc71a7efad..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDarkvision.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Darkvision:346361c8cc5708f4fb70d42c31fe4823",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DarkvisionTitle",
-    "description": "Spell/&DarkvisionDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "9489830f04d9f104083a171ec029479d",
-      "m_SubObjectName": "Darkvision",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "9eadccd6-9a6f-510f-b879-e379ca7990f9",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryDarkvision"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectEvilAndGood.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectEvilAndGood.json
deleted file mode 100644
index f0876ada66..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectEvilAndGood.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:DetectEvilAndGood:e3e901f033c79014bb90853c4c0bf29d",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DetectEvilAndGoodTitle",
-    "description": "Spell/&DetectEvilAndGoodDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "6d7fee2a3f719d148852394a847344bc",
-      "m_SubObjectName": "DetectEvilAndGood",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "d227ceaf-eb9b-5cda-9f7a-be4c59794255",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryDetectEvilAndGood"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectMagic.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectMagic.json
deleted file mode 100644
index 2a58b3a951..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectMagic.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:DetectMagic:a00ea7ca05339cb42a49056d722b6680",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DetectMagicTitle",
-    "description": "Spell/&DetectMagicDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "41c47ba900048504486f4bce9a0468c1",
-      "m_SubObjectName": "DetectMagic",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c168534b-53a8-579e-84e3-120e55e45e44",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryDetectMagic"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectPoisonAndDisease.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectPoisonAndDisease.json
deleted file mode 100644
index 10c47b2a2c..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDetectPoisonAndDisease.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:DetectPoisonAndDisease:18da711013867d949913c54b69bc70f1",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DetectPoisonAndDiseaseTitle",
-    "description": "Spell/&DetectPoisonAndDiseaseDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "0cfa533fc7ed55647a17702f6c79080d",
-      "m_SubObjectName": "DetectPoisonAndDisease",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "58e8b42f-cc54-582e-a076-d3617563295a",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryDetectPoisonAndDisease"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDivineFavor.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDivineFavor.json
deleted file mode 100644
index 66c955e52b..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryDivineFavor.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:DivineFavor:1a1c36371776b464fb7a633c5cd22af4",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&DivineFavorTitle",
-    "description": "Spell/&DivineFavorDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "24e1d30de1b2181429f5e1533452aa4c",
-      "m_SubObjectName": "DivineFavor",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c130ce1f-95ba-5ec9-b3ef-1396db97d8d0",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryDivineFavor"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryEnhanceAbility.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryEnhanceAbility.json
deleted file mode 100644
index 1bc2c1f392..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryEnhanceAbility.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:EnhanceAbility:08840275ddebe7f40abaa4bc145ee9f8",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&EnhanceAbilityTitle",
-    "description": "Spell/&EnhanceAbilityDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "f2194bd874f041547b47b6503711088a",
-      "m_SubObjectName": "EnhanceAbility",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "566dd4f8-9d33-5708-bb4d-6447533daf1a",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryEnhanceAbility"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryEntangle.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryEntangle.json
deleted file mode 100644
index d49f83a3c3..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryEntangle.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Entangle:0224dcb79ea69f34eb9a51546fc78d0d",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&EntangleTitle",
-    "description": "Spell/&EntangleDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "3567ccebbdb2bc043a8e651701b16bbc",
-      "m_SubObjectName": "Entangle",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "17cc8ddd-669b-5fb3-8f92-ad5aa0c85c43",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryEntangle"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryExpeditiousRetreat.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryExpeditiousRetreat.json
deleted file mode 100644
index 52e93928dd..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryExpeditiousRetreat.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ExpeditiousRetreat:3713ff85f9f53f2459ae8d7a976a24b8",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ExpeditiousRetreatTitle",
-    "description": "Spell/&ExpeditiousRetreatDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "7d51659c36de4a447b4057e342b260d6",
-      "m_SubObjectName": "ExpeditiousRetreat",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "44435ee8-d093-5beb-9c3d-68865fae6fba",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryExpeditiousRetreat"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFaerieFire.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFaerieFire.json
deleted file mode 100644
index c154d553fc..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFaerieFire.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:FaerieFire:72b2d8c811efbb04e8d70c0a41f5d963",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FaerieFireTitle",
-    "description": "Spell/&FaerieFireDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "9ca4f4b1dea3dbe41a40bf189c91bbd3",
-      "m_SubObjectName": "FaerieFire",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "af9d03bc-f5db-5400-a875-a035556f03d8",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryFaerieFire"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFalseLife.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFalseLife.json
deleted file mode 100644
index fa44900914..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFalseLife.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:FalseLife:97d70ac4c94f31540aa7b7e1555b7a49",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FalseLifeTitle",
-    "description": "Spell/&FalseLifeDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "9c9f5cea8cbef734cad03574eec0f8d4",
-      "m_SubObjectName": "FalseLife",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "2b652f60-0f81-5528-ac8c-6d762f6d255d",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryFalseLife"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFindTraps.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFindTraps.json
deleted file mode 100644
index 877becd588..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFindTraps.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:FindTraps:784a59eab3d513b42aeab8547027e5f5",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FindTrapsTitle",
-    "description": "Spell/&FindTrapsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "d5ffc8b46878c0d4ab4214c9f403b9a1",
-      "m_SubObjectName": "FindTraps",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "62130d77-5331-53db-a158-f4def8732bb4",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryFindTraps"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFlameBlade.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFlameBlade.json
deleted file mode 100644
index 6910ce1e07..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFlameBlade.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:FlameBlade:0547a31a7b87dbb438758ae4cf914af7",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&Spell_Flameblade_Title",
-    "description": "Spell/&Spell_Flameblade_Description",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "c118bc746b6f30a40be3a7c3d898fe43",
-      "m_SubObjectName": "FlameBlade",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "d6044907-cb69-5bc1-baad-6b98982d49bb",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryFlameBlade"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFlamingSphere.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFlamingSphere.json
deleted file mode 100644
index 8bef105a71..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFlamingSphere.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:FlamingSphere:3b54dc222148dc8499eb981f7383c71f",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FlamingSphereTitle",
-    "description": "Spell/&FlamingSphereDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "398e0f6c137bf0744b61dd6c3481be86",
-      "m_SubObjectName": "FlamingSphere",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a36c2c5b-bd82-5ba1-94f7-9840a6e0eba9",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryFlamingSphere"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFogCloud.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFogCloud.json
deleted file mode 100644
index 6392bc7032..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryFogCloud.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:FogCloud:c0914cf3ec2124242b9f64d267e94c17",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&FogCloudTitle",
-    "description": "Spell/&FogCloudDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "d4b9527a97d9c044ca90f03aaa804278",
-      "m_SubObjectName": "FogCloud",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "521945cb-db1e-59da-930f-106290a7ea9d",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryFogCloud"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGoodberry.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGoodberry.json
deleted file mode 100644
index 58158e95c2..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGoodberry.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Goodberry:6183e557cd5222e4eb6134ccbeb9db10",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&GoodberryTitle",
-    "description": "Spell/&GoodberryDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "c0643b648a63b0e4482e6b95af86db99",
-      "m_SubObjectName": "Goodberry",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "07a2e51f-3f61-5b09-b3ad-a416cfb2aa55",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryGoodberry"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGrease.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGrease.json
deleted file mode 100644
index 520e26fe09..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGrease.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Grease:31f056cc8a643054ba1e59be0d224482",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&GreaseTitle",
-    "description": "Spell/&GreaseDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "c3892af55fbec8d4ebf89090a667f9de",
-      "m_SubObjectName": "Grease",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "12f6e683-e049-57e2-9095-43058bb127ad",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryGrease"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGuidingBolt.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGuidingBolt.json
deleted file mode 100644
index f96f02d707..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryGuidingBolt.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:GuidingBolt:97277a5063bcd6d48af24984618dc218",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&GuidingBoltTitle",
-    "description": "Spell/&GuidingBoltDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "364a6600260bb3248a8c154574638f2a",
-      "m_SubObjectName": "GuidingBolt",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "1a47d01e-b4cf-5bb1-9f50-9f13461d3236",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryGuidingBolt"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHealingWord.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHealingWord.json
deleted file mode 100644
index 33287096d5..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHealingWord.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:HealingWord:0d615e01b2fdf5f42815342ea1e0a26f",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HealingWordTitle",
-    "description": "Spell/&HealingWordDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "1b13c9ff1006ea1489bdbcb09ca7a31d",
-      "m_SubObjectName": "HealingWord",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "52a36806-fbf7-5d90-9442-5035fe17ee16",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryHealingWord"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHeatMetal.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHeatMetal.json
deleted file mode 100644
index 3d59724ee6..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHeatMetal.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:HeatMetal:79c46ad5f66e0a34e8ec9ed3f08933fa",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HeatMetalTitle",
-    "description": "Spell/&HeatMetalDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "2308900eaacc3ef4e91f06b5fdcd37b1",
-      "m_SubObjectName": "HeatMetal",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "1dd18338-6ae1-5653-a76a-20bbbdbe9d3c",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryHeatMetal"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHeroism.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHeroism.json
deleted file mode 100644
index 34e6f1fcea..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHeroism.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Heroism:05578696fa5d08c4cacde7fcaa7ef9cb",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HeroismTitle",
-    "description": "Spell/&HeroismDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "1c85316337127ff4c95a2d43f18d557e",
-      "m_SubObjectName": "Heroism",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "fb3d35b9-f063-5d27-a109-e9bc33c69901",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryHeroism"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHideousLaughter.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHideousLaughter.json
deleted file mode 100644
index 6624d0f451..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHideousLaughter.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:HideousLaughter:8773ef52f0dd71e4a8dbe8a2814b3cf4",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HideousLaughterTitle",
-    "description": "Spell/&HideousLaughterDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4333ac45643e7794db8276db2ad73f67",
-      "m_SubObjectName": "HideousLaughter",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "1983dea1-6a1f-59ae-95f2-85f9b09be9e8",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryHideousLaughter"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHoldPerson.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHoldPerson.json
deleted file mode 100644
index d031987276..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHoldPerson.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:HoldPerson:cbc582b44f08e7f4b8ea69077471bc64",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HoldPersonTitle",
-    "description": "Spell/&HoldPersonDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "88d9bc49687cc474c893aa1fb8f43d74",
-      "m_SubObjectName": "HoldPerson",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "583a880b-4e01-5546-b87e-ba60e132a591",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryHoldPerson"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHuntersMark.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHuntersMark.json
deleted file mode 100644
index c6c3e475f4..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryHuntersMark.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:HuntersMark:a4976a0eae64c43478a3711dc064fb8b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&HuntersMarkTitle",
-    "description": "Spell/&HuntersMarkDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "0c473f4bc671a1c48b9da157557c4d7d",
-      "m_SubObjectName": "HuntersMark",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "e79992d5-ac58-57fd-9aad-e05e12dd409a",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryHuntersMark"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryIdentify.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryIdentify.json
deleted file mode 100644
index 3d3b697b85..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryIdentify.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Identify:e398d34493329f147bae4902122057c2",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&IdentifyTitle",
-    "description": "Spell/&IdentifyDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "59b89b8cba3cfff48b2e33d8243c83ed",
-      "m_SubObjectName": "Identify",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "88033eb3-6645-5363-bde2-4a2dfc774c0a",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryIdentify"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryInflictWounds.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryInflictWounds.json
deleted file mode 100644
index edeeddd1ea..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryInflictWounds.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:InflictWounds:473bbe804543d0f4ebe68ba6db675a49",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&InflictWoundsTitle",
-    "description": "Spell/&InflictWoundsDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "edf772fde799a874d88cae71a06867c8",
-      "m_SubObjectName": "InflictWounds",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c20a27fb-ec58-532d-bd28-b133d19d7aa9",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryInflictWounds"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryInvisibility.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryInvisibility.json
deleted file mode 100644
index 09a7b9375b..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryInvisibility.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Invisibility:191eaa38bdc35ea429f843cc00e7e559",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&InvisibilityTitle",
-    "description": "Spell/&InvisibilityDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "75e87f6e6651cc040afcc690e549c073",
-      "m_SubObjectName": "Invisibility",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "e5bf5c9d-5f4f-5d4b-844d-1e458ba5aa61",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryInvisibility"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryJump.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryJump.json
deleted file mode 100644
index 3c336e71cd..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryJump.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Jump:f9b46eef2189b8342a4943588e2f947c",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&JumpTitle",
-    "description": "Spell/&JumpDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "691c3829c1af8c746b7a029fb7db8e6b",
-      "m_SubObjectName": "Jump",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "fa17859d-4bb7-5416-997f-e53ca3876572",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryJump"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryKnock.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryKnock.json
deleted file mode 100644
index 7c2b7a2f27..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryKnock.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Knock:7b59b8af31053a843a006d0e375dbd89",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&KnockTitle",
-    "description": "Spell/&KnockDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "6f25740cc4baee54ebc9e20fd56876d5",
-      "m_SubObjectName": "Knock",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a4b8c860-b4db-562d-8a86-305d12513e67",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryKnock"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLesserRestoration.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLesserRestoration.json
deleted file mode 100644
index 189611983b..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLesserRestoration.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:LesserRestoration:5da149e59ebb042419041382af919aea",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&LesserRestorationTitle",
-    "description": "Spell/&LesserRestorationDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4aa65f99b71971b4c8a7229b5183b195",
-      "m_SubObjectName": "LesserRestoration",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "6d4823eb-014e-5900-b99c-d1c8ee4481a2",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryLesserRestoration"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLevitate.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLevitate.json
deleted file mode 100644
index c60184b9fe..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLevitate.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Levitate:ad416e5b882b3974c929eb75863f0e84",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&LevitateTitle",
-    "description": "Spell/&LevitateDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "518af71d722898140ade6f799cf584fc",
-      "m_SubObjectName": "Levitate",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a149b0e5-7bb2-5743-a145-999871ad762e",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryLevitate"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLongstrider.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLongstrider.json
deleted file mode 100644
index ff13b0b130..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryLongstrider.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Longstrider:79bd842bd1a7d65499d148a671f7ce83",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&LongstriderTitle",
-    "description": "Spell/&LongstriderDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "205d0c12bfe517341bf9993bf94954eb",
-      "m_SubObjectName": "Longstrider",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c47f1881-d313-5d81-a215-dedfb49bf932",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryLongstrider"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMageArmor.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMageArmor.json
deleted file mode 100644
index f768ef5076..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMageArmor.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:MageArmor:4772a21b455a76149adcc38d58267a10",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MageArmorTitle",
-    "description": "Spell/&MageArmorDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "48258cb7b5be9e942a13ecf70cd8903a",
-      "m_SubObjectName": "MageArmor",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "73288485-d21c-555b-8723-83e1ca785a20",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryMageArmor"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMagicMissile.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMagicMissile.json
deleted file mode 100644
index f004b3d8b6..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMagicMissile.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:MagicMissile:2b2b43fb6eeb735479a21209286db382",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MagicMissileTitle",
-    "description": "Spell/&MagicMissileDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "b61663f56247d304aa297e5fe059e294",
-      "m_SubObjectName": "MagicMissile",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "d1dffea8-22ca-5f14-ba1e-6b9e679dc061",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryMagicMissile"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMagicWeapon.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMagicWeapon.json
deleted file mode 100644
index c3a5053f0c..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMagicWeapon.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:MagicWeapon:c9c2c6779e83836468fb6f4ab562897f",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MagicWeaponTitle",
-    "description": "Spell/&MagicWeaponDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "cdbd83e68b3d8d44eb03f6852a7fd63b",
-      "m_SubObjectName": "MagicWeapon",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "ca6685b0-4452-593d-8d45-b979c86e847c",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryMagicWeapon"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMalediction.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMalediction.json
deleted file mode 100644
index e358ab4892..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMalediction.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Malediction:1aeeac9ea6f521b46892438da2948664",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MaledictionTitle",
-    "description": "Spell/&MaledictionDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "f266083d148fd0948ac9ca4705907dbf",
-      "m_SubObjectName": "Malediction",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "3abcf0f1-c75e-5446-85a4-caa6a6649edb",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryMalediction"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMistyStep.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMistyStep.json
deleted file mode 100644
index b02a356d52..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMistyStep.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:MistyStep:f4619f117544fe148aae6952202da5e3",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MistyStepTitle",
-    "description": "Spell/&MistyStepDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "7e6cd80b881b7074d88a122382fd2103",
-      "m_SubObjectName": "MistyStep",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "49c4e61f-4b80-525c-abf3-701a14385b6f",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryMistyStep"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMoonBeam.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMoonBeam.json
deleted file mode 100644
index 1105c0ec2d..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryMoonBeam.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:MoonBeam:2888ca7e95be24447b669a33ccf80e9b",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&MoonBeamTitle",
-    "description": "Spell/&MoonBeamDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "3b67c7d25a304dd40bbc884c154a2498",
-      "m_SubObjectName": "MoonBeam",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "3ce6ff04-78b6-576e-ac97-4a6267e71913",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryMoonBeam"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryPassWithoutTrace.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryPassWithoutTrace.json
deleted file mode 100644
index f231bacc98..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryPassWithoutTrace.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:PassWithoutTrace:f6e7156667938ea48ba53c669cc59019",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&PassWithoutTraceTitle",
-    "description": "Spell/&PassWithoutTraceDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "687eef905bf70114fa9f5c18bae3f048",
-      "m_SubObjectName": "PassWithoutTrace",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "61c6ca34-aed4-5e14-b4bf-569e3abcdd94",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryPassWithoutTrace"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryPrayerOfHealing.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryPrayerOfHealing.json
deleted file mode 100644
index 3ae9d83a8b..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryPrayerOfHealing.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:PrayerOfHealing:f560b05d2587f5e4894220356a589968",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&PrayerOfHealingTitle",
-    "description": "Spell/&PrayerOfHealingDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "f1f9648cb8205ae468b93f4d22adb954",
-      "m_SubObjectName": "PrayerOfHealing",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "d29b9601-3088-501b-9ccb-87c5d47b2d77",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryPrayerOfHealing"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryProtectionFromEvilGood.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryProtectionFromEvilGood.json
deleted file mode 100644
index 2f479712b8..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryProtectionFromEvilGood.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ProtectionFromEvilGood:b8a59d1a01529b04893e0c440cecee39",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ProtectionFromEvilGoodTitle",
-    "description": "Spell/&ProtectionFromEvilGoodDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "d0d85db74b407004fa42665f4bd98a64",
-      "m_SubObjectName": "ProtectionFromEvilGood",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "500ab704-56c6-5564-a6df-cf0711e41b50",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryProtectionFromEvilGood"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryProtectionFromPoison.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryProtectionFromPoison.json
deleted file mode 100644
index 4d06fc8c16..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryProtectionFromPoison.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ProtectionFromPoison:a7ceb55598ebbfd4cb4dfded0a7450f9",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ProtectionFromPoisonTitle",
-    "description": "Spell/&ProtectionFromPoisonDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "4c39f618d60d8744a8d67e2a10afe0b2",
-      "m_SubObjectName": "ProtectionFromPoison",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "111a9599-fe5a-5ec1-8a26-d37c3f0a0a2c",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryProtectionFromPoison"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryRayOfEnfeeblement.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryRayOfEnfeeblement.json
deleted file mode 100644
index ebfffd9cb7..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryRayOfEnfeeblement.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:RayOfEnfeeblement:b617f68e7f041b74bb018ce5bf9a1c5c",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&RayOfEnfeeblementTitle",
-    "description": "Spell/&RayOfEnfeeblementDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "5e13b809f2552f841b294d2d6f9ae2f1",
-      "m_SubObjectName": "RayOfEnfeeblement",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "beb4cde4-9a47-5db3-bd4a-e103bfeaa3ce",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryRayOfEnfeeblement"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryScorchingRay.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryScorchingRay.json
deleted file mode 100644
index 22710340d2..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryScorchingRay.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ScorchingRay:2196d4d1af65ab8469bcb2b382014a58",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ScorchingRayTitle",
-    "description": "Spell/&ScorchingRayDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "9900524619dc26449963422085aed588",
-      "m_SubObjectName": "ScorchingRay",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "f4ce3105-675b-5f29-847c-f3f23f626e69",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryScorchingRay"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySeeInvisibility.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySeeInvisibility.json
deleted file mode 100644
index 05104e1585..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySeeInvisibility.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:SeeInvisibility:10c15ca8321632e42825254149dfb885",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SeeInvisibilityTitle",
-    "description": "Spell/&SeeInvisibilityDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "08a41c35d59faeb409edc0a09bd619ea",
-      "m_SubObjectName": "SeeInvisibility",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "19251d13-11a4-5363-8f1f-d455018a8892",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasterySeeInvisibility"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryShatter.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryShatter.json
deleted file mode 100644
index 7a0e597f36..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryShatter.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Shatter:acb96b651384a47428da7c0c32ab359e",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ShatterTitle",
-    "description": "Spell/&ShatterDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "1a5b0d7a786844d47843648c69c35228",
-      "m_SubObjectName": "Shatter",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "dc6ad905-37f4-5c97-a594-262de4f148b9",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryShatter"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryShieldOfFaith.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryShieldOfFaith.json
deleted file mode 100644
index 04ea142c75..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryShieldOfFaith.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:ShieldOfFaith:eb2cf2e67b1a4fb458de58dcee2bd309",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ShieldOfFaithTitle",
-    "description": "Spell/&ShieldOfFaithDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "42d9d312013d64043a49b3d3e82a0ba3",
-      "m_SubObjectName": "ShieldOfFaith",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "8ebcd30d-657e-5ab2-9d20-0deb5ef3371d",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryShieldOfFaith"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySilence.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySilence.json
deleted file mode 100644
index c926a4dee4..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySilence.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Silence:2bdf5914091beca4ab1da6383af0feac",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SilenceTitle",
-    "description": "Spell/&SilenceDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "0ac4cb0de96a74141804c432f9a7997b",
-      "m_SubObjectName": "Silence",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a2b66415-11f6-5b34-b269-6fbd2d8af470",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasterySilence"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySleep.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySleep.json
deleted file mode 100644
index 6e709d68e4..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySleep.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Sleep:9bfc9d5dc54cc2c4ab7e4baade97bf64",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SleepTitle",
-    "description": "Spell/&SleepDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "3cb33d5d2fa82e942ad9bd115d7c8371",
-      "m_SubObjectName": "Sleep",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "5c141840-ab98-5e99-8ce3-d66183fe354a",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasterySleep"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpiderClimb.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpiderClimb.json
deleted file mode 100644
index 010deaba6f..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpiderClimb.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:SpiderClimb:1ba4092482a450c4da60e17cbe4577df",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SpiderClimbTitle",
-    "description": "Spell/&SpiderClimbDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "d243c6215c318ec47af840eb7945f5f7",
-      "m_SubObjectName": "SpiderClimb",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "b06a66f9-7ece-5833-8c64-4507f8217476",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasterySpiderClimb"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpikeGrowth.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpikeGrowth.json
deleted file mode 100644
index 6245701ef7..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpikeGrowth.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:SpikeGrowth:489c8aa040535444da10a267213ee7dc",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SpikeGrowthTitle",
-    "description": "Spell/&SpikeGrowthDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "208062c7f85b58542808ed3ba0d821dc",
-      "m_SubObjectName": "SpikeGrowth",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "aadf562a-839c-5ecc-b01d-de4154457061",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasterySpikeGrowth"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpiritualWeapon.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpiritualWeapon.json
deleted file mode 100644
index 2471c53fc4..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasterySpiritualWeapon.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:SpiritualWeapon:2a304c1b2bfa7be4c9cf7c7e08268fd7",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&SpiritualWeaponTitle",
-    "description": "Spell/&SpiritualWeaponDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "7892e11668806184fb7f0901204e6ddc",
-      "m_SubObjectName": "SpiritualWeapon",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "c639b015-c0de-5bd7-8064-c744a91c5e53",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasterySpiritualWeapon"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryThunderwave.json b/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryThunderwave.json
deleted file mode 100644
index 4ebb1edad0..0000000000
--- a/Diagnostics/UnfinishedBusinessBlueprints/InvocationDefinitionCustom/CustomInvocationSpellMasteryThunderwave.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "$type": "InvocationDefinitionCustom, SolastaUnfinishedBusiness",
-  "requiredKnownSpell": null,
-  "requiredLevel": 3,
-  "requiredPact": null,
-  "grantedFeature": null,
-  "grantedSpell": "Definition:Thunderwave:6c670662de0366842bca44119e9104da",
-  "consumesSpellSlot": false,
-  "longRestRecharge": false,
-  "overrideMaterialComponent": true,
-  "guiPresentation": {
-    "$type": "GuiPresentation, Assembly-CSharp",
-    "hidden": false,
-    "title": "Spell/&ThunderwaveTitle",
-    "description": "Spell/&ThunderwaveDescription",
-    "spriteReference": {
-      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
-      "m_AssetGUID": "49c8e733b3ce8db46a74d4c417077576",
-      "m_SubObjectName": "Thunderwave",
-      "m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
-    },
-    "color": {
-      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
-      "r": 1.0,
-      "g": 1.0,
-      "b": 1.0,
-      "a": 1.0
-    },
-    "symbolChar": "221E",
-    "sortOrder": 0,
-    "unusedInSolastaCOTM": false,
-    "usedInValleyDLC": false
-  },
-  "contentCopyright": "UserContent",
-  "guid": "a57b3745-733f-5c2d-af17-49cf02b54aa2",
-  "contentPack": 9999,
-  "name": "CustomInvocationSpellMasteryThunderwave"
-}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ConcealedDagger.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ConcealedDagger.json
index f4e4bfb479..ee326bb1af 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ConcealedDagger.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ConcealedDagger.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "Weapon",
   "weight": 1.0,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityAcidResistance.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityAcidResistance.json
index a15ed5a0b0..c83ee4f44f 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityAcidResistance.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityAcidResistance.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "MagicDevice",
   "weight": 0.5,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityLightningResistance.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityLightningResistance.json
index a3b2fae8ee..e100e467b4 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityLightningResistance.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityLightningResistance.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "Ingredient",
   "weight": 0.0,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityNecroticResistance.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityNecroticResistance.json
index 41130d2c91..620fcf64d7 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityNecroticResistance.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityNecroticResistance.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "MagicDevice",
   "weight": 0.5,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityPoisonResistance.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityPoisonResistance.json
index 73ab6380e1..92201d0d9c 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityPoisonResistance.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityPoisonResistance.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "MagicDevice",
   "weight": 0.5,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityRadiantResistance.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityRadiantResistance.json
index e57156e7ec..276f105048 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityRadiantResistance.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewDamageAffinityRadiantResistance.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "MagicDevice",
   "weight": 0.5,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewHealing.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewHealing.json
index 69f508fa6a..28049993cc 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewHealing.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewHealing.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "MagicDevice",
   "weight": 0.5,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewToxifying.json b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewToxifying.json
index 673292f361..781295a596 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewToxifying.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/ItemDefinition/ItemAncientForestHerbalBrewToxifying.json
@@ -1,6 +1,6 @@
 {
   "$type": "ItemDefinition, Assembly-CSharp",
-  "inDungeonEditor": true,
+  "inDungeonEditor": false,
   "merchantCategory": "Adventuring",
   "weight": 0.5,
   "slotTypes": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/OwlFamiliar.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/OwlFamiliar.json
index b31154a896..5354075751 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/OwlFamiliar.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/OwlFamiliar.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Fey",
   "creatureTags": [],
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeAirElemental.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeAirElemental.json
index a3ffa3d8c4..6f886636b4 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeAirElemental.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeAirElemental.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Elemental",
   "creatureTags": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeCrimsonSpider.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeCrimsonSpider.json
index 4267279a00..189442dd94 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeCrimsonSpider.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeCrimsonSpider.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Monstrosity",
   "creatureTags": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeEarthElemental.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeEarthElemental.json
index 7f9e777491..d237132b74 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeEarthElemental.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeEarthElemental.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Elemental",
   "creatureTags": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeFireElemental.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeFireElemental.json
index 8b66aa266c..6af112f19c 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeFireElemental.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeFireElemental.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Elemental",
   "creatureTags": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeMinotaurElite.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeMinotaurElite.json
index f5c30b5ad3..f40e52a518 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeMinotaurElite.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeMinotaurElite.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Monstrosity",
   "creatureTags": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeWaterElemental.json b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeWaterElemental.json
index 21e1f79c57..a7e8bf9195 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeWaterElemental.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/MonsterDefinition/WildShapeWaterElemental.json
@@ -1,6 +1,6 @@
 {
   "$type": "MonsterDefinition, Assembly-CSharp",
-  "dungeonMakerPresence": "Monster",
+  "dungeonMakerPresence": "None",
   "overrideSpawnDecision": null,
   "characterFamily": "Elemental",
   "creatureTags": [
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/RestActivityDefinition/RestActivitySignatureSpells.json b/Diagnostics/UnfinishedBusinessBlueprints/RestActivityDefinition/RestActivitySignatureSpells.json
new file mode 100644
index 0000000000..e9c4b02e94
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/RestActivityDefinition/RestActivitySignatureSpells.json
@@ -0,0 +1,37 @@
+{
+  "$type": "RestActivityDefinition, Assembly-CSharp",
+  "restStage": "AfterRest",
+  "restType": "LongRest",
+  "condition": "CanPrepareSpells",
+  "requiresMissingClassSpellSlots": false,
+  "functor": "FunctorSignatureSpells",
+  "stringParameter": "",
+  "checkConsciousness": false,
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "RestActivity/&RestActivitySignatureSpellsTitle",
+    "description": "RestActivity/&RestActivitySignatureSpellsDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "e9fb14c6-4a84-55d1-ab2f-b71805d7899d",
+  "contentPack": 9999,
+  "name": "RestActivitySignatureSpells"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/RestActivityDefinition/RestActivitySpellMastery.json b/Diagnostics/UnfinishedBusinessBlueprints/RestActivityDefinition/RestActivitySpellMastery.json
new file mode 100644
index 0000000000..2a546f2e94
--- /dev/null
+++ b/Diagnostics/UnfinishedBusinessBlueprints/RestActivityDefinition/RestActivitySpellMastery.json
@@ -0,0 +1,37 @@
+{
+  "$type": "RestActivityDefinition, Assembly-CSharp",
+  "restStage": "AfterRest",
+  "restType": "LongRest",
+  "condition": "CanPrepareSpells",
+  "requiresMissingClassSpellSlots": false,
+  "functor": "FunctorSpellMastery",
+  "stringParameter": "",
+  "checkConsciousness": false,
+  "guiPresentation": {
+    "$type": "GuiPresentation, Assembly-CSharp",
+    "hidden": false,
+    "title": "RestActivity/&RestActivitySpellMasteryTitle",
+    "description": "RestActivity/&RestActivitySpellMasteryDescription",
+    "spriteReference": {
+      "$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
+      "m_AssetGUID": "",
+      "m_SubObjectName": null,
+      "m_SubObjectType": null
+    },
+    "color": {
+      "$type": "UnityEngine.Color, UnityEngine.CoreModule",
+      "r": 1.0,
+      "g": 1.0,
+      "b": 1.0,
+      "a": 1.0
+    },
+    "symbolChar": "221E",
+    "sortOrder": 0,
+    "unusedInSolastaCOTM": false,
+    "usedInValleyDLC": false
+  },
+  "contentCopyright": "UserContent",
+  "guid": "ab92f6eb-8a55-581f-8d9b-28470f5e70c1",
+  "contentPack": 9999,
+  "name": "RestActivitySpellMastery"
+}
\ No newline at end of file
diff --git a/Diagnostics/UnfinishedBusinessBlueprints/SpellDefinition/WitherAndBloom.json b/Diagnostics/UnfinishedBusinessBlueprints/SpellDefinition/WitherAndBloom.json
index 47460963b8..dd6da135d1 100644
--- a/Diagnostics/UnfinishedBusinessBlueprints/SpellDefinition/WitherAndBloom.json
+++ b/Diagnostics/UnfinishedBusinessBlueprints/SpellDefinition/WitherAndBloom.json
@@ -43,8 +43,8 @@
     "targetConditionName": "",
     "targetConditionAsset": null,
     "targetSide": "Ally",
-    "durationType": "Instantaneous",
-    "durationParameter": 1,
+    "durationType": "Round",
+    "durationParameter": 0,
     "endOfEffect": "EndOfTurn",
     "hasSavingThrow": false,
     "disableSavingThrowOnAllies": false,
@@ -72,7 +72,35 @@
     "effectPoolAmount": 60,
     "effectApplication": "All",
     "effectFormFilters": [],
-    "effectForms": [],
+    "effectForms": [
+      {
+        "$type": "EffectForm, Assembly-CSharp",
+        "formType": "Condition",
+        "addBonusMode": "None",
+        "applyLevel": "No",
+        "levelType": "ClassLevel",
+        "levelMultiplier": 1,
+        "diceByLevelTable": [],
+        "createdByCharacter": true,
+        "createdByCondition": false,
+        "hasSavingThrow": false,
+        "savingThrowAffinity": "None",
+        "dcModifier": 0,
+        "canSaveToCancel": false,
+        "saveOccurence": "EndOfTurn",
+        "conditionForm": {
+          "$type": "ConditionForm, Assembly-CSharp",
+          "conditionDefinitionName": "ConditionWitherAndBloom",
+          "conditionDefinition": "Definition:ConditionWitherAndBloom:9417acb2-0c73-54f5-b4c9-83aaccc20056",
+          "operation": "Add",
+          "conditionsList": [],
+          "applyToSelf": true,
+          "forceOnSelf": false
+        },
+        "hasFilterId": false,
+        "filterId": 0
+      }
+    ],
     "specialFormsDescription": "",
     "effectAdvancement": {
       "$type": "EffectAdvancement, Assembly-CSharp",
@@ -99,7 +127,7 @@
       "$type": "EffectParticleParameters, Assembly-CSharp",
       "casterParticleReference": {
         "$type": "UnityEngine.AddressableAssets.AssetReference, Unity.Addressables",
-        "m_AssetGUID": "c6828df12dbc4c6458c45fe91f34f7a5",
+        "m_AssetGUID": "d68341b16cf6d4b40b5379cc787d5a7a",
         "m_SubObjectName": "",
         "m_SubObjectType": ""
       },
diff --git a/Documentation/Classes.md b/Documentation/Classes.md
index 859f8722ae..ab8002656b 100644
--- a/Documentation/Classes.md
+++ b/Documentation/Classes.md
@@ -1865,7 +1865,7 @@ Choose between increasing your ability scores or gaining a bonus feat.
 
 * Spell Mastery
 
-You have achieved such mastery over certain spells that you can cast them at will. The first two 1st and 2nd-level wizard spells that you prepare can be cast at their lowest level without expending a spell slot. If you want to cast either spell at a higher level, you must expend a spell slot as normal.
+You have achieved such mastery over certain spells that you can cast them at will. Choose two 1st-level or 2nd-level wizard spells that are in your spellbook. You can cast those spells at their lowest level without expending a spell slot when you have them prepared. If you want to cast either spell at a higher level, you must expend a spell slot as normal.
 
 
 ## Level 19
@@ -1879,7 +1879,7 @@ Choose between increasing your ability scores or gaining a bonus feat.
 
 * Signature Spells
 
-You gain mastery over two powerful spells and can cast them with little effort. Choose two 3rd-level wizard spells as your signature spells. You always have these spells prepared, they don't count against the number of spells you have prepared, and you can cast each of them once at 3rd level without expending a spell slot. When you do so, you can't do so again until you finish a short or long rest.
+You gain mastery over two powerful spells and can cast them with little effort. Choose two 3rd-level wizard spells in your spellbook as your signature spells. You always have these spells prepared, they don't count against the number of spells you have prepared, and you can cast each of them once at 3rd level without expending a spell slot. When you do so, you can't do so again until you finish a short or long rest.
 
 
 
diff --git a/Documentation/Feats.md b/Documentation/Feats.md
index 7dcd4a7542..2251434000 100644
--- a/Documentation/Feats.md
+++ b/Documentation/Feats.md
@@ -45,12 +45,7 @@ You study the arcane arts, gaining the following benefits:
 
 You are an expert in the use of armor in battle. You gain an additional +1 AC from any armor you wear.
 
-# 10. - Astral Reach [UB]
-
-Increase your Wisdom by 1, to a maximum of 20.
-When you make an unarmed strike on your turn, your reach for it is 10 ft. Other creatures provoke an opportunity attack from you when they enter the reach you have with unarmed.
-
-# 11. - *Athlete* © [UB]
+# 10. - *Athlete* © [UB]
 
 You have undergone extensive physical training to gain the following benefits:
 • Increase your Strength or Dexterity score by 1, to a maximum of 20.
@@ -58,183 +53,177 @@ You have undergone extensive physical training to gain the following benefits:
 • Climbing doesn't cost you extra movement.
 • You gain proficiency with Athletics skill or expertise if you are already proficient.
 
-# 12. - Awaken the Beast [UB]
+# 11. - Awaken the Beast [UB]
 
 Increase any ability score by 1, to a maximum of 20. Whenever you use your Wild Shape ability to transform into a beast, you gain temporary hit points equal to twice your druid level.
 
-# 13. - Badlands Marauder [SOL]
+# 12. - Badlands Marauder [SOL]
 
 You gain resistance to poison damage, have advantage on rolls against being poisoned, and gain +1 CON (to a maximum of 20).
 
-# 14. - *Baleful Scion* © [UB]
+# 13. - *Baleful Scion* © [UB]
 
 You can channel cosmic forces of evil to gain these benefits:
 • Increase any ability score by 1, to a maximum of 20.
 • Once per turn, when you damage a creature you can see within 60 feet of yourself, you can also deal necrotic damage to it. The necrotic damage equals 1d6 + your proficiency bonus, and you regain a number of hit points equal to 1D6 + your proficiency bonus. You can use this benefit a number of times equal to your proficiency bonus, and you regain all expended uses when you finish a long rest.
 
-# 15. - *Blade Mastery* © [UB]
+# 14. - *Blade Mastery* © [UB]
 
 You master the dagger, shortsword, longsword, scimitar, rapier, and greatsword. You gain a +1 bonus to attack rolls you make with the weapon, and a +1 bonus to your AC while you're wielding any of them. When you make an opportunity attack with the weapon, you have advantage on the attack roll.
 
-# 16. - Blessed Soul [UB]
+# 15. - Blessed Soul [UB]
 
 Your use of divine magic has left a spiritual mark on your soul, allowing you to express your faith more frequently. Increase your Charisma or Wisdom by 1, to a maximum of 20. You gain one additional Channel Divinity usage between rests.
 
-# 17. - Blessing of the Elements [SOL]
+# 16. - Blessing of the Elements [SOL]
 
 Whenever you take fire, cold, or lightning damage, you can use your reaction to become resistant to those damage types until the start of your next turn. This feature recharges on a short rest.
 
-# 18. - *Bountiful Luck* © [UB]
+# 17. - *Bountiful Luck* © [UB]
 
 Your people have extraordinary luck, which you have learned to mystically lend to your companions whenever you see them falter. You're not sure how you do it, you just wish it, and it happens. Surely a sign of fortune's favor!
 • When an ally you can see within 30 feet of you rolls a 1 on the d20 for an attack roll, an ability check, or a saving throw, you can use your reaction to reroll the die. The ally must use the new roll.
 • When you use this ability, you can't use your Lucky racial trait before the end of your next turn.
 
-# 19. - Bow Mastery [UB]
+# 18. - Bow Mastery [UB]
 
-Your expert training with bows grants you these benefits:
-• You gain a +1 bonus to damage rolls you make with shortbow and longbow.
-• When you use the Attack action with a shortbow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.
-• You can use Strength instead of Dexterity on attack and damage rolls you make with a longbow.
+When you use the Attack action with a bow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.
 
-# 20. - Burning Touch [SOL]
+# 19. - Burning Touch [SOL]
 
 The first time each turn that you deal damage with an unarmed attack or weapon, you deal additional fire damage equal to your proficiency bonus.
 
-# 21. - Call for Charge [UB]
+# 20. - Call for Charge [UB]
 
 You may use your bonus action to call for a charge. When you do, until the start of your next turn, you and your allies speed increase by 15 ft, and each one have advantage on their first attack roll. You can use this power a number of times per long rest equal to your Charisma modifier.
 
-# 22. - *Charger* © [UB]
+# 21. - *Charger* © [UB]
 
 You have trained to charge headlong into battle, gaining the following benefits:
 • Whenever you take Dash action, you can use your bonus action to make one melee attack.
 • If you move at least 10 feet in a straight line immediately before hitting with a melee weapon or unarmed attack on your turn, choose one of the following effects: gain a +1d8 bonus to the attack's damage roll, or push the target up to 10 feet, provided the target you want to push is of Large size or smaller. You can use this benefit only once on each of your turns.
 
-# 23. - *Chef* © [UB]
+# 22. - *Chef* © [UB]
 
 Increase your Wisdom or Constitution by 1, to a maximum of 20.
 You can spend 1 hour to cook a meal to heal you and your companions for 1d8 HP.
 Once a day, you may spend an hour to cook a number of treats equal to your proficiency bonus that provide 5 temporary HP when eaten.
 
-# 24. - Cloak and Dagger [SOL]
+# 23. - Cloak and Dagger [SOL]
 
 After you hit an enemy with a light weapon, you gain +2 AC until the start of your next turn (doesn't stack).
 
-# 25. - Close Quarters [UB]
+# 24. - Close Quarters [UB]
 
 You are experienced with fighting in close quarters and gain the following benefits:
 • Your Dexterity or Intelligence increases by 1, to a maximum of 20.
 • When you deal sneak attack damage with melee weapon attacks while within 5 feet of your target, your sneak dice become d8 instead of d6. This feature also extends to classes that can deal sneak attacks with melee spell attacks, and rogue features that scale off of sneak dice.
 
-# 26. - Creed of Arun [SOL]
+# 25. - Creed of Arun [SOL]
 
 +1 CON to a maximum of 20
  Proficiency in CON saves if not already proficient; +1 otherwise
 
-# 27. - Creed of Einar [SOL]
+# 26. - Creed of Einar [SOL]
 
 +1 STR to a maximum of 20
  Proficiency in STR saves if not already proficient; +1 otherwise
 
-# 28. - Creed of Maraike [SOL]
+# 27. - Creed of Maraike [SOL]
 
 +1 WIS to a maximum of 20
  Proficiency in WIS saves if not already proficient; +1 otherwise
 
-# 29. - Creed of Misaye [SOL]
+# 28. - Creed of Misaye [SOL]
 
 +1 DEX to a maximum of 20
  Proficiency in DEX saves if not already proficient; +1 otherwise
 
-# 30. - Creed of Pakri [SOL]
+# 29. - Creed of Pakri [SOL]
 
 +1 INT to a maximum of 20
  Proficiency in INT saves if not already proficient; +1 otherwise
 
-# 31. - Creed of Solasta [SOL]
+# 30. - Creed of Solasta [SOL]
 
 +1 CHA to a maximum of 20 
  Proficiency in CHA saves if not already proficient; +1 otherwise
 
-# 32. - *Crossbow Expert* © [UB]
+# 31. - *Crossbow Expert* © [UB]
 
 Your expert training with ranged weapons grants you these benefits:
 • Attacks at melee range don't impose disadvantage.
 • If you take the attack action on your turn, you can make one one-handed ranged bonus attack adding your attribute modifier to damage.
 
-# 33. - Crossbow Mastery [UB]
+# 32. - Crossbow Mastery [UB]
 
-Your expert training with crossbows grants you these benefits:
-• You gain a +1 bonus to damage rolls you make with heavy, light and hand crossbows.
-• When you use the Attack action with a light or hand crossbow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.
-• You can use Strength instead of Dexterity on attack and damage rolls you make with a heavy crossbow.
+When you use the Attack action with a crossbow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.
 
-# 34. - *Crusher* © [UB]
+# 33. - *Crusher* © [UB]
 
 Increase your Strength or Constitution by 1, to a maximum of 20.
 When you hit a creature with an attack that deals bludgeoning damage, once per turn you push the enemy by 5ft. When you score a critical hit attack rolls against that creature are made with advantage until the start of your next turn.
 
-# 35. - Cunning Escape [UB]
+# 34. - Cunning Escape [UB]
 
 Whenever you use the Dash action as a bonus action, your movement doesn't provoke opportunity attacks for the rest of the turn.
 
-# 36. - *Dark-Elf Magic* © [UB]
+# 35. - *Dark-Elf Magic* © [UB]
 
 You learn more of the magic typical of dark elves. You learn the Detect Magic spell and can cast it at will, without expending a spell slot. You also learn Levitate and Dispel Magic, each of which you can cast once without expending a spell slot. You regain the ability to cast the spell in this way when you finish a long rest. Charisma is your spellcasting ability for these spells.
 
-# 37. - Daunting Push [SOL]
+# 36. - Daunting Push [SOL]
 
 When you successfully shove an enemy, they lose half their movement speed (rounded down) on their next turn.
 
-# 38. - *Defensive Duelist* © [UB]
+# 37. - *Defensive Duelist* © [UB]
 
-When you are wielding a finesse weapon with which you are proficient and another creature hits you with a melee attack, you can use your reaction to add your proficiency bonus to your AC for that attack, potentially causing the attack to miss you.
+When you are wielding a melee weapon with which you are proficient and another creature hits you with a melee attack, you can use your reaction to add your proficiency bonus to your AC for that attack, potentially causing the attack to miss you.
 
-# 39. - Devastating Strikes [UB]
+# 38. - Devastating Strikes [UB]
 
 Your attacks with great swords, great axes and mauls are especially deadly, and you gain the following benefits when using any of them:
 • Your attacks with the weapon deal extra damage equal to your proficiency bonus.
 • Whenever you land a critical hit, you roll an additional weapon die and ignore target creature's resistances for that attack.
 
-# 40. - Discretion of the Coedymwarth [SOL]
+# 39. - Discretion of the Coedymwarth [SOL]
 
 +1 DEX to a maximum of 20 
  You gain proficiency with Light Armor.
  You gain proficiency with Shortswords, Shortbows, and Longbows.
 
-# 41. - Distracting Gambit [SOL]
+# 40. - Distracting Gambit [SOL]
 
 After you hit an enemy with a one-handed weapon, they lose -1 AC for 1 minute (doesn't stack).
 
-# 42. - *Dragon Fear* © [UB]
+# 41. - *Dragon Fear* © [UB]
 
 When angered, you radiate menace. You gain the following benefits:
 • Increase your Strength, Constitution, or Charisma by 1, to a maximum of 20.
 • Instead of exhaling destructive energy, you can expend a use of your Breath Weapon trait to roar, forcing each creature of your choice within 30 feet of you to make a Wisdom saving throw (DC 8 + your proficiency bonus + your Charisma modifier). On a failed save, a target becomes frightened for 1 minute. The target can repeat the saving throw at the end of each of its turns, ending the effect on itself on a success.
 
-# 43. - *Dragon Hide* © [UB]
+# 42. - *Dragon Hide* © [UB]
 
 You manifest scales and claws reminiscent of your draconic ancestors. You gain the following benefits:
 • Increase your Strength, Constitution, or Charisma by 1, up to a maximum of 20.
 • Your scales harden. While you aren't wearing armor, your armor class is equal to 10 + your Dexterity modifier + your Constitution modifier. You can use a shield and still gain this benefit.
 • You can grow retractable claws from the tips of your fingers. Extending or retracting the claws requires no action. The claws are natural weapons, which you can use to make unarmed strikes. If you hit with them, you deal slashing damage equal to 1d4 + your Strength modifier, instead of the normal bludgeoning damage for an unarmed strike.
 
-# 44. - *Dragon Wings* © [UB]
+# 43. - *Dragon Wings* © [UB]
 
 You sprout draconic wings. You gain the ability to fly for a limited time if you aren't wearing heavy armor.
 
-# 45. - Dual Flurry [UB]
+# 44. - Dual Flurry [UB]
 
 You are a master of fighting with paired weapons. On any turn where you hit twice with melee attacks while wielding a weapon in each hand, you may make an additional off-hand attack when attacking with your bonus action.
 
-# 46. - *Dual Wielder* © [UB]
+# 45. - *Dual Wielder* © [UB]
 
 You master fighting with two weapons, gaining the following benefits:
 • You gain a +1 bonus to AC while you are wielding a separate melee weapon in each hand.
 • You can use two-weapon fighting even when the one-handed melee weapons you are wielding aren't light.
 
-# 47. - *Dungeon Delver* © [UB]
+# 46. - *Dungeon Delver* © [UB]
 
 Alert to the hidden traps and secret doors found in many dungeons, you gain the following benefits:
 • You have advantage on Wisdom (Perception) and Intelligence (Investigation) checks.
@@ -242,472 +231,476 @@ Alert to the hidden traps and secret doors found in many dungeons, you gain the
 • You have resistance to the damage dealt by traps.
 • Travelling at a fast pace doesn't impose the normal -5 penalty on your passive Wisdom (Perception) score.
 
-# 48. - *Dwarven Fortitude* © [UB]
+# 47. - *Dwarven Fortitude* © [UB]
 
 You have the blood of dwarf heroes flowing through your veins. You gain the following benefits:
 • Increase your Constitution score by 1, to a maximum of 20.
 • Whenever you take the Dodge action in combat, you can spend one Hit Die to heal yourself. Roll the die, add your Constitution modifier, and regain a number of hit points equal to the total (minimum of 1).
 
-# 49. - Eager for Battle [SOL]
+# 48. - Eager for Battle [SOL]
 
 +1 DEX to a maximum of 20 
  You have advantage on your initiative rolls.
 
-# 50. - *Eldritch Adept* © [UB]
+# 49. - *Eldritch Adept* © [UB]
 
 You learn one Eldritch Invocation option of your choice from the warlock class. If the invocation has a prerequisite, you can choose that invocation only if you're a warlock and only if you meet the prerequisite. Whenever you gain a level, you can replace the invocation with another one from the warlock class.
 
-# 51. - Electrifying Touch [SOL]
+# 50. - Electrifying Touch [SOL]
 
 The first time each turn that you deal damage with an unarmed attack or weapon, you deal additional lightning damage equal to your proficiency bonus.
 
-# 52. - *Elemental Adept* © [UB]
+# 51. - *Elemental Adept* © [UB]
 
 When you gain this feat, choose one of the following damage types: acid, cold, fire, lightning, or thunder. Spells you cast ignore resistance to the chosen damage type. In addition, when you roll damage for a spell you cast that deals damage of that type, you can reroll any 1s.
 
-# 53. - Elemental Master [UB]
+# 52. - Elemental Master [UB]
 
 When you gain this feat, choose one of the following damage types: acid, cold, fire, lightning, or thunder. Spells you cast ignore immunity to the chosen damage type. In addition, when you roll attack for a spell you cast that deals damage of that type, you can reroll any 1s.
 
-# 54. - *Elven Accuracy* © [UB]
+# 53. - *Elven Accuracy* © [UB]
 
 You have uncanny aim with attacks that rely on precision rather than brute force. Increase your Dexterity or one of your mental attributes by 1, to a maximum of 20. Whenever you have advantage on an attack roll using Dexterity, Intelligence, Wisdom, or Charisma, you can reroll one of the dice once.
 
-# 55. - Enduring Body [SOL]
+# 54. - Enduring Body [SOL]
 
 Increase your Constitution by 1 (max 20) and your hit points increase by an additional +1 each time you gain a level.
 
-# 56. - Expand the Hunt [UB]
+# 55. - Expand the Hunt [UB]
 
 Increase your Wisdom by 1, to a maximum of 20. You can choose one additional favored enemy, language and terrain type.
 
-# 57. - Exploiter [UB]
+# 56. - Exploiter [UB]
 
 You are constantly aware of the surrounding battlefield, honing this awareness into lethal prowess. When a creature within reach of your melee weapon takes damage from an attack that originated from a creature other than yourself, you may use your reaction to make a melee weapon attack against the damaged creature.
 
-# 58. - *Fade Away* © [UB]
+# 57. - *Fade Away* © [UB]
 
 You have learned a magical trick for fading away when you suffer harm. Increase your Dexterity or Intelligence by 1, to a maximum of 20. Immediately after you take damage, you can use a reaction to magically become invisible until the end of your next turn or until you attack, deal damage, or force someone to make a saving throw. Once you use this ability, you can't do so again until you finish a short or long rest.
 
-# 59. - *Fell Handed* © [UB]
+# 58. - *Fell Handed* © [UB]
 
 You master the handaxe, battleaxe, greataxe, warhammer and maul. You gain the following benefits when using any of them:
 • A +1 bonus to attack rolls you make with the weapon.
 • Whenever you have advantage on a melee attack roll and hit, you knock the target prone if the lower of the two d20 rolls would also hit the target.
 • Whenever you have disadvantage on a melee attack roll and miss, the target takes bludgeoning damage equal to your Strength modifier if higher of the two d20 rolls would hit the target.
 
-# 60. - Fencer [UB]
+# 59. - Fencer [UB]
 
 If you take the Attack action on your turn while holding a melee one-handed or versatile weapon and no other weapon or shield, you can use a bonus action to attack with the weapon you are holding, adding your attribute modifier to the damage dealt.
 
-# 61. - *Fey Teleportation* © [UB]
+# 60. - *Fey Teleportation* © [UB]
 
 Increase one of your mental attributes by 1, to a maximum of 20.
 You can use misty step once per short rest, and you can cast this spell with your spell slots.
 You gain proficiency in Tirmarian.
 
-# 62. - *Fighting Initiate* © [UB]
+# 61. - *Fighting Initiate* © [UB]
 
-Archery, Blind Fighting, Classical Swordplay, Crippling, Defense, Dueling, Executioner, Great Weapon Fighting, Interception, Lunger, Merciless, Protection, Pugilist, Rope it Up, Shield Expert, Superior Technique, Torchbearer, Two Weapon Fighting
+Archery, Astral Reach, Blind Fighting, Classical Swordplay, Crippling, Defense, Dueling, Executioner, Great Weapon Fighting, Interception, Lunger, Protection, Pugilist, Superior Technique, Torchbearer, Two Weapon Fighting
 
-# 63. - *Flames of Phlegethos* © [UB]
+# 62. - *Flames of Phlegethos* © [UB]
 
 You learn to call on hellfire to serve your commands. You gain the following benefits:
 • Increase your Intelligence or Charisma by 1, to a maximum of 20.
 • When you roll fire damage for a spell you cast, you can reroll any roll of 1 on the fire damage dice, but you must use the new roll, even if it is another 1.
 • Whenever you use a power or spell that deals fire damage, you can cause flames to wreathe you until the end of your next turn. The flames don't harm you or your possessions, and they shed bright light out to 30 feet and dim light for an additional 30 feet. While the flames are present, any creature within 5 feet of you that hits you with a melee attack takes 1d4 fire damage.
 
-# 64. - Flawless Concentration [SOL]
+# 63. - Flawless Concentration [SOL]
 
 You are trained to maintain your concentration in the most extreme conditions.
 If you sustain up to 10 points of damage, you don't need to roll a Constitution saving throw to maintain concentration. 
  Above that value, you have advantage when rolling the saving throw.
 
-# 65. - Focused Sleeper [SOL]
+# 64. - Focused Sleeper [SOL]
 
 You are used to getting a great deal of rest out of just a little sleep. Increase your Constitution by 1 (max 20), and you only need four hours of sleep per night.
 
-# 66. - Follow Up Strike [SOL]
+# 65. - Follow Up Strike [SOL]
 
 When you use the Attack action with a two-handed weapon, you can use a bonus action to make a fast melee attack to follow up, dealing an additional 1d4 + STR bonus damage of the same type.
 
-# 67. - Forest Runner [SOL]
+# 66. - Forest Runner [SOL]
 
 You gain +2 cells movement speed and +1 DEX (to a maximum of 20).
 
-# 68. - Forestalling Strength [SOL]
+# 67. - Forestalling Strength [SOL]
 
 While you wield a two-handed weapon, you gain +1 AC.
 
-# 69. - Frost Adaptation [UB]
+# 68. - Frost Adaptation [UB]
 
 Increase your Constitution by 1, to a maximum of 20.
 You have resistance to Cold damage.
 You are immune to the effects of moderately cold weather.
 You are also Chilled instead of Frozen in freezing weather.
 
-# 70. - *Gift of the Chromatic Dragon* © [UB]
+# 69. - *Gift of the Chromatic Dragon* © [UB]
 
 You've manifested some of the power of chromatic dragons, granting you the following benefits:
 • Chromatic Infusion: As a bonus action, you can touch a simple or martial weapon and infuse it with one of the following damage types: acid, cold, fire, lightning, or poison. For the next minute, the weapon deals an extra 1d4 damage of the chosen type when it hits. After you use this bonus action, you can't do so again until you finish a long rest.
 • Reactive Resistance: When you take acid, cold, fire, lightning, or poison damage, you can use your reaction to give yourself resistance to that instance of damage until the end of its turn. You can use this reaction a number of times equal to your proficiency bonus, and you regain all expended uses when you finish a long rest.
 
-# 71. - *Great Weapon Master* © [UB]
+# 70. - *Great Weapon Master* © [UB]
 
 You've learned to put the weight of a weapon to your advantage, letting its momentum empower your strikes:
 • On your turn, when you score a critical hit with a melee weapon or reduce a creature to 0 hit points with one, you can make one melee weapon attack as a bonus action.
 • Before you make a melee attack with a heavy weapon that you are proficient with, you can choose to take a -5 penalty to your attack roll in order to do additional +10 damage.
 
-# 72. - *Grudge Bearer* © [UB]
+# 71. - *Grudge Bearer* © [UB]
 
 You have a deep hatred for a particular kind of creature. Choose your foes, a type of creature to bear the burden of your wrath: aberrations, beasts, celestials, constructs, dragons, elementals, fey, fiends, giants, monstrosities, oozes, plants, or undead. You gain the following benefits:
 • Increase your Strength, Constitution, or Wisdom score by 1, to a maximum of 20.
 • During the first round of any combat against your chosen foes, your attack rolls against any of them have advantage.
 • When any of your chosen foes makes an opportunity attack against you, it makes the attack roll with disadvantage.
 
-# 73. - Hammer the Point [UB]
-
-You know how to focus and concentrate on the same spot. After you make an attack roll against a target, get a +1 to attack and damage rolls against this target until the end of you turn [stacks].
-
-# 74. - Hard to Kill [SOL]
+# 72. - Hard to Kill [SOL]
 
 +1 CON to a maximum of 20
  You have advantage on death saving throws. If you succeed three times, you are not only stabilized, but you regain one hit die immediately. On a critical roll, you regain two hit dice instead.
 
-# 75. - Hardy [UB]
+# 73. - Hardy [UB]
 
 Increase your Strength or Constitution by 1, to a maximum of 20. Whenever you use your second wind feature, you gain 1D10 + your class level temporary hit points.
 
-# 76. - Hauler [SOL]
+# 74. - Hauler [SOL]
 
 You are trained to carry heavy loads. Increase your Strength by 1 (max 20), and your carrying capacity is doubled.
 
-# 77. - *Healer* © [UB]
+# 75. - *Healer* © [UB]
 
 You gain proficiency or expertise in Medicine checks. You gain the ability to stabilize a dying creature once per long rest. You can use an action to restore 1d6 + 4 + character level hit points a number of times per long rest equal to your Wisdom modifier.
 
-# 78. - *Heavy Armor Master* © [UB]
+# 76. - *Heavy Armor Master* © [UB]
 
 You can use your armor to deflect strikes that would kill others. Increase your Strength by 1, to a maximum of 20. While you are wearing heavy armor, bludgeoning, piercing, and slashing damage that you take from attacks is reduced by 3.
 
-# 79. - Icy Touch [SOL]
+# 77. - Icy Touch [SOL]
 
 The first time each turn that you deal damage with an unarmed attack or weapon, you deal additional cold damage equal to your proficiency bonus.
 
-# 80. - Improved Critical [UB]
+# 78. - Improved Critical [UB]
 
-Your critical threshold is lowered by 1.
+Your weapon attacks score a critical hit on a roll of 19 or 20.
 
-# 81. - *Infernal Constitution* © [UB]
+# 79. - *Infernal Constitution* © [UB]
 
 Fiendish blood runs strong in you, unlocking a resilience akin to that possessed by some fiends. You gain the following benefits:
 • Increase your Constitution by 1, to a maximum of 20.
 • You have resistance to cold and poison damage.
 • You have advantage on saving throws against being poisoned.
 
-# 82. - Infusion Adept [UB]
+# 80. - Infusion Adept [UB]
 
 You have studied the art of infusing magic into mundane objects to create temporary magical items, granting you two level 2 or below infusions of your choice from the Artificer class.
 
-# 83. - Initiate Alchemist [SOL]
+# 81. - Initiate Alchemist [SOL]
 
 You gain proficiency with the Herbalism Kit and Poisoner's Kit.
   You gain proficiency in Nature. If you were already proficient, you gain expertise in Nature instead.
 
-# 84. - Initiate Enchanter [SOL]
+# 82. - Initiate Enchanter [SOL]
 
 You gain proficiency with the Manacalon Rosary, which is required to enchant items.
   You gain proficiency in Arcana. If you were already proficient, you gain expertise in Arcana instead.
 
-# 85. - *Inspiring Leader* © [UB]
+# 83. - *Inspiring Leader* © [UB]
 
 You can spend 10 minutes to inspire all friendly creatures, including you, within 30 ft of you. Each creature gains temporary hit points equal to your level + your Charisma modifier.
 
-# 86. - Lock Breaker [SOL]
+# 84. - Lock Breaker [SOL]
 
 You have spent a lot of time studying locks - how to craft them and how to pick them. You gain proficiency with thieves' tools, or double your existing proficiency if you are already proficient. You have advantage when using thieves' tools to pick locks.
 
-# 87. - Longsword Finesse [UB]
+# 85. - Longsword Finesse [UB]
 
 You are descended from a master of the longsword, and some of that mastery has passed on to you. You gain the following benefits:
 • Increase your Dexterity by 1, to a maximum of 20.
 • While you are holding a longsword, you gain a +1 bonus to armor class.
 • Longsword has the finesse property when you wield it.
 
-# 88. - *Lucky* © [UB]
+# 86. - *Lucky* © [UB]
 
 You have inexplicable luck that seems to kick in at just the right moment. You have 3 luck points. Whenever you miss an attack roll, fail an ability check, or a saving throw, you can spend one luck point to replace the d20. You can also spend one luck point when an attack roll is made against you. Roll a d20 and then choose whether the attack uses the attacker's roll or yours. You regain your expended luck points when you finish a long rest.
 
-# 89. - *Mage Slayer* © [UB]
+# 87. - *Mage Slayer* © [UB]
 
 You have practiced techniques in melee combat against spell-casters, gaining the following benefits:
 • When a creature within 5 feet of you casts a spell, you can use your reaction to make a melee weapon attack against that creature.
 • When you damage a creature that is concentrating on a spell, that creature has disadvantage on the saving throw it makes to maintain its concentration.
 • If you fail an Intelligence, a Wisdom, or a Charisma Saving Throw, you can cause yourself to succeed instead. Once you use this benefit, you can't use it again until you finish a Long Rest.
 
-# 90. - *Magic Initiate* © [UB]
+# 88. - *Magic Initiate* © [UB]
 
 Choose a class: bard, cleric, druid, sorcerer, warlock, or wizard. You learn two cantrips of your choice from that class's spell list. In addition, choose one 1st-level spell to learn from that same list. Using this feat, you can cast the spell once at its lowest level, and you must finish a long rest before you can cast it in this way again.
 
-# 91. - Manipulator [SOL]
+# 89. - Manipulator [SOL]
 
 You gain proficiency in Intimidation, Persuasion, and Deception. If you were already proficient, you gain expertise instead in the corresponding skill.
 
-# 92. - *Martial Adept* © [UB]
+# 90. - *Martial Adept* © [UB]
 
 You have martial training that allows you to perform special combat techniques called maneuvers:
 • You learn two maneuvers of your choice from the Battle Master subclass. The Maneuver DC of these maneuvers is 8 + proficiency bonus + Strength or Dexterity modifier, whichever is higher.
 • You gain 1 Superiority Die. The die is a d6, and it doesn't increase in size if you are not a Battle Master. This die is used to fuel your maneuvers. It is expended when you use it, and is regained when you finish a short or long rest.
 
-# 93. - Master Alchemist [SOL]
+# 91. - Master Alchemist [SOL]
 
 You have mastered the art of potion making. You need half the normal time to craft a potion and your proficiency bonus is doubled when making the roll to determine whether your crafting progresses.
  You have expert knowledge of all potions and can identify them automatically.
 
-# 94. - Master Enchanter [SOL]
+# 92. - Master Enchanter [SOL]
 
 You have mastered the art of enchanting items. You spend half the normal time to enchant an item and your proficiency bonus is doubled when performing the roll to determine whether your crafting progresses
 
-# 95. - *Medium Armor Master* © [UB]
+# 93. - *Medium Armor Master* © [UB]
 
 You have practiced moving in medium armor to gain the following benefits:
 • Wearing medium armor doesn't impose disadvantage on your Dexterity (Stealth) checks.
 • When you wear medium armor, you can add 3, rather than 2, to your AC if you have a Dexterity of 16 or higher.
 
-# 96. - Melting Touch [SOL]
+# 94. - Melting Touch [SOL]
 
 The first time each turn that you deal damage with an unarmed attack or weapon, you deal additional acid damage equal to your proficiency bonus.
 
-# 97. - *Menacing* © [UB]
+# 95. - *Menacing* © [UB]
 
 Increase your Charisma by 1, to a maximum of 20.
 • You gain proficiency with Intimidation skill or expertise if you are already proficient.
 • You can replace one main attack with an attempt to demoralize one humanoid you can see within 30 feet of you that can see and hear you. Make a Charisma (Intimidation) check contested by the target's Wisdom (Insight) check. If your check succeeds, the target is frightened until the end of your next turn. If your check fails, the target can't be frightened by you in this way for 1 hour.
 
-# 98. - Mender [SOL]
+# 96. - Mender [SOL]
 
 When you stabilize an ally with a Medicine check, they regain 1 HP.
 
-# 99. - *Metamagic Adept* © [UB]
+# 97. - Merciless [UB]
+
+When you reduce a target to 0 HP using a melee weapon attack on your turn, enemies within a radius of the downed target equal to half of your proficiency bonus (rounded up) who can see the target must make a Wisdom save (DC 8 + your proficiency bonus + your Strength modifier) or become frightened of you until the end of your next turn. If the triggering attack is a critical hit, the radius is instead equal to your proficiency bonus.
+
+# 98. - *Metamagic Adept* © [UB]
 
 You learn two metamagic options of your choice from the sorcerer class and gain half your proficiency bonus rounded up in sorcery points to spend on it.
 
-# 100. - Might of the Iron Legion [SOL]
+# 99. - Might of the Iron Legion [SOL]
 
 +1 STR to a maximum of 20
  You gain proficiency with Heavy Armor.
  You gain proficiency with Longswords, Greatswords, and Battleaxes.
 
-# 101. - Mighty Blow [SOL]
+# 100. - Mighty Blow [SOL]
 
 When you attack with a two-handed melee weapon, you deal additional damage equal to half your strength modifier (rounded up).
 
-# 102. - *Mobile* © [UB]
+# 101. - *Mobile* © [UB]
 
 You are exceptionally speedy and agile. Your speed increases by 10 ft, and you are immune to difficult terrain when dashing. When you make a melee attack against a creature you are immune to attack of opportunity from the creature unless it has immunity to that.
 
-# 103. - *Moderately Armored* © [UB]
+# 102. - *Moderately Armored* © [UB]
 
 Increase your Strength or Dexterity by 1, to a maximum of 20.
 You gain proficiency with medium armor and shields.
 
-# 104. - Monastic Shield Training [UB]
-
-You gain Shield proficiency, and they don't stop you from making unarmed attacks with that hand. In addition, all your monk abilities work even when wielding a Shield.
-
-# 105. - Monk Initiate [UB]
+# 103. - Monk Initiate [UB]
 
 You have learned some of the ways of the monk. You gain Ki points equals to your proficiency bonus, which you can spend to use Flurry of Blows, Patient Defense, or Step of the Wind.
 
-# 106. - Natural Fluidity [UB]
+# 104. - Natural Fluidity [UB]
 
 You may use a WildShape form to restore a spent spell slot, up to the maximum of a 3rd level spell slot. Alternatively, you may spend a 3rd level or higher spell slot to regain up to 2 WildShape forms. You can use it once per long rest.
 
-# 107. - Old Tactics [UB]
+# 105. - Old Tactics [UB]
 
 Increase your Strength or Dexterity by 1. Once per round, when a prone enemy within range of your melee weapon stands up you may make an attack of opportunity against the target.
 
-# 108. - *Orcish Aggression* © [UB]
+# 106. - *Orcish Aggression* © [UB]
 
 Your aggression burns tirelessly. You gain the following benefits:
 • Increase your Strength or Constitution by 1, up to a maximum of 20.
-• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon.
+• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon. This feature can be used proficiency bonus times per long rest.
 
-# 109. - *Orcish Fury* © [UB]
+# 107. - *Orcish Fury* © [UB]
 
 Your fury burns tirelessly. You gain the following benefits:
 • Increase your Strength or Constitution by 1, up to a maximum of 20.
 • When you hit with an attack made with a simple or martial weapon, you can roll one of the weapon's damage dice an additional time and add it as extra damage of the weapon's damage type. Once you use this ability, you can't use it again until you finish a short or long rest.
 • Immediately after you use your Relentless Endurance trait, you can use your reaction to make one weapon attack.
 
-# 110. - Pickpocket [UB]
+# 108. - Pickpocket [UB]
 
 You gain proficiency with Sleight of Hand, or expertise if already proficient. You also have advantage on Sleight of Hand Dexterity checks.
 
-# 111. - *Piercer* © [UB]
+# 109. - *Piercer* © [UB]
 
 Increase your Strength or Dexterity by 1, to a maximum of 20.
 When you hit a creature with an attack that deals piercing damage, you can re-roll dice when you roll a 1, and you must use the new roll. When you score a critical hit you can roll one additional damage die when determining the extra piercing damage the target takes.
 
-# 112. - *Poisoner* © [UB]
+# 110. - *Poisoner* © [UB]
 
 You have a profound understanding on how to manipulate poisons:
 • You gain proficiency with the poisoner's kit, or expertise if already proficient.
 • You gain the ability to apply a poison to your weapon as a bonus action.
 • When you make a damage roll, you ignore resistance to poison damage.
 
-# 113. - Poisonous Skin [UB]
+# 111. - Poisonous Skin [UB]
 
 Any creature that hits you in melee or is hit by your unarmed attack, shoves you or is shoved by you needs to succeed on Constitution saving throw (DC 8 + your proficiency bonus + your Constitution modifier) or become Poisoned for 1 minute.
 
-# 114. - *Polearm Master* © [UB]
+# 112. - *Polearm Master* © [UB]
 
 Your expert training with a polearm grants you these benefits:
 • When you take the Attack action and attack with only a polearm weapon, you can use a bonus action to make a melee attack with the opposite end of the weapon. This attack uses the same ability modifier as the primary attack and deals 1d4 bludgeoning damage.
 • Other creatures provoke an opportunity attack from you when they enter the reach you have with wielding a polearm weapon.
 
-# 115. - Potent Spellcaster [UB]
+# 113. - Potent Spellcaster [UB]
 
 You can add your spellcaster attribute modifier to the damage you deal with any cantrip in your repertoire.
 
-# 116. - Power Attack [UB]
+# 114. - Power Attack [UB]
 
 You have learned to trade accuracy to land deadlier blows. When attacking unarmed or with melee weapons, you can choose to take a -3 penalty to your attack roll in order to do additional damage equal to 3 + your proficiency bonus.
 
-# 117. - Powerful Cantrip [SOL]
+# 115. - Powerful Cantrip [SOL]
 
 When a creature succeeds on a saving throw against your cantrip or dodges your cantrip, the creature takes half damage but suffers no additional effect from the cantrip or from other sources like Agonizing Blast.
 
-# 118. - Precision Focused [UB]
+# 116. - Precision Focused [UB]
 
 Increase one of your mental attributes by 1, to a maximum of 20.
 You can use a bonus action to make weapon attacks count as magical and use selected mental attribute for attack and damage rolls for 1 minute. This feature can be used proficiency bonus times per long rest.
 
-# 119. - Primal Rage [UB]
+# 117. - Primal Rage [UB]
 
 Increase your Strength or Constitution by 1, to a maximum of 20. You gain one additional Rage usage between rests.
 
-# 120. - Raise Shield [SOL]
+# 118. - Raise Shield [SOL]
 
 When you are about to get hit by a ranged attack while wielding a shield, you can use your reaction to get +3 AC until the end of the attacker's turn. You also gain proficiency with shields.
 
-# 121. - Ready or Not [SOL]
+# 119. - Ready or Not [SOL]
 
 You have advantage on your attack rolls when using Ready Action.
 
-# 122. - Reckless Attack [UB]
+# 120. - Reckless Attack [UB]
 
 Before you make your first attack on your turn, you can decide to attack recklessly. Doing so gives you advantage on melee weapon attack rolls using Strength during this turn, but attack rolls against you have advantage until your next turn.
 
-# 123. - *Revenant Blade* © [UB]
+# 121. - *Revenant Blade* © [UB]
 
 You are descended from a master of the great sword, and some of that mastery has passed on to you. You gain the following benefits:
 • Increase your Dexterity or Strength by 1, to a maximum of 20.
 • While you are holding a great sword, you gain a +1 bonus to armor class.
 • Great sword has the finesse property when you wield it.
 
-# 124. - Robust [SOL]
+# 122. - Robust [SOL]
 
 Sturdy and tough, you increase your Constitution score by 1 (max 20) and when you use a hit die to regain hit points, roll twice and take the higher value.
 
-# 125. - Rush to Battle [SOL]
+# 123. - Rush to Battle [SOL]
 
 You can use your bonus action to increase your movement speed by 3 cells until the end of your turn, and get -2 to your AC, until the start of your next turn.
 
-# 126. - *Savage Attack* © [UB]
+# 124. - *Savage Attack* © [UB]
 
 Reroll weapon and spell damage dice when you roll a 1 (Not all damage sources re-roll dice. For example, sneak attack and smite damage are not re-rolled).
 
-# 127. - Scriber [UB]
+# 125. - Scriber [UB]
 
 Increase your Intelligence by 1, to a maximum of 20.
 You gain proficiency with scroll kit and Arcana, or expertise if already proficient.
 
-# 128. - *Second Chance* © [UB]
+# 126. - *Second Chance* © [UB]
 
 Increase your Dexterity, Constitution, or Charisma by 1, to a maximum of 20. When a creature you can see hits you with an attack roll, you can use your reaction to force that creature to reroll. Once you use this ability, you can't use it again until you roll initiative at the start of combat or until you finish a short or long rest.
 
-# 129. - *Sentinel* © [UB]
+# 127. - *Sentinel* © [UB]
 
 You have mastered techniques to take advantage of every drop in any enemy's guard:
 • When you hit a creature with an opportunity attack, the creature's speed becomes 0 for the rest of the turn.
 • Creatures provoke opportunity attacks from you even if they take the Disengage action before leaving your reach.
 • You can use your reaction to make a melee weapon attack against the attacking creature when a creature makes an attack against a target other than you.
 
-# 130. - *Sharpshooter* © [UB]
+# 128. - *Sharpshooter* © [UB]
 
 You have learned to trade accuracy to land deadlier shots:
 • When attacking with a ranged weapon, you can choose to take a -5 penalty to your attack roll in order to do additional +10 damage.
 • Attacks at long range don't impose disadvantage and ranged weapon attack ignores half cover and three-quarters cover.
 
-# 131. - *Shield Master* © [UB]
+# 129. - Shield Bash [UB]
+
+You can use your bonus action to bash a creature using your shield, turning it momentarily into a special improvised weapon that you are proficient with. Make a melee weapon attack against a creature within 5 feet of you using your Strength modifier for the attack. If you hit, the creature takes 1d4 + Strength modifier as bludgeoning damage.
+
+# 130. - *Shield Master* © [UB]
 
 You use shields not just for protection but also for offense. You gain the following benefits while you are wielding a shield:
 • If you take the Attack action on your turn, you can use a bonus action to try to shove a creature within 5 feet of you with your shield.
 • If you aren't incapacitated, gain +2 bonus to all Dexterity saving throws you make.
 • Whenever a damaging spell forces you to roll a Dexterity saving throw, you can use your reaction to halve any damage taken.
 
-# 132. - *Slasher* © [UB]
+# 131. - *Slasher* © [UB]
 
 Increase your Strength or Dexterity by 1, to a maximum of 20.
 When you hit a creature with an attack that deals slashing damage, you can reduce the speed of the target by 10 ft until the start of your next turn. When you score a critical hit you grievously wound it. Until the start of your next turn, the target has disadvantage on all attack rolls.
 
-# 133. - Slay thy Enemies [UB]
+# 132. - Slay thy Enemies [UB]
 
 You can use your bonus action and consume one ranger spell slot to focus your hunting knowledge against your enemies. You have a bonus to attack and damage rolls equal to the spell slot level used up to a maximum of 3. Against favored enemies you gain advantage on attack rolls instead pf attack roll bonus. This effect lasts for 2 rounds, plus 1 round per slot level used.
 
-# 134. - *Spear Mastery* © [UB]
+# 133. - *Spear Mastery* © [UB]
 
 Though the spear is a simple weapon to learn, it rewards you for the time you have taken to master it:
 • You gain a +1 bonus to attack rolls you make with a spear and its damage die changes from a d6 to a d8, and from a d8 to a d10 when wielded with two hands.
 • As a bonus action you can brace your spear to intercept approaching enemies. You can use reaction to perform attack of opportunity with a spear on enemy that enters your reach and deal extra die of damage if that attack hits.
 • As a bonus action, you can increase your reach with a spear by 5 ft for the rest of your turn.
 
-# 135. - *Spell Sniper* © [UB]
+# 134. - *Spell Sniper* © [UB]
 
 You learn one cantrip that requires an attack roll. Choose the cantrip from the bard, cleric, druid, sorcerer, warlock, or wizard spell list. When you cast a spell that requires you to make an attack roll, the spell's range is doubled. Your ranged spell attacks ignore half cover and three-quarters cover.
 
-# 136. - Spiritual Fluidity [UB]
+# 135. - Spiritual Fluidity [UB]
 
 You may use a Channel Divinity usage to restore a spent spell slot, up to the maximum of a 3rd level spell slot. Alternatively, you may spend a 3rd level or higher spell slot to regain up to 3 Channel Divinity usages. You can use it once per long rest.
 
-# 137. - *Squat Nimbleness* © [UB]
+# 136. - *Squat Nimbleness* © [UB]
 
 You are uncommonly nimble for your race. Increase your Strength or Dexterity by 1, to a maximum of 20. Increase your walking speed by 5 ft. You gain proficiency or expertise in the Athletics skill if Strength is increased or Acrobatics skill if Dexterity is increased.
 
-# 138. - *Stealthy* © [UB]
+# 137. - *Stealthy* © [UB]
 
 You know how best to hide. You gain the following benefits:
 • Increase your Dexterity by 1, to a maximum of 20.
 • You gain proficiency with Stealthy skill or expertise if you are already proficient.
 • If you are hidden, you can move in the open without revealing yourself if you end the move in a position where you're not clearly visible.
 
-# 139. - Sturdiness of the Tundra [SOL]
+# 138. - Sturdiness of the Tundra [SOL]
 
 +1 CON to a maximum of 20 
  You gain proficiency with Medium Armor.
  You gain proficiency with Warhammers, and Light and Heavy Crossbows.
 
-# 140. - Superior Critical [UB]
+# 139. - Superior Critical [UB]
 
-Your critical threshold is lowered by 1.
+Your weapon attacks score a critical hit on a roll of 18, 19 or 20.
 
-# 141. - Take Aim [SOL]
+# 140. - Take Aim [SOL]
 
 You can use your bonus action to take aim. Until the end of your turn, your ranged weapon attacks have no disadvantage or advantage, no matter the conditions.
 
-# 142. - *Telekinetic* © [UB]
+# 141. - *Telekinetic* © [UB]
 
 Increase one of your mental attributes by 1, to a maximum of 20.
 As a bonus action during combat, you can telekinetically move one creature you can see within 30 ft of you. The target must succeed on a Strength saving throw (DC 8 + your proficiency bonus + your chosen attributes modifier) or be moved 5 ft in a direction of your choosing.
 
-# 143. - *Theologian* © [UB]
+# 142. - *Theologian* © [UB]
 
 Your extensive study of religion rewards you with the following benefits.
 • Increase your Intelligence by 1, to a maximum of 20.
 • You gain proficiency with Religious skill or expertise if you are already proficient.
 • You learn the Detect Evil and Good spell. You can cast Detect Evil and Good once without expending a spell slot, and you regain the ability to do so when you finish a long rest.
 
+# 143. - Thrown Weapons Master [UB]
+
+When you are making a ranged attack with a thrown weapon, increase its short range by 10 feet and its long range by 20 feet. In addition, the weapon returns into your hand immediately after it is used to make a thrown attack.
+
 # 144. - Touched Magic [UB]
 
 Increase one of your mental attributes by 1, to a maximum of 20.
@@ -764,7 +757,7 @@ You have practiced extensively with a variety of weapons, gaining the following
 
 # 155. - Wise Archery [UB]
 
-Your intuition guides your hand when using a bow. Increase your Wisdom attribute by 1, to a maximum of 20. You can use your Wisdom modifier instead of your Dexterity modifer for the attack and damage rolls with these weapons.
+Your intuition guides your hand when using a bow. Increase your Wisdom attribute by 1, to a maximum of 20. You can use your Wisdom modifier instead of your Dexterity modifier for the attack and damage rolls with these weapons.
 
 # 156. - *Wood-Elf Magic* © [UB]
 
diff --git a/Documentation/FightingStyles.md b/Documentation/FightingStyles.md
index 208c90854a..7d74b439b1 100644
--- a/Documentation/FightingStyles.md
+++ b/Documentation/FightingStyles.md
@@ -2,45 +2,45 @@
 
 You gain a +2 bonus to attack rolls with ranged weapons.
 
-# 2. - *Blind Fighting* © [UB]
+# 2. - Astral Reach [UB]
+
+Your Unarmed Strike reach increases by 5 ft.
+
+# 3. - *Blind Fighting* © [UB]
 
 You have blind sight with a range of 10 ft. Within that range, you can effectively see anything that isn't behind total cover, even if you're blinded or in darkness. Moreover, you can see an invisible creature within that range, unless the creature successfully hides from you.
 
-# 3. - Classical Swordplay [UB]
+# 4. - Classical Swordplay [UB]
 
-While wielding a melee one-handed or versatile weapon and no other weapon or shield, you gain a +1 bonus to your attack rolls with the weapon and a +1 to your Armor Class.
+You gain a +1 bonus to your attack rolls and a +1 to bonus to your Armor Class while wielding a melee one-handed or versatile weapon and no other weapon or shield.
 
-# 4. - Crippling [UB]
+# 5. - Crippling [UB]
 
-Upon hitting with a melee attack, you can reduce the speed of your opponents by 10 ft and reduce their armor class by 1 until the end of your next turn.
+You reduce the speed of your opponents by 10 ft until the end of your next turn on a melee attack hit.
 
-# 5. - Defense [SOL]
+# 6. - Defense [SOL]
 
 While you are wearing armor, you gain a +1 bonus to AC.
 
-# 6. - Dueling [SOL]
+# 7. - Dueling [SOL]
 
 When you are wielding a melee weapon in one hand and no other weapons, you gain a +2 bonus to damage rolls with that weapon.
 
-# 7. - Executioner [UB]
+# 8. - Executioner [UB]
 
-You add your proficiency bonus to damage against creatures that are blinded, frightened, restrained, incapacitated, paralyzed, prone or stunned.
+You add your proficiency bonus to damage against blinded, frightened, restrained, incapacitated, paralyzed, prone or stunned creatures.
 
-# 8. - Great Weapon Fighting [SOL]
+# 9. - Great Weapon Fighting [SOL]
 
 When you roll a 1 or 2 on a damage die for an attack you make with a melee weapon that you are wielding with two hands, you can reroll the die. You must use the new roll, even if it is a 1 or a 2. The weapon must have the two-handed or versatile property for you to gain this benefit.
 
-# 9. - *Interception* © [UB]
+# 10. - *Interception* © [UB]
 
 When a creature you can see hits a target, other than you, within 5 feet of you with an attack, you can use your reaction to reduce the damage the target takes by 1d10 + your proficiency bonus. You must wield a shield or a simple or martial weapon to use this reaction.
 
-# 10. - Lunger [UB]
-
-While wielding only one melee weapon without the heavy tag and a free offhand, that weapon's range increases by 5 ft.
-
-# 11. - Merciless [UB]
+# 11. - Lunger [UB]
 
-When you reduce a target to 0 HP using a melee weapon attack on your turn, enemies within a radius of the downed target equal to half of your proficiency bonus (rounded up) who can see the target must make a Wisdom save (DC 8 + your proficiency bonus + your Strength modifier) or become frightened of you until the end of your next turn. If the triggering attack is a critical hit, the radius is instead equal to your proficiency bonus.
+Your melee weapon reach increases by 5 ft while wielding a weapon without the heavy tag and no other weapon or shield.
 
 # 12. - Protection [SOL]
 
@@ -48,27 +48,19 @@ When a creature you can see attacks a target other than you that is within one c
 
 # 13. - Pugilist [UB]
 
-Your unarmed strikes deal an additional 1d4 bludgeoning damage, and you can punch with your offhand as a bonus action. You can shove as a bonus action if you have free hand.
-
-# 14. - Rope it Up [UB]
-
-Your thrown strikes get +1 to attack and damage rolls, you increase both it's long and short range by 10 feet, and it returns to your hand immediately after it is used to make a thrown attack.
-
-# 15. - Shield Expert [UB]
-
-You have trained in the use of a shield as a weapon. It becomes a melee weapon that you are proficient with that deals 1d4 bludgeoning damage. You gain advantage on shove attempts while wielding a shield.
+Your unarmed strikes deal an additional 1d4 bludgeoning damage, and you can punch with your offhand as a bonus action. You can shove as a bonus action if you have no other weapon or shield.
 
-# 16. - *Superior Technique* © [UB]
+# 14. - *Superior Technique* © [UB]
 
 You have martial training that allows you to perform special combat techniques called maneuvers:
 • You learn one maneuver of your choice from the Battle Master subclass. The Maneuver DC of these maneuvers is 8 + proficiency bonus + Strength or Dexterity modifier, whichever is higher.
 • You gain 1 Superiority Die. The die is a d6, and it doesn't increase in size if you are not a Battle Master. This die is used to fuel your maneuvers. It is expended when you use it, and is regained when you finish a short or long rest.
 
-# 17. - Torchbearer [UB]
+# 15. - Torchbearer [UB]
 
-You are skilled in the use of a torch in battle. Once per turn, as a bonus action, you may elect to use a light source you have equipped to attempt to set an enemy you can touch on fire. Your target must succeed on a Dexterity saving throw (DC 8 + your proficiency bonus + your Dexterity modifier) or take 1d4 fire damage per turn for 1 minute or until extinguished.
+As a bonus action, you may elect to use a light source you have equipped to attempt to set an enemy you can touch on fire. Your target must succeed on a Dexterity saving throw (DC 8 + your proficiency bonus + your Dexterity modifier) or take 1d4 fire damage per turn for 1 minute or until extinguished.
 
-# 18. - Two Weapon Fighting [SOL]
+# 16. - Two Weapon Fighting [SOL]
 
 When you engage in two-weapon fighting, you can add your ability modifier to the damage of the second attack.
 
diff --git a/Documentation/Subclasses.md b/Documentation/Subclasses.md
index 311b7707cd..e4d3ae2f6e 100644
--- a/Documentation/Subclasses.md
+++ b/Documentation/Subclasses.md
@@ -29,7 +29,7 @@ Learn and have always prepared:
 
 	IV	Fire Shield, Greater Invisibility
 
-	V	Far Step, Wall of Force
+	V	Far Step, Hold Monster
 
 
 
@@ -134,7 +134,7 @@ Learn and have always prepared:
 
 	IV	Fire Shield, Death Ward
 
-	V	Mass Cure Wounds, Wall of Force
+	V	Mass Cure Wounds, Telekinesis
 
 
 
@@ -3700,7 +3700,7 @@ In your list and always prepared:
 
 	IV	Dominate Beast, Guardian of Faith
 
-	V	Hold Monster, Wall of Force
+	V	Hold Monster, Mass Cure Wounds
 
 
 ### Level 7
diff --git a/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs b/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs
index 021fca35f6..3bc56557f5 100644
--- a/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs
+++ b/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs
@@ -1551,9 +1551,6 @@ internal static class FeatureDefinitionMovementAffinitys
         internal static FeatureDefinitionMovementAffinity MovementAffinityConditionFlyingAdaptive { get; } =
             GetDefinition<FeatureDefinitionMovementAffinity>("MovementAffinityConditionFlyingAdaptive");
 
-        internal static FeatureDefinitionMovementAffinity MovementAffinityConditionHindered { get; } =
-            GetDefinition<FeatureDefinitionMovementAffinity>("MovementAffinityConditionHindered");
-
         internal static FeatureDefinitionMovementAffinity MovementAffinityConditionRestrained { get; } =
             GetDefinition<FeatureDefinitionMovementAffinity>("MovementAffinityConditionRestrained");
 
@@ -1791,9 +1788,6 @@ internal static class FeatureDefinitionPowers
         internal static FeatureDefinitionPower PowerDragonBreath_Acid_Spectral_DLC3 { get; } =
             GetDefinition<FeatureDefinitionPower>("PowerDragonBreath_Acid_Spectral_DLC3");
 
-        internal static FeatureDefinitionPower PowerDragonBreath_Cold { get; } =
-            GetDefinition<FeatureDefinitionPower>("PowerDragonBreath_Cold");
-
         internal static FeatureDefinitionPower PowerDragonBreath_Fire { get; } =
             GetDefinition<FeatureDefinitionPower>("PowerDragonBreath_Fire");
 
diff --git a/SolastaUnfinishedBusiness/Api/GameExtensions/EnumExtensions.cs b/SolastaUnfinishedBusiness/Api/GameExtensions/EnumExtensions.cs
index 6e8d74c5d7..e297f57ecc 100644
--- a/SolastaUnfinishedBusiness/Api/GameExtensions/EnumExtensions.cs
+++ b/SolastaUnfinishedBusiness/Api/GameExtensions/EnumExtensions.cs
@@ -15,8 +15,6 @@ internal enum ExtraActionId
     CastInvocationNoCost,
     CastPlaneMagicBonus,
     CastPlaneMagicMain,
-    CastSignatureSpellsMain,
-    CastSpellMasteryMain,
     CombatRageStart,
     CombatWildShape,
     CompellingStrikeToggle,
diff --git a/SolastaUnfinishedBusiness/Api/GameExtensions/GameLocationCharacterExtensions.cs b/SolastaUnfinishedBusiness/Api/GameExtensions/GameLocationCharacterExtensions.cs
index b02ee7e405..32f7cc3894 100644
--- a/SolastaUnfinishedBusiness/Api/GameExtensions/GameLocationCharacterExtensions.cs
+++ b/SolastaUnfinishedBusiness/Api/GameExtensions/GameLocationCharacterExtensions.cs
@@ -54,10 +54,13 @@ public static bool CanPerceiveTarget(
             return true;
         }
 
-        if (!Main.Settings.UseOfficialLightingObscurementAndVisionRules)
+        var vanillaCanPerceive =
+            (__instance.Side == target.Side && __instance.PerceivedAllies.Contains(target)) ||
+            (__instance.Side != target.Side && __instance.PerceivedFoes.Contains(target));
+
+        if (!Main.Settings.UseOfficialLightingObscurementAndVisionRules || !vanillaCanPerceive)
         {
-            return (__instance.Side == target.Side && __instance.PerceivedAllies.Contains(target)) ||
-                   (__instance.Side != target.Side && __instance.PerceivedFoes.Contains(target));
+            return vanillaCanPerceive;
         }
 
         // can only perceive targets on cells that can be perceived
diff --git a/SolastaUnfinishedBusiness/Api/GameExtensions/RulesetCharacterExtensions.cs b/SolastaUnfinishedBusiness/Api/GameExtensions/RulesetCharacterExtensions.cs
index a627714b66..af69bbae32 100644
--- a/SolastaUnfinishedBusiness/Api/GameExtensions/RulesetCharacterExtensions.cs
+++ b/SolastaUnfinishedBusiness/Api/GameExtensions/RulesetCharacterExtensions.cs
@@ -249,13 +249,13 @@ internal static List<RulesetAttackMode> GetAttackModesByActionType([NotNull] thi
             .Where(a => !a.AfterChargeOnly && a.ActionType == actionType)
             .ToList();
     }
-#endif
 
     internal static bool CanAddAbilityBonusToOffhand(this RulesetCharacter instance)
     {
         return instance.GetSubFeaturesByType<IAttackModificationProvider>()
             .Any(p => p.CanAddAbilityBonusToSecondary);
     }
+#endif
 
     [CanBeNull]
     internal static RulesetItem GetItemInSlot([CanBeNull] this RulesetCharacter instance, string slot)
diff --git a/SolastaUnfinishedBusiness/Behaviors/AddExtraAttack.cs b/SolastaUnfinishedBusiness/Behaviors/AddExtraAttack.cs
index 6668694d07..6ace13aebc 100644
--- a/SolastaUnfinishedBusiness/Behaviors/AddExtraAttack.cs
+++ b/SolastaUnfinishedBusiness/Behaviors/AddExtraAttack.cs
@@ -4,11 +4,11 @@
 using JetBrains.Annotations;
 using SolastaUnfinishedBusiness.Api;
 using SolastaUnfinishedBusiness.Api.GameExtensions;
+using SolastaUnfinishedBusiness.Api.LanguageExtensions;
 using SolastaUnfinishedBusiness.Behaviors.Specific;
 using SolastaUnfinishedBusiness.Interfaces;
 using SolastaUnfinishedBusiness.Validators;
 using static RuleDefinitions;
-using static FeatureDefinitionAttributeModifier;
 
 namespace SolastaUnfinishedBusiness.Behaviors;
 
@@ -329,28 +329,24 @@ private void AddItemAttack(
             item
         );
 
+        var effectDamageForms = attackMode.EffectDescription.EffectForms
+            .Where(x => x.FormType == EffectForm.EffectFormType.Damage)
+            .ToList();
+
+        if (effectDamageForms.Count != 0)
+        {
+            effectDamageForms[0] = EffectForm.GetCopy(effectDamageForms[0]);
+            effectDamageForms[0].DamageForm.DamageType = DamageTypeBludgeoning;
+            effectDamageForms[0].DamageForm.DieType = DieType.D4;
+            effectDamageForms[0].DamageForm.DiceNumber = 1;
+            effectDamageForms[0].DamageForm.versatile = false;
+        }
+
         attackMode.Reach = true;
         attackMode.Ranged = false;
         attackMode.Thrown = false;
-
-        // this is required to correctly interact with Spear Mastery dice upgrade
-        attackMode.AttackTags.Add("Polearm");
-
-        var damage = DamageForm.GetCopy(attackMode.EffectDescription.FindFirstDamageForm());
-
-        damage.DieType = DieType.D4;
-        damage.VersatileDieType = DieType.D4;
-        damage.versatile = false;
-        damage.DiceNumber = 1;
-        damage.DamageType = DamageTypeBludgeoning;
-
-        var effectForm = EffectForm.Get();
-
-        effectForm.FormType = EffectForm.EffectFormType.Damage;
-        effectForm.DamageForm = damage;
-        attackMode.EffectDescription.Clear();
-        attackMode.EffectDescription.EffectForms.Add(effectForm);
-
+        attackMode.AttackTags.Add("Polearm"); // required to correctly interact with Spear Mastery dice upgrade
+        attackMode.EffectDescription.EffectForms.SetRange(effectDamageForms);
         attackModes.Add(attackMode);
     }
 }
@@ -383,51 +379,31 @@ protected override List<RulesetAttackMode> GetAttackModes([NotNull] RulesetChara
             offHandItem.ItemDefinition,
             ShieldStrike.ShieldWeaponDescription,
             ValidatorsCharacter.IsFreeOffhand(hero),
-            hero.CanAddAbilityBonusToOffhand(),
+            true,
             EquipmentDefinitions.SlotTypeOffHand,
             attackModifiers,
             hero.FeaturesOrigin,
-            offHandItem
-        );
+            offHandItem);
 
-        var attackModes = new List<RulesetAttackMode> { attackMode };
-        var features = new List<FeatureDefinition>();
+        var damageForm = attackMode.EffectDescription.FindFirstDamageForm();
 
-        offHandItem.EnumerateFeaturesToBrowse<FeatureDefinitionAttributeModifier>(features);
-
-        var bonus = features
-            .OfType<FeatureDefinitionAttributeModifier>()
-            .Where(x =>
-                x.ModifiedAttribute == AttributeDefinitions.ArmorClass &&
-                x.ModifierOperation == AttributeModifierOperation.Additive)
-            .Sum(x => x.ModifierValue);
-
-        if (offHandItem.ItemDefinition.Magical || bonus > 0)
+        if (damageForm != null)
         {
-            attackMode.AddAttackTagAsNeeded(TagsDefinitions.MagicalWeapon);
-        }
+            var trend = damageForm.DamageBonusTrends.FirstOrDefault(x => x.sourceName == "Dueling");
 
-        if (bonus == 0)
-        {
-            return attackModes;
+            if (trend.sourceName == "Dueling")
+            {
+                damageForm.DamageBonusTrends.Remove(trend);
+                damageForm.BonusDamage -= 2;
+            }
         }
 
-        var damage = attackMode.EffectDescription?.FindFirstDamageForm();
-        var trendInfo = new TrendInfo(bonus, FeatureSourceType.Equipment,
-            offHandItem.ItemDefinition.GuiPresentation.Title, null);
-
-        attackMode.ToHitBonus += bonus;
-        attackMode.ToHitBonusTrends.Add(trendInfo);
-
-        if (damage == null)
+        if (offHandItem.ItemDefinition.Magical)
         {
-            return attackModes;
+            attackMode.AddAttackTagAsNeeded(TagsDefinitions.MagicalWeapon);
         }
 
-        damage.BonusDamage += bonus;
-        damage.DamageBonusTrends.Add(trendInfo);
-
-        return attackModes;
+        return [attackMode];
     }
 }
 
diff --git a/SolastaUnfinishedBusiness/Behaviors/CustomSituationalContext.cs b/SolastaUnfinishedBusiness/Behaviors/CustomSituationalContext.cs
index 26e3e01ffa..7ff33f43f6 100644
--- a/SolastaUnfinishedBusiness/Behaviors/CustomSituationalContext.cs
+++ b/SolastaUnfinishedBusiness/Behaviors/CustomSituationalContext.cs
@@ -38,8 +38,8 @@ internal static bool IsContextValid(
 
             ExtraSituationalContext.HasBladeMasteryWeaponTypesInHands =>
                 ValidatorsCharacter.HasWeaponType(
-                    DaggerType, ShortswordType, LongswordType, ScimitarType, RapierType, GreatswordType)
-                (contextParams.source),
+                        DaggerType, ShortswordType, LongswordType, ScimitarType, RapierType, GreatswordType)
+                    (contextParams.source),
 
             ExtraSituationalContext.HasSimpleOrMartialWeaponInHands =>
                 ValidatorsCharacter.HasWeaponType(SimpleOrMartialWeapons)(contextParams.source),
diff --git a/SolastaUnfinishedBusiness/Builders/Features/FeatureDefinitionActionAffinityBuilder.cs b/SolastaUnfinishedBusiness/Builders/Features/FeatureDefinitionActionAffinityBuilder.cs
index 2c00ca70d0..10ecd57aa9 100644
--- a/SolastaUnfinishedBusiness/Builders/Features/FeatureDefinitionActionAffinityBuilder.cs
+++ b/SolastaUnfinishedBusiness/Builders/Features/FeatureDefinitionActionAffinityBuilder.cs
@@ -45,12 +45,14 @@ internal FeatureDefinitionActionAffinityBuilder SetRestrictedActions(params Acti
         return this;
     }
 
+#if false
     internal FeatureDefinitionActionAffinityBuilder SetActionExecutionModifiers(
         params ActionDefinitions.ActionExecutionModifier[] modifiers)
     {
         Definition.ActionExecutionModifiers.SetRange(modifiers);
         return this;
     }
+#endif
 
     internal FeatureDefinitionActionAffinityBuilder SetAllowedActionTypes(
         bool main = true,
diff --git a/SolastaUnfinishedBusiness/ChangelogHistory.txt b/SolastaUnfinishedBusiness/ChangelogHistory.txt
index 4bbd9855c9..aac00a7fde 100644
--- a/SolastaUnfinishedBusiness/ChangelogHistory.txt
+++ b/SolastaUnfinishedBusiness/ChangelogHistory.txt
@@ -1,3 +1,28 @@
+1.5.97.9:
+
+- converted Astral Reach feat to fighting style and removed +1 to WIS and opportunity attacks
+- converted Improved Critical, and Superior Critical feats to set a critical range instead of a decrement
+- converted Merciless fighting style to feat
+- converted Rope it Up to Thrown Weapons Master feat, increased ranges by 10ft, removed +1 to hit and to damage
+- converted Shield Expert fighting style to Shield Bash feat and removed restrictions with Dueling
+- fixed Arcane Archer guided shot to consume a reaction
+- fixed Chaos Bolt, Witch Bolt, and Wither and Bloom collateral scenarios
+- fixed mod items and monsters bleeding into dungeon maker
+- fixed non implemented Wall of Force on Armorer, Battle Smith, and Oath of Altruism
+- fixed Polearm Expert to consider all additional weapon dice damage on bonus attack
+- fixed Roguish Duelist reflexive party to be once per turn
+- fixed Wizard Spell Mastery, and Signature Spells [RESPEC is required for any Wizard above 18th]
+- hided Hammer the Point, and Monastic Shield Training
+- removed -1 AC debuff from Crippling fighting style
+- removed finesse requirement from Defensive Duelist feat
+- replaced STR damage bonus on Bow Mastery and Crossbow Mastery feats with DEX weapon bonus, all bows/cross get it
+
+KNOWN ISSUES:
+
+- Artillerist Force Ballista tiny cannon doesn't force attack DIS within 5 ft
+- Artillerist Fortified Position medium cannon doesn't grant buff to self
+- Chaos Bolt, and Wither and Bloom don't behave well under multiplayer [first one crashes, second one doubles the damage]
+
 1.5.97.8:
 
 - added Stealthy feat
diff --git a/SolastaUnfinishedBusiness/Definitions/InvocationPoolTypeCustom.cs b/SolastaUnfinishedBusiness/Definitions/InvocationPoolTypeCustom.cs
index 3e35769db4..e482b2ce6c 100644
--- a/SolastaUnfinishedBusiness/Definitions/InvocationPoolTypeCustom.cs
+++ b/SolastaUnfinishedBusiness/Definitions/InvocationPoolTypeCustom.cs
@@ -202,14 +202,6 @@ internal static class Pools
             Register("Infusion", requireClassLevel: InventorClass.ClassName,
                 main: (Id)ExtraActionId.InventorInfusion);
 
-        internal static readonly InvocationPoolTypeCustom SpellMastery =
-            Register("SpellMastery",
-                main: (Id)ExtraActionId.CastSpellMasteryMain, hidden: true);
-
-        internal static readonly InvocationPoolTypeCustom SignatureSpells =
-            Register("SignatureSpells", requireClassLevel: CharacterClassDefinitions.Wizard.Name,
-                main: (Id)ExtraActionId.CastSignatureSpellsMain, hidden: true);
-
         internal static readonly InvocationPoolTypeCustom Gambit =
             Register("Gambit", requireClassLevel: MartialTactician.Name,
                 main: (Id)ExtraActionId.TacticianGambitMain,
diff --git a/SolastaUnfinishedBusiness/Displays/CharacterDisplay.cs b/SolastaUnfinishedBusiness/Displays/CharacterDisplay.cs
index 8e0fc0bad7..b31239b1a5 100644
--- a/SolastaUnfinishedBusiness/Displays/CharacterDisplay.cs
+++ b/SolastaUnfinishedBusiness/Displays/CharacterDisplay.cs
@@ -32,6 +32,22 @@ internal static void DisplayCharacter()
             Main.Settings.DisableSenseSuperiorDarkVisionFromAllRaces = toggle;
         }
 
+        toggle = Main.Settings.AddDarknessPerceptiveToDarkRaces;
+        if (UI.Toggle(Gui.Localize("ModUi/&AddDarknessPerceptiveToDarkRaces"), ref toggle, UI.AutoWidth()))
+        {
+            Main.Settings.AddDarknessPerceptiveToDarkRaces = toggle;
+            CharacterContext.SwitchDarknessPerceptive();
+        }
+
+        UI.Label();
+
+        toggle = Main.Settings.RaceLightSensitivityApplyOutdoorsOnly;
+        if (UI.Toggle(Gui.Localize("ModUi/&RaceLightSensitivityApplyOutdoorsOnly"), ref toggle, UI.AutoWidth()))
+        {
+            Main.Settings.RaceLightSensitivityApplyOutdoorsOnly = toggle;
+        }
+
+        UI.Label();
         UI.Label();
 
         toggle = Main.Settings.AddHelpActionToAllRaces;
@@ -338,6 +354,12 @@ internal static void DisplayCharacter()
             CharacterContext.SwitchRogueSteadyAim();
         }
 
+        toggle = Main.Settings.EnableRogueStrSaving;
+        if (UI.Toggle(Gui.Localize("ModUi/&EnableRogueStrSaving"), ref toggle, UI.AutoWidth()))
+        {
+            Main.Settings.EnableRogueStrSaving = toggle;
+        }
+
         UI.Label();
         UI.Label(Gui.Localize("ModUi/&Visuals"));
         UI.Label();
diff --git a/SolastaUnfinishedBusiness/Displays/ProficienciesDisplay.cs b/SolastaUnfinishedBusiness/Displays/ProficienciesDisplay.cs
index 270addd389..9ba2f9d935 100644
--- a/SolastaUnfinishedBusiness/Displays/ProficienciesDisplay.cs
+++ b/SolastaUnfinishedBusiness/Displays/ProficienciesDisplay.cs
@@ -129,13 +129,13 @@ private static void OtherHeaders()
         using (UI.HorizontalScope())
         {
             UI.ActionButton(Gui.Localize("ModUi/&DocsArcaneShots").Bold().Khaki(),
-                () => UpdateContext.OpenDocumentation("ArcaneShots.md"), UI.Width(200f));
-            2.Space();
-            UI.ActionButton(Gui.Localize("ModUi/&DocsManeuvers").Bold().Khaki(),
-                () => UpdateContext.OpenDocumentation("Maneuvers.md"), UI.Width(200f));
-            2.Space();
+                () => UpdateContext.OpenDocumentation("ArcaneShots.md"), UI.Width(150f));
             UI.ActionButton(Gui.Localize("ModUi/&DocsInfusions").Bold().Khaki(),
-                () => UpdateContext.OpenDocumentation("Infusions.md"), UI.Width(200f));
+                () => UpdateContext.OpenDocumentation("Infusions.md"), UI.Width(150f));
+            UI.ActionButton(Gui.Localize("ModUi/&DocsManeuvers").Bold().Khaki(),
+                () => UpdateContext.OpenDocumentation("Maneuvers.md"), UI.Width(150f));
+            UI.ActionButton(Gui.Localize("ModUi/&DocsVersatilities").Bold().Khaki(),
+                () => UpdateContext.OpenDocumentation("Versatilities.md"), UI.Width(150f));
         }
 
         UI.Label();
diff --git a/SolastaUnfinishedBusiness/Displays/RulesDisplay.cs b/SolastaUnfinishedBusiness/Displays/RulesDisplay.cs
index 2e36be40fe..dc92cdbaf2 100644
--- a/SolastaUnfinishedBusiness/Displays/RulesDisplay.cs
+++ b/SolastaUnfinishedBusiness/Displays/RulesDisplay.cs
@@ -210,14 +210,6 @@ internal static void DisplayRules()
 
         UI.Label();
 
-        toggle = Main.Settings.AllowTargetingSelectionWhenCastingChainLightningSpell;
-        if (UI.Toggle(Gui.Localize("ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell"), ref toggle,
-                UI.AutoWidth()))
-        {
-            Main.Settings.AllowTargetingSelectionWhenCastingChainLightningSpell = toggle;
-            SrdAndHouseRulesContext.SwitchAllowTargetingSelectionWhenCastingChainLightningSpell();
-        }
-
         toggle = Main.Settings.RemoveHumanoidFilterOnHideousLaughter;
         if (UI.Toggle(Gui.Localize("ModUi/&RemoveHumanoidFilterOnHideousLaughter"), ref toggle, UI.AutoWidth()))
         {
@@ -225,8 +217,6 @@ internal static void DisplayRules()
             SrdAndHouseRulesContext.SwitchFilterOnHideousLaughter();
         }
 
-        UI.Label();
-
         toggle = Main.Settings.AddBleedingToLesserRestoration;
         if (UI.Toggle(Gui.Localize("ModUi/&AddBleedingToLesserRestoration"), ref toggle, UI.AutoWidth()))
         {
@@ -289,6 +279,8 @@ internal static void DisplayRules()
             SrdAndHouseRulesContext.SwitchEldritchBlastRange();
         }
 
+        UI.Label();
+
         toggle = Main.Settings.FixRingOfRegenerationHealRate;
         if (UI.Toggle(Gui.Localize("ModUi/&FixRingOfRegenerationHealRate"), ref toggle, UI.AutoWidth()))
         {
@@ -431,10 +423,10 @@ internal static void DisplayRules()
             CharacterContext.SwitchDragonbornElementalBreathUsages();
         }
 
-        toggle = Main.Settings.EnableRogueStrSaving;
-        if (UI.Toggle(Gui.Localize("ModUi/&EnableRogueStrSaving"), ref toggle, UI.AutoWidth()))
+        toggle = Main.Settings.EnableSignatureSpellsRelearn;
+        if (UI.Toggle(Gui.Localize("ModUi/&EnableSignatureSpellsRelearn"), ref toggle, UI.AutoWidth()))
         {
-            Main.Settings.EnableRogueStrSaving = toggle;
+            Main.Settings.EnableSignatureSpellsRelearn = toggle;
         }
 
         UI.Label();
@@ -500,23 +492,6 @@ internal static void DisplayRules()
 
         UI.Label();
 
-        toggle = Main.Settings.AddDarknessPerceptiveToDarkRaces;
-        if (UI.Toggle(Gui.Localize("ModUi/&AddDarknessPerceptiveToDarkRaces"), ref toggle, UI.AutoWidth()))
-        {
-            Main.Settings.AddDarknessPerceptiveToDarkRaces = toggle;
-            CharacterContext.SwitchDarknessPerceptive();
-        }
-
-        UI.Label();
-
-        toggle = Main.Settings.RaceLightSensitivityApplyOutdoorsOnly;
-        if (UI.Toggle(Gui.Localize("ModUi/&RaceLightSensitivityApplyOutdoorsOnly"), ref toggle, UI.AutoWidth()))
-        {
-            Main.Settings.RaceLightSensitivityApplyOutdoorsOnly = toggle;
-        }
-
-        UI.Label();
-
         var intValue = Main.Settings.SenseNormalVisionRangeMultiplier;
 
         using (UI.HorizontalScope())
diff --git a/SolastaUnfinishedBusiness/Feats/CriticalVirtuosoFeats.cs b/SolastaUnfinishedBusiness/Feats/CriticalVirtuosoFeats.cs
index d7dad6e4f3..5b42941cab 100644
--- a/SolastaUnfinishedBusiness/Feats/CriticalVirtuosoFeats.cs
+++ b/SolastaUnfinishedBusiness/Feats/CriticalVirtuosoFeats.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using SolastaUnfinishedBusiness.Api;
 using SolastaUnfinishedBusiness.Api.LanguageExtensions;
 using SolastaUnfinishedBusiness.Builders;
 using SolastaUnfinishedBusiness.Builders.Features;
 using SolastaUnfinishedBusiness.Validators;
+using static SolastaUnfinishedBusiness.Api.DatabaseHelper.FeatureDefinitionAttributeModifiers;
 
 namespace SolastaUnfinishedBusiness.Feats;
 
@@ -12,30 +12,30 @@ internal static class CriticalVirtuosoFeats
 {
     internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
     {
-        const string Description = "Feat/&FeatCriticalVirtuosoDescription";
-        var nameImproved = DatabaseHelper.FeatureDefinitionAttributeModifiers
-            .AttributeModifierMartialChampionImprovedCritical.GuiPresentation.Title;
-        var nameSuperior = DatabaseHelper.FeatureDefinitionAttributeModifiers
-            .AttributeModifierMartialChampionSuperiorCritical.GuiPresentation.Title;
-
         var improved = FeatureDefinitionAttributeModifierBuilder
             .Create("AttributeModifierFeatImprovedCritical")
-            .SetGuiPresentation(nameImproved, Description)
-            .SetModifier(FeatureDefinitionAttributeModifier.AttributeModifierOperation.Additive,
-                AttributeDefinitions.CriticalThreshold, -1)
+            .SetGuiPresentation(
+                AttributeModifierMartialChampionImprovedCritical.GuiPresentation.Title,
+                AttributeModifierMartialChampionImprovedCritical.GuiPresentation.Description)
+            .SetModifier(FeatureDefinitionAttributeModifier.AttributeModifierOperation.ForceIfWorse,
+                AttributeDefinitions.CriticalThreshold, 19)
             .AddToDB();
 
         var superior = FeatureDefinitionAttributeModifierBuilder
             .Create("AttributeModifierFeatSuperiorCritical")
-            .SetGuiPresentation(nameSuperior, Description)
-            .SetModifier(FeatureDefinitionAttributeModifier.AttributeModifierOperation.Additive,
-                AttributeDefinitions.CriticalThreshold, -1)
+            .SetGuiPresentation(
+                AttributeModifierMartialChampionSuperiorCritical.GuiPresentation.Title,
+                AttributeModifierMartialChampionSuperiorCritical.GuiPresentation.Description)
+            .SetModifier(FeatureDefinitionAttributeModifier.AttributeModifierOperation.ForceIfWorse,
+                AttributeDefinitions.CriticalThreshold, 18)
             .AddToDB();
 
         // Improved Critical
         var featImprovedCritical = FeatDefinitionWithPrerequisitesBuilder
             .Create("FeatImprovedCritical")
-            .SetGuiPresentation(nameImproved, Description)
+            .SetGuiPresentation(
+                AttributeModifierMartialChampionImprovedCritical.GuiPresentation.Title,
+                AttributeModifierMartialChampionImprovedCritical.GuiPresentation.Description)
             .SetFeatures(improved)
             .SetValidators(ValidatorsFeat.IsLevel4)
             .AddToDB();
@@ -43,7 +43,9 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
         // Superior Critical
         var featSuperiorCritical = FeatDefinitionWithPrerequisitesBuilder
             .Create("FeatSuperiorCritical")
-            .SetGuiPresentation(nameSuperior, Description)
+            .SetGuiPresentation(
+                AttributeModifierMartialChampionSuperiorCritical.GuiPresentation.Title,
+                AttributeModifierMartialChampionSuperiorCritical.GuiPresentation.Description)
             .SetFeatures(superior)
             .SetValidators(ValidatorsFeat.IsLevel16, ValidatorsFeat.ValidateHasFeature(improved))
             .AddToDB();
diff --git a/SolastaUnfinishedBusiness/Feats/MeleeCombatFeats.cs b/SolastaUnfinishedBusiness/Feats/MeleeCombatFeats.cs
index 57a44e606a..5b113b24da 100644
--- a/SolastaUnfinishedBusiness/Feats/MeleeCombatFeats.cs
+++ b/SolastaUnfinishedBusiness/Feats/MeleeCombatFeats.cs
@@ -33,6 +33,9 @@ internal static class MeleeCombatFeats
 
     internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
     {
+        // kept for backward compatibility
+        _ = BuildHammerThePoint();
+
         FeatFencer = BuildFencer();
 
         var featAlwaysReady = BuildAlwaysReady();
@@ -44,7 +47,6 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
         var featDefensiveDuelist = BuildDefensiveDuelist();
         var featDevastatingStrikes = BuildDevastatingStrikes();
         var featFellHanded = BuildFellHanded();
-        var featHammerThePoint = BuildHammerThePoint();
         var featLongSwordFinesse = BuildLongswordFinesse();
         var featOldTacticsDex = BuildOldTacticsDex();
         var featOldTacticsStr = BuildOldTacticsStr();
@@ -68,7 +70,6 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
             featDefensiveDuelist,
             featDevastatingStrikes,
             featFellHanded,
-            featHammerThePoint,
             featLongSwordFinesse,
             featOldTacticsDex,
             featOldTacticsStr,
@@ -110,7 +111,6 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
             featDefensiveDuelist,
             featDevastatingStrikes,
             featFellHanded,
-            featHammerThePoint,
             featLongSwordFinesse,
             featPowerAttack,
             featRecklessAttack,
@@ -623,8 +623,8 @@ public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(GameLocationBattleManager
             var rulesetHelper = helper.RulesetCharacter;
 
             if (helper != defender ||
-                !defender.CanReact() ||
-                !ValidatorsWeapon.HasAnyWeaponTag(rulesetHelper.GetMainWeapon(), TagsDefinitions.WeaponTagFinesse))
+                !helper.CanReact() ||
+                !ValidatorsWeapon.IsMelee(rulesetHelper.GetMainWeapon()))
             {
                 yield break;
             }
@@ -695,7 +695,7 @@ private static FeatDefinition BuildHammerThePoint()
 
         var featHammerThePoint = FeatDefinitionBuilder
             .Create(Name)
-            .SetGuiPresentation(Category.Feat)
+            .SetGuiPresentation(Category.Feat, hidden: true)
             .SetFeatures(additionalDamageHammerThePoint)
             .AddToDB();
 
diff --git a/SolastaUnfinishedBusiness/Feats/OtherFeats.cs b/SolastaUnfinishedBusiness/Feats/OtherFeats.cs
index 5b9baceb67..6473f6e099 100644
--- a/SolastaUnfinishedBusiness/Feats/OtherFeats.cs
+++ b/SolastaUnfinishedBusiness/Feats/OtherFeats.cs
@@ -43,9 +43,11 @@ internal static class OtherFeats
 
     internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
     {
+        // kept for backward compatibility
+        _ = BuildAstralArms();
+
         var featAcrobat = BuildAcrobat();
         var featArcaneArcherAdept = BuildArcaneArcherAdept();
-        var featAstralArms = BuildAstralArms();
         var featDungeonDelver = BuildDungeonDelver();
         var featEldritchAdept = BuildEldritchAdept();
         var featFightingInitiate = BuildFightingInitiate();
@@ -76,15 +78,18 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
         var weaponMasterGroup = BuildWeaponMaster(feats);
 
         // building this way to keep backward compatibility
-        var featMonkShieldExpert = BuildFeatFromFightingStyle(MonkShieldExpert.ShieldExpertName);
+        _ = BuildFeatFromFightingStyle(MonkShieldExpert.ShieldExpertName);
+
+        var featMerciless = BuildFeatFromFightingStyle(Merciless.MercilessName);
         var featPolearmExpert = BuildFeatFromFightingStyle(PolearmExpert.PolearmExpertName);
+        var featRopeIpUp = BuildFeatFromFightingStyle(RopeItUp.RopeItUpName);
         var featSentinel = BuildFeatFromFightingStyle(Sentinel.SentinelName);
+        var featShieldExpert = BuildFeatFromFightingStyle(ShieldExpert.ShieldExpertName);
 
         feats.AddRange(
             featAcrobat,
             FeatAlert,
             featArcaneArcherAdept,
-            featAstralArms,
             featDungeonDelver,
             featEldritchAdept,
             featFrostAdaptation,
@@ -97,14 +102,16 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
             featMagicInitiate,
             featMartialAdept,
             featMenacing,
+            featMerciless,
             featMetamagicAdept,
-            featMonkShieldExpert,
             featMobile,
             featMonkInitiate,
             featPickPocket,
             featPoisonousSkin,
             featPolearmExpert,
+            featRopeIpUp,
             featSentinel,
+            featShieldExpert,
             FeatStealthy,
             featTough,
             featVersatilityAdept,
@@ -123,11 +130,12 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
             featMobile);
 
         GroupFeats.FeatGroupDefenseCombat.AddFeats(
-            featMonkShieldExpert);
+            featShieldExpert);
 
         GroupFeats.FeatGroupMeleeCombat.AddFeats(
             balefulScionGroup,
-            featPolearmExpert);
+            featPolearmExpert,
+            featShieldExpert);
 
         GroupFeats.FeatGroupTwoHandedCombat.AddFeats(
             featPolearmExpert);
@@ -147,11 +155,12 @@ internal static void CreateFeats([NotNull] List<FeatDefinition> feats)
             featLucky,
             FeatMageSlayer,
             featMenacing,
+            featMerciless,
+            featRopeIpUp,
             featSentinel,
             weaponMasterGroup);
 
         GroupFeats.FeatGroupUnarmoredCombat.AddFeats(
-            featAstralArms,
             featPoisonousSkin);
 
         GroupFeats.FeatGroupSkills.AddFeats(
@@ -198,7 +207,7 @@ private static FeatDefinition BuildAstralArms()
     {
         return FeatDefinitionBuilder
             .Create("FeatAstralArms")
-            .SetGuiPresentation(Category.Feat)
+            .SetGuiPresentation(Category.Feat, hidden: true)
             .SetFeatures(
                 AttributeModifierCreed_Of_Maraike)
             .AddCustomSubFeatures(
@@ -821,6 +830,7 @@ private static FeatDefinition BuildBalefulScion(List<FeatDefinition> feats)
             .SetNotificationTag("BalefulScion")
             .SetDamageDice(DieType.D6, 1)
             .SetSpecificDamageType(DamageTypeNecrotic)
+            .SetFrequencyLimit(FeatureLimitedUsage.OncePerTurn)
             .SetImpactParticleReference(PowerWightLordRetaliate)
             .AddToDB();
 
@@ -1016,7 +1026,7 @@ private IEnumerator HandleBalefulScion(GameLocationCharacter attacker, GameLocat
             var rulesetAttacker = attacker.RulesetCharacter;
 
             if (!attacker.IsWithinRange(defender, 12) ||
-                !attacker.OncePerTurnIsValid("AdditionalDamageFeatBalefulScion") ||
+                !attacker.OncePerTurnIsValid(additionalDamageBalefulScion.Name) ||
                 !rulesetAttacker.IsToggleEnabled((ActionDefinitions.Id)ExtraActionId.BalefulScionToggle) ||
                 rulesetAttacker.GetRemainingPowerUses(powerBalefulScion) == 0)
             {
@@ -1618,10 +1628,7 @@ private static FeatDefinition BuildFightingInitiate()
             .GetDatabase<FightingStyleDefinition>()
             .Where(x =>
                 x.ContentPack == CeContentPackContext.CeContentPack &&
-                x.Name is not (
-                    MonkShieldExpert.ShieldExpertName or
-                    PolearmExpert.PolearmExpertName or
-                    Sentinel.SentinelName))
+                !FightingStyleContext.DemotedFightingStyles.Contains(x.Name))
             .Select(BuildFightingStyleFeat)
             .OfType<FeatDefinition>()
             .ToArray();
diff --git a/SolastaUnfinishedBusiness/Feats/RangedCombatFeats.cs b/SolastaUnfinishedBusiness/Feats/RangedCombatFeats.cs
index e623765747..8042b2a9f4 100644
--- a/SolastaUnfinishedBusiness/Feats/RangedCombatFeats.cs
+++ b/SolastaUnfinishedBusiness/Feats/RangedCombatFeats.cs
@@ -80,14 +80,13 @@ private static FeatDefinition BuildBowMastery()
                 FeatureDefinitionAttackModifierBuilder
                     .Create($"Custom{NAME}")
                     .SetGuiPresentation(NAME, Category.Feat)
-                    .SetDamageRollModifier(1)
-                    .SetRequiredProperty(RestrictedContextRequiredProperty.RangeWeapon)
                     .AddCustomSubFeatures(
                         new ValidateContextInsteadOfRestrictedProperty((_, _, character, _, _, mode, _) =>
                             (OperationType.Set, isLongOrShortbow(mode, null, character))),
-                        new CanUseAttribute(
-                            AttributeDefinitions.Strength,
-                            ValidatorsWeapon.IsOfWeaponType(LongbowType)),
+                        new AddExtraRangedAttack(
+                            ActionDefinitions.ActionType.Bonus,
+                            ValidatorsWeapon.IsOfWeaponType(LongbowType),
+                            ValidatorsCharacter.HasUsedWeaponType(LongbowType)),
                         new AddExtraRangedAttack(
                             ActionDefinitions.ActionType.Bonus,
                             ValidatorsWeapon.IsOfWeaponType(ShortbowType),
@@ -110,14 +109,13 @@ private static FeatDefinition BuildCrossbowMastery()
                 FeatureDefinitionAttackModifierBuilder
                     .Create($"Custom{NAME}")
                     .SetGuiPresentation(NAME, Category.Feat)
-                    .SetDamageRollModifier(1)
-                    .SetRequiredProperty(RestrictedContextRequiredProperty.RangeWeapon)
                     .AddCustomSubFeatures(
                         new ValidateContextInsteadOfRestrictedProperty((_, _, character, _, _, mode, _) =>
                             (OperationType.Set, isCrossbow(mode, null, character))),
-                        new CanUseAttribute(
-                            AttributeDefinitions.Strength,
-                            ValidatorsWeapon.IsOfWeaponType(HeavyCrossbowType)),
+                        new AddExtraRangedAttack(
+                            ActionDefinitions.ActionType.Bonus,
+                            ValidatorsWeapon.IsOfWeaponType(HeavyCrossbowType),
+                            ValidatorsCharacter.HasUsedWeaponType(HeavyCrossbowType)),
                         new AddExtraRangedAttack(
                             ActionDefinitions.ActionType.Bonus,
                             ValidatorsWeapon.IsOfWeaponType(LightCrossbowType),
diff --git a/SolastaUnfinishedBusiness/FightingStyles/AstralReach.cs b/SolastaUnfinishedBusiness/FightingStyles/AstralReach.cs
new file mode 100644
index 0000000000..18a5c964d5
--- /dev/null
+++ b/SolastaUnfinishedBusiness/FightingStyles/AstralReach.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using SolastaUnfinishedBusiness.Behaviors;
+using SolastaUnfinishedBusiness.Builders;
+using SolastaUnfinishedBusiness.Builders.Features;
+using SolastaUnfinishedBusiness.CustomUI;
+using SolastaUnfinishedBusiness.Models;
+using SolastaUnfinishedBusiness.Properties;
+using SolastaUnfinishedBusiness.Validators;
+using static SolastaUnfinishedBusiness.Api.DatabaseHelper.FeatureDefinitionFightingStyleChoices;
+
+namespace SolastaUnfinishedBusiness.FightingStyles;
+
+internal sealed class AstralReach : AbstractFightingStyle
+{
+    private const string AstralReachName = "AstralReach";
+
+    internal override FightingStyleDefinition FightingStyle { get; } = FightingStyleBuilder
+        .Create(AstralReachName)
+        .SetGuiPresentation(Category.FightingStyle, Sprites.GetSprite(AstralReachName, Resources.Lunger, 256))
+        .SetFeatures(
+            FeatureDefinitionBuilder
+                .Create($"Feature{AstralReachName}")
+                .SetGuiPresentationNoContent(true)
+                .AddCustomSubFeatures(new IncreaseWeaponReach(1, (attackMode, _, _) =>
+                    ValidatorsWeapon.IsUnarmed(attackMode)))
+                .AddToDB())
+        .AddToDB();
+
+    internal override List<FeatureDefinitionFightingStyleChoice> FightingStyleChoice =>
+    [
+        CharacterContext.FightingStyleChoiceBarbarian,
+        CharacterContext.FightingStyleChoiceMonk,
+        CharacterContext.FightingStyleChoiceRogue,
+        FightingStyleChampionAdditional,
+        FightingStyleFighter,
+        FightingStylePaladin,
+        FightingStyleRanger
+    ];
+}
diff --git a/SolastaUnfinishedBusiness/FightingStyles/Crippling.cs b/SolastaUnfinishedBusiness/FightingStyles/Crippling.cs
index 4b1192f715..9771ceb361 100644
--- a/SolastaUnfinishedBusiness/FightingStyles/Crippling.cs
+++ b/SolastaUnfinishedBusiness/FightingStyles/Crippling.cs
@@ -7,8 +7,6 @@
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.ConditionDefinitions;
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.FeatureDefinitionFightingStyleChoices;
 using static RuleDefinitions;
-using static FeatureDefinitionAttributeModifier;
-using static SolastaUnfinishedBusiness.Api.DatabaseHelper.FeatureDefinitionMovementAffinitys;
 
 namespace SolastaUnfinishedBusiness.FightingStyles;
 
@@ -29,18 +27,11 @@ internal sealed class Crippling : AbstractFightingStyle
                 .AddConditionOperation(
                     ConditionOperationDescription.ConditionOperation.Add,
                     ConditionDefinitionBuilder
-                        .Create(ConditionHindered_By_Frost, "ConditionFightingStyleCrippling")
+                        .Create(ConditionHindered, "ConditionFightingStyleCrippling")
                         .SetGuiPresentation(Category.Condition, ConditionSlowed)
-                        .SetSpecialDuration(DurationType.Round, 1, TurnOccurenceType.EndOfSourceTurn)
                         .SetParentCondition(ConditionHindered)
-                        .SetFeatures(
-                            MovementAffinityConditionHindered,
-                            FeatureDefinitionAttributeModifierBuilder
-                                .Create("AttributeModifierCripplingACDebuff")
-                                .SetGuiPresentationNoContent(true)
-                                .SetModifier(AttributeModifierOperation.Additive,
-                                    AttributeDefinitions.ArmorClass, -1)
-                                .AddToDB())
+                        .SetFeatures()
+                        .SetSpecialDuration(DurationType.Round, 1, TurnOccurenceType.EndOfSourceTurn)
                         .AddToDB())
                 .AddToDB())
         .AddToDB();
diff --git a/SolastaUnfinishedBusiness/FightingStyles/Merciless.cs b/SolastaUnfinishedBusiness/FightingStyles/Merciless.cs
index b5439f66e7..d8f096f60a 100644
--- a/SolastaUnfinishedBusiness/FightingStyles/Merciless.cs
+++ b/SolastaUnfinishedBusiness/FightingStyles/Merciless.cs
@@ -17,9 +17,11 @@ namespace SolastaUnfinishedBusiness.FightingStyles;
 
 internal sealed class Merciless : AbstractFightingStyle
 {
+    internal const string MercilessName = "Merciless";
+
     private static readonly FeatureDefinitionPower PowerFightingStyleMerciless = FeatureDefinitionPowerBuilder
-        .Create("PowerFightingStyleMerciless")
-        .SetGuiPresentation("Merciless", Category.FightingStyle, hidden: true)
+        .Create($"PowerFightingStyle{MercilessName}")
+        .SetGuiPresentation(MercilessName, Category.FightingStyle, hidden: true)
         .SetUsesFixed(ActivationTime.NoCost)
         .SetShowCasting(false)
         .SetEffectDescription(
@@ -44,12 +46,12 @@ internal sealed class Merciless : AbstractFightingStyle
         .AddToDB();
 
     internal override FightingStyleDefinition FightingStyle { get; } = FightingStyleBuilder
-        .Create("Merciless")
-        .SetGuiPresentation(Category.FightingStyle, Sprites.GetSprite("Merciless", Resources.Merciless, 256))
+        .Create(MercilessName)
+        .SetGuiPresentation(Category.FightingStyle, Sprites.GetSprite(MercilessName, Resources.Merciless, 256))
         .SetFeatures(
             PowerFightingStyleMerciless,
             FeatureDefinitionBuilder
-                .Create("TargetReducedToZeroHpFightingStyleMerciless")
+                .Create($"TargetReducedToZeroHpFightingStyle{MercilessName}")
                 .SetGuiPresentationNoContent(true)
                 .AddCustomSubFeatures(new OnReducedToZeroHpByMeMerciless())
                 .AddToDB())
diff --git a/SolastaUnfinishedBusiness/FightingStyles/RopeItUp.cs b/SolastaUnfinishedBusiness/FightingStyles/RopeItUp.cs
index 40a2c5c3e4..13f00737b7 100644
--- a/SolastaUnfinishedBusiness/FightingStyles/RopeItUp.cs
+++ b/SolastaUnfinishedBusiness/FightingStyles/RopeItUp.cs
@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using SolastaUnfinishedBusiness.Behaviors.Specific;
 using SolastaUnfinishedBusiness.Builders;
 using SolastaUnfinishedBusiness.Builders.Features;
@@ -7,24 +6,23 @@
 using SolastaUnfinishedBusiness.Interfaces;
 using SolastaUnfinishedBusiness.Models;
 using SolastaUnfinishedBusiness.Properties;
-using static RuleDefinitions;
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.FeatureDefinitionFightingStyleChoices;
 
 namespace SolastaUnfinishedBusiness.FightingStyles;
 
 internal class RopeItUp : AbstractFightingStyle
 {
-    private const string Name = "RopeItUp";
+    internal const string RopeItUpName = "RopeItUp";
 
     private static readonly FeatureDefinition FeatureRopeItUp = FeatureDefinitionAttributeModifierBuilder
-        .Create($"AttributeModifier{Name}")
-        .SetGuiPresentation(Name, Category.FightingStyle)
+        .Create($"AttributeModifier{RopeItUpName}")
+        .SetGuiPresentation(RopeItUpName, Category.FightingStyle)
         .AddCustomSubFeatures(ReturningWeapon.AlwaysValid, new ModifyWeaponAttackModeRopeItUp())
         .AddToDB();
 
     internal override FightingStyleDefinition FightingStyle { get; } = FightingStyleBuilder
-        .Create(Name)
-        .SetGuiPresentation(Category.FightingStyle, Sprites.GetSprite(Name, Resources.RopeItUp, 256))
+        .Create(RopeItUpName)
+        .SetGuiPresentation(Category.FightingStyle, Sprites.GetSprite(RopeItUpName, Resources.RopeItUp, 256))
         .SetFeatures(FeatureRopeItUp)
         .AddToDB();
 
@@ -39,7 +37,7 @@ internal class RopeItUp : AbstractFightingStyle
         FightingStyleRanger
     ];
 
-    private sealed class ModifyWeaponAttackModeRopeItUp : IModifyWeaponAttackMode, IPhysicalAttackInitiatedByMe
+    private sealed class ModifyWeaponAttackModeRopeItUp : IModifyWeaponAttackMode
     {
         public void ModifyAttackMode(RulesetCharacter character, RulesetAttackMode attackMode)
         {
@@ -49,37 +47,7 @@ public void ModifyAttackMode(RulesetCharacter character, RulesetAttackMode attac
             }
 
             attackMode.closeRange += 2;
-            attackMode.maxRange += 2;
-        }
-
-        public IEnumerator OnPhysicalAttackInitiatedByMe(
-            GameLocationBattleManager battleManager,
-            CharacterAction action,
-            GameLocationCharacter attacker,
-            GameLocationCharacter defender,
-            ActionModifier attackModifier,
-            RulesetAttackMode attackMode)
-        {
-            if (attackModifier.Proximity == AttackProximity.Melee)
-            {
-                yield break;
-            }
-
-            attackMode.AddAttackTagAsNeeded(TagsDefinitions.MagicalWeapon);
-            attackMode.toHitBonus += 1;
-            attackMode.ToHitBonusTrends.Add(
-                new TrendInfo(1, FeatureSourceType.CharacterFeature, FeatureRopeItUp.Name, FeatureRopeItUp));
-
-            var damage = attackMode.effectDescription.FindFirstDamageForm();
-
-            if (damage == null)
-            {
-                yield break;
-            }
-
-            damage.bonusDamage += 1;
-            damage.DamageBonusTrends.Add(
-                new TrendInfo(1, FeatureSourceType.CharacterFeature, FeatureRopeItUp.Name, FeatureRopeItUp));
+            attackMode.maxRange += 4;
         }
     }
 }
diff --git a/SolastaUnfinishedBusiness/FightingStyles/ShieldExpert.cs b/SolastaUnfinishedBusiness/FightingStyles/ShieldExpert.cs
index 294cc76e35..853780eb1a 100644
--- a/SolastaUnfinishedBusiness/FightingStyles/ShieldExpert.cs
+++ b/SolastaUnfinishedBusiness/FightingStyles/ShieldExpert.cs
@@ -20,25 +20,12 @@ internal class ShieldExpert : AbstractFightingStyle
             FeatureDefinitionBuilder
                 .Create("AddExtraAttackShieldExpert")
                 .SetGuiPresentationNoContent(true)
-                //.SetProficiencies(RuleDefinitions.ProficiencyType.Armor, EquipmentDefinitions.ShieldCategory)
                 .AddCustomSubFeatures(new AddBonusShieldAttack())
                 .AddToDB(),
+            // kept for backward compatibility
             FeatureDefinitionActionAffinityBuilder
                 .Create("ActionAffinityShieldExpertShove")
                 .SetGuiPresentationNoContent(true)
-                .SetActionExecutionModifiers(
-                    new ActionDefinitions.ActionExecutionModifier
-                    {
-                        actionId = ActionDefinitions.Id.Shove,
-                        advantageType = RuleDefinitions.AdvantageType.Advantage,
-                        equipmentContext = EquipmentDefinitions.EquipmentContext.WieldingShield
-                    },
-                    new ActionDefinitions.ActionExecutionModifier
-                    {
-                        actionId = ActionDefinitions.Id.ShoveBonus,
-                        advantageType = RuleDefinitions.AdvantageType.Advantage,
-                        equipmentContext = EquipmentDefinitions.EquipmentContext.WieldingShield
-                    })
                 .AddToDB())
         .AddToDB();
 
diff --git a/SolastaUnfinishedBusiness/Info.json b/SolastaUnfinishedBusiness/Info.json
index 8662be8158..16508941cf 100644
--- a/SolastaUnfinishedBusiness/Info.json
+++ b/SolastaUnfinishedBusiness/Info.json
@@ -1,7 +1,7 @@
 {
   "Id": "SolastaUnfinishedBusiness",
   "DisplayName": "<i>[<b>Un</b>]</i> <color=Orange>Finished Business</color>",
-  "Version": "1.5.97.8",
+  "Version": "1.5.97.9",
   "GameVersion": "1.5.97",
   "ManagerVersion": "0.24.0",
   "AssemblyName": "SolastaUnfinishedBusiness.dll",
diff --git a/SolastaUnfinishedBusiness/Interfaces/IAttackBeforeHitPossibleOnMeOrAlly.cs b/SolastaUnfinishedBusiness/Interfaces/IAttackBeforeHitPossibleOnMeOrAlly.cs
index 484169358e..2bb4b477f2 100644
--- a/SolastaUnfinishedBusiness/Interfaces/IAttackBeforeHitPossibleOnMeOrAlly.cs
+++ b/SolastaUnfinishedBusiness/Interfaces/IAttackBeforeHitPossibleOnMeOrAlly.cs
@@ -7,7 +7,8 @@ namespace SolastaUnfinishedBusiness.Interfaces;
 // rulesetEffect != null is a magical attack
 public interface IAttackBeforeHitPossibleOnMeOrAlly
 {
-    IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(GameLocationBattleManager battleManager,
+    IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
+        GameLocationBattleManager battleManager,
         [UsedImplicitly] GameLocationCharacter attacker,
         GameLocationCharacter defender,
         GameLocationCharacter helper,
diff --git a/SolastaUnfinishedBusiness/Models/CustomActionIdContext.cs b/SolastaUnfinishedBusiness/Models/CustomActionIdContext.cs
index da22708ee2..5b092cbb0a 100644
--- a/SolastaUnfinishedBusiness/Models/CustomActionIdContext.cs
+++ b/SolastaUnfinishedBusiness/Models/CustomActionIdContext.cs
@@ -157,22 +157,6 @@ private static void BuildCustomInvocationActions()
             .SetActionScope(ActionScope.Battle)
             .AddToDB();
 
-        ActionDefinitionBuilder
-            .Create(CastInvocation, "CastSpellMasteryMain")
-            .SetGuiPresentation("CastSpellMastery", Category.Action, Sprites.ActionPlaneMagic, 10)
-            .SetActionId(ExtraActionId.CastSpellMasteryMain)
-            .SetActionType(ActionType.Main)
-            .SetActionScope(ActionScope.All)
-            .AddToDB();
-
-        ActionDefinitionBuilder
-            .Create(CastInvocation, "CastSignatureSpellsMain")
-            .SetGuiPresentation("CastSignatureSpells", Category.Action, Sprites.ActionPlaneMagic, 10)
-            .SetActionId(ExtraActionId.CastSignatureSpellsMain)
-            .SetActionType(ActionType.Main)
-            .SetActionScope(ActionScope.All)
-            .AddToDB();
-
         ActionDefinitionBuilder
             .Create(CastInvocation, "EldritchVersatilityMain")
             .SetGuiPresentation("EldritchVersatility", Category.Action, Sprites.ActionEldritchVersatility, 20)
@@ -626,8 +610,6 @@ or ExtraActionId.CastInvocationNoCost
                    or ExtraActionId.InventorInfusion
                    or ExtraActionId.CastPlaneMagicMain
                    or ExtraActionId.CastPlaneMagicBonus
-                   or ExtraActionId.CastSpellMasteryMain
-                   or ExtraActionId.CastSignatureSpellsMain
                || IsGambitActionId(id)
                || IsEldritchVersatilityId(id)
                || IsEldritchVersatilityId(id);
diff --git a/SolastaUnfinishedBusiness/Models/CustomItemsContext.cs b/SolastaUnfinishedBusiness/Models/CustomItemsContext.cs
index 3a630f5432..9692c4ff05 100644
--- a/SolastaUnfinishedBusiness/Models/CustomItemsContext.cs
+++ b/SolastaUnfinishedBusiness/Models/CustomItemsContext.cs
@@ -45,6 +45,8 @@ private static ItemDefinition BuildHelmOfAwareness()
                     false))
             .AddToDB();
 
+        item.inDungeonEditor = Main.Settings.AddNewWeaponsAndRecipesToEditor;
+
         MerchantContext.AddItem(item, ShopItemType.MagicItemRare);
         return item;
     }
@@ -75,6 +77,8 @@ private static ItemDefinition BuildGlovesOfThievery()
                         .AddToDB(), false))
             .AddToDB();
 
+        item.inDungeonEditor = Main.Settings.AddNewWeaponsAndRecipesToEditor;
+
         MerchantContext.AddItem(item, ShopItemType.MagicItemUncommon);
         return item;
     }
diff --git a/SolastaUnfinishedBusiness/Models/FightingStyleContext.cs b/SolastaUnfinishedBusiness/Models/FightingStyleContext.cs
index 500e79bd27..74b1226ed6 100644
--- a/SolastaUnfinishedBusiness/Models/FightingStyleContext.cs
+++ b/SolastaUnfinishedBusiness/Models/FightingStyleContext.cs
@@ -3,39 +3,49 @@
 using JetBrains.Annotations;
 using SolastaUnfinishedBusiness.Feats;
 using SolastaUnfinishedBusiness.FightingStyles;
-using SolastaUnfinishedBusiness.Validators;
 
 namespace SolastaUnfinishedBusiness.Models;
 
 internal static class FightingStyleContext
 {
+    internal static readonly HashSet<string> DemotedFightingStyles =
+    [
+        Merciless.MercilessName,
+        MonkShieldExpert.ShieldExpertName,
+        PolearmExpert.PolearmExpertName,
+        RopeItUp.RopeItUpName,
+        Sentinel.SentinelName,
+        ShieldExpert.ShieldExpertName
+    ];
+
     private static Dictionary<FightingStyleDefinition, List<FeatureDefinitionFightingStyleChoice>>
-        FightingStylesChoiceList { get; } = new();
+        FightingStylesChoiceList { get; } = [];
 
     internal static HashSet<FightingStyleDefinition> FightingStyles { get; private set; } = [];
 
     internal static void Load()
     {
+        // kept for backward compatibility
+        _ = new Merciless();
+        _ = new MonkShieldExpert();
+        _ = new PolearmExpert();
+        _ = new RopeItUp();
+        _ = new ShieldExpert();
+        _ = new Sentinel();
+
+        LoadStyle(new AstralReach());
         LoadStyle(new BlindFighting());
         LoadStyle(new Crippling());
         LoadStyle(new Executioner());
         LoadStyle(new HandAndAHalf());
         LoadStyle(new Interception());
         LoadStyle(new Lunger());
-        LoadStyle(new Merciless());
         LoadStyle(new Pugilist());
         LoadStyle(new RemarkableTechnique());
-        LoadStyle(new RopeItUp());
-        LoadStyle(new ShieldExpert());
         LoadStyle(new Torchbearer());
 
-        // kept for backward compatibility
-        _ = new MonkShieldExpert();
-        _ = new PolearmExpert();
-        _ = new Sentinel();
-
         // sorting
-        FightingStyles = FightingStyles.OrderBy(x => x.FormatTitle()).ToHashSet();
+        FightingStyles = [.. FightingStyles.OrderBy(x => x.FormatTitle())];
 
         // settings paring
         foreach (var name in Main.Settings.FightingStyleEnabled
@@ -105,41 +115,14 @@ internal static void Switch(FightingStyleDefinition fightingStyleDefinition, boo
 
     internal static void RefreshFightingStylesPatch(RulesetCharacterHero hero)
     {
-        foreach (var trainedFightingStyle in hero.trainedFightingStyles)
+        foreach (var trainedFightingStyle in hero.trainedFightingStyles
+                     .Where(x =>
+                         // activate all modded fighting styles by default
+                         x.contentPack == CeContentPackContext.CeContentPack ||
+                         // handles this in a different place [AddCustomWeaponValidatorToFightingStyleArchery()] so always allow here
+                         x.Condition == FightingStyleDefinition.TriggerCondition.RangedWeaponAttack))
         {
-            var isActive = trainedFightingStyle.contentPack == CeContentPackContext.CeContentPack;
-
-            // activate all modded fighting styles by default
-            if (isActive)
-            {
-                hero.activeFightingStyles.TryAdd(trainedFightingStyle);
-
-                continue;
-            }
-
-            // disallow Shield Expert to work with Dueling Fighting Style
-            if (trainedFightingStyle.Condition == FightingStyleDefinition.TriggerCondition.OneHandedMeleeWeapon)
-            {
-                hero.activeFightingStyles.Remove(trainedFightingStyle);
-            }
-
-            isActive = trainedFightingStyle.Condition switch
-            {
-                // handles this in a different place [AddCustomWeaponValidatorToFightingStyleArchery()] so always allow here
-                FightingStyleDefinition.TriggerCondition.RangedWeaponAttack => true,
-                // disallow Shield Expert to work with Dueling Fighting Style
-                FightingStyleDefinition.TriggerCondition.OneHandedMeleeWeapon =>
-                    ValidatorsCharacter.HasMeleeWeaponInMainAndNoBonusAttackInOffhand(hero),
-                // allow Shield Expert to work with Two Weapon Fighting Style
-                FightingStyleDefinition.TriggerCondition.TwoMeleeWeaponsWielded =>
-                    ValidatorsCharacter.HasMeleeWeaponInMainAndOffhand(hero),
-                _ => false
-            };
-
-            if (isActive)
-            {
-                hero.activeFightingStyles.TryAdd(trainedFightingStyle);
-            }
+            hero.activeFightingStyles.TryAdd(trainedFightingStyle);
         }
     }
 }
diff --git a/SolastaUnfinishedBusiness/Models/Level20Context.cs b/SolastaUnfinishedBusiness/Models/Level20Context.cs
index a0d085bb1a..1e1d7e2dbc 100644
--- a/SolastaUnfinishedBusiness/Models/Level20Context.cs
+++ b/SolastaUnfinishedBusiness/Models/Level20Context.cs
@@ -18,7 +18,6 @@
 using SolastaUnfinishedBusiness.Interfaces;
 using SolastaUnfinishedBusiness.Properties;
 using SolastaUnfinishedBusiness.Subclasses;
-using SolastaUnfinishedBusiness.Validators;
 using static RuleDefinitions;
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.CharacterClassDefinitions;
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.FeatureDefinitionAttributeModifiers;
@@ -528,8 +527,8 @@ private static void WarlockLoad()
 
     private static void WizardLoad()
     {
-        var spellMastery = BuildWizardSpellMastery();
-        var signatureSpells = BuildWizardSignatureSpells();
+        var spellMastery = WizardSpellMastery.BuildWizardSpellMastery();
+        var signatureSpells = WizardSignatureSpells.BuildWizardSignatureSpells();
 
         Wizard.FeatureUnlocks.AddRange(new List<FeatureUnlockByLevel>
         {
@@ -593,88 +592,297 @@ private static void InitExperienceThresholdsTable()
     // HELPERS
     //
 
-    private static FeatureDefinitionGrantInvocations BuildWizardSpellMastery()
+    internal static class WizardSpellMastery
     {
-        const string SPELL_MASTERY = "SpellMastery";
-
-        // any non reaction spell of 1st or 2nd level
-        var allPossibleSpells = SpellListAllSpells.SpellsByLevel
-            .Where(x => x.level is 1 or 2)
-            .SelectMany(x => x.Spells)
-            .Where(x => x.ActivationTime != ActivationTime.Reaction);
-
-        var invocations = allPossibleSpells
-            .Select(spell =>
-                CustomInvocationDefinitionBuilder
-                    .Create($"CustomInvocation{SPELL_MASTERY}{spell.Name}")
-                    .SetGuiPresentation(spell.GuiPresentation)
-                    .SetPoolType(InvocationPoolTypeCustom.Pools.SpellMastery)
-                    .SetGrantedSpell(spell)
-                    .SetRequirements(3)
-                    .AddCustomSubFeatures(
-                        ValidateRepertoireForAutoprepared.HasSpellCastingFeature(CastSpellWizard.Name),
-                        IsValid())
-                    .AddToDB());
-
-        var grantInvocationsSpellMastery = FeatureDefinitionGrantInvocationsBuilder
-            .Create($"GrantInvocations{SPELL_MASTERY}")
+        private const string Mastery = "SpellMastery";
+
+        internal static readonly FeatureDefinition FeatureSpellMastery = FeatureDefinitionBuilder
+            .Create("FeatureWizardSpellMastery")
             .SetGuiPresentation(Category.Feature)
-            .SetInvocations(invocations)
             .AddToDB();
 
-        return grantInvocationsSpellMastery;
+        private static readonly RestActivityDefinition RestActivitySpellMastery = RestActivityDefinitionBuilder
+            .Create($"RestActivity{Mastery}")
+            .SetGuiPresentation(Category.RestActivity)
+            .SetRestData(
+                RestDefinitions.RestStage.AfterRest,
+                RestType.LongRest,
+                RestActivityDefinition.ActivityCondition.CanPrepareSpells,
+                nameof(FunctorSpellMastery),
+                string.Empty)
+            .AddToDB();
+
+        internal static bool IsRestActivityAvailable(RestActivityDefinition activity, RulesetCharacterHero hero)
+        {
+            return activity != RestActivitySpellMastery || hero.GetClassLevel(Wizard) >= 18;
+        }
+
+        internal static bool IsInvalidSelectedSpell(RulesetCharacter rulesetCharacter, SpellDefinition spell)
+        {
+            return
+                rulesetCharacter.HasConditionOfCategoryAndType(
+                    AttributeDefinitions.TagEffect, $"Condition{Mastery}") &&
+                spell.SpellLevel is not (1 or 2);
+        }
+
+        internal static bool IsPreparation(RulesetCharacter rulesetCharacter, out int maxPreparedSpell)
+        {
+            maxPreparedSpell = 2;
+
+            return rulesetCharacter.HasConditionOfCategoryAndType(
+                AttributeDefinitions.TagEffect, $"Condition{Mastery}");
+        }
+
+        internal static bool ShouldConsumeSlot(RulesetCharacter caster, RulesetEffectSpell activeSpell)
+        {
+            if (!activeSpell.SpellRepertoire.ExtraSpellsByTag.TryGetValue(Mastery,
+                    out var signaturePreparedSpells) ||
+                !signaturePreparedSpells.Contains(activeSpell.SpellDefinition) ||
+                activeSpell.EffectLevel != activeSpell.SpellDefinition.SpellLevel)
+            {
+                return true;
+            }
+
+            caster.LogCharacterUsedFeature(FeatureSpellMastery);
+
+            return false;
+        }
+
+        internal static FeatureDefinition BuildWizardSpellMastery()
+        {
+            _ = ConditionDefinitionBuilder
+                .Create($"Condition{Mastery}")
+                .SetGuiPresentationNoContent(true)
+                .SetSilent(Silent.WhenAddedOrRemoved)
+                .AddToDB();
+
+            ServiceRepository.GetService<IFunctorService>()
+                .RegisterFunctor(nameof(FunctorSpellMastery), new FunctorSpellMastery());
 
-        static IsInvocationValidHandler IsValid()
+            return FeatureSpellMastery;
+        }
+
+        private class FunctorSpellMastery : Functor
         {
-            return (character, invocation) =>
+            public override IEnumerator Execute(
+                FunctorParametersDescription functorParameters,
+                FunctorExecutionContext context)
             {
-                var spellRepertoire = character.GetClassSpellRepertoire(Wizard);
+                var inspectionScreen = Gui.GuiService.GetScreen<CharacterInspectionScreen>();
+                var partyStatusScreen = Gui.GuiService.GetScreen<GamePartyStatusScreen>();
+                var hero = functorParameters.RestingHero;
+
+                Gui.GuiService.GetScreen<RestModal>().KeepCurrentState = true;
+
+                var spellRepertoire = hero.SpellRepertoires.FirstOrDefault(x =>
+                    x.SpellCastingFeature.SpellReadyness == SpellReadyness.Prepared);
 
                 if (spellRepertoire == null)
                 {
-                    return false;
+                    yield break;
                 }
 
-                // get the first 2 non reaction prepared spells of 1st or 2nd level
-                var preparedSpells = spellRepertoire.PreparedSpells
-                    .Where(x => x.SpellLevel is 1 or 2 && x.ActivationTime != ActivationTime.Reaction)
-                    .Take(2);
+                var preparedSpellsClone = spellRepertoire.PreparedSpells.ToList();
 
-                return preparedSpells.Contains(invocation.GrantedSpell);
-            };
+                spellRepertoire.ExtraSpellsByTag.TryAdd(Mastery, spellRepertoire.AutoPreparedSpells.ToList());
+                spellRepertoire.PreparedSpells.SetRange(spellRepertoire.ExtraSpellsByTag[Mastery]);
+                spellRepertoire.ExtraSpellsByTag[Mastery] = [];
+
+                var activeCondition = hero.InflictCondition(
+                    $"Condition{Mastery}",
+                    DurationType.Permanent,
+                    0,
+                    TurnOccurenceType.StartOfTurn,
+                    AttributeDefinitions.TagEffect,
+                    hero.guid,
+                    hero.CurrentFaction.Name,
+                    1,
+                    $"Condition{Mastery}",
+                    0,
+                    0,
+                    0);
+
+                partyStatusScreen.SetupDisplayPreferences(false, false, false);
+
+                inspectionScreen.ShowSpellPreparation(
+                    functorParameters.RestingHero, Gui.GuiService.GetScreen<RestModal>(), spellRepertoire);
+
+                while (context.Async && inspectionScreen.Visible)
+                {
+                    yield return null;
+                }
+
+                spellRepertoire.ExtraSpellsByTag[Mastery]
+                    .SetRange(spellRepertoire.PreparedSpells.Except(spellRepertoire.AutoPreparedSpells));
+                spellRepertoire.PreparedSpells.SetRange(preparedSpellsClone);
+                spellRepertoire.PreparedSpells.RemoveAll(x => spellRepertoire.ExtraSpellsByTag[Mastery].Contains(x));
+                partyStatusScreen.SetupDisplayPreferences(true, true, true);
+                hero.RemoveCondition(activeCondition);
+            }
         }
     }
 
-    private static FeatureDefinitionCustomInvocationPool BuildWizardSignatureSpells()
+    internal static class WizardSignatureSpells
     {
-        const string SIGNATURE_SPELLS = "SignatureSpells";
-
-        // any non reaction spell of 3rd level
-        var allPossibleSpells = SpellListAllSpells.SpellsByLevel
-            .Where(x => x.level is 3)
-            .SelectMany(x => x.Spells)
-            .Where(x => x.ActivationTime != ActivationTime.Reaction)
-            .ToList();
-
-        allPossibleSpells
-            .ForEach(spell =>
-                CustomInvocationDefinitionBuilder
-                    .Create($"CustomInvocation{SIGNATURE_SPELLS}{spell.name}")
-                    .SetGuiPresentation(spell.GuiPresentation)
-                    .SetPoolType(InvocationPoolTypeCustom.Pools.SignatureSpells)
-                    .SetGrantedSpell(spell)
-                    .AddCustomSubFeatures(
-                        RechargeInvocationOnShortRest.Marker,
-                        ValidateRepertoireForAutoprepared.HasSpellCastingFeature(CastSpellWizard.Name))
-                    .AddToDB());
-
-        var invocationPoolWizardSignatureSpells = CustomInvocationPoolDefinitionBuilder
-            .Create("InvocationPoolWizardSignatureSpells")
+        private const string Signature = "SignatureSpells";
+
+        internal static readonly FeatureDefinitionPower PowerSignatureSpells = FeatureDefinitionPowerBuilder
+            .Create("PowerWizardSignatureSpells")
             .SetGuiPresentation(Category.Feature)
-            .Setup(InvocationPoolTypeCustom.Pools.SignatureSpells, 2)
+            .SetUsesFixed(ActivationTime.NoCost, RechargeRate.ShortRest, 1, 3)
+            .AddCustomSubFeatures(ModifyPowerVisibility.Hidden)
+            .AddToDB();
+
+        private static readonly RestActivityDefinition RestActivitySignatureSpells = RestActivityDefinitionBuilder
+            .Create($"RestActivity{Signature}")
+            .SetGuiPresentation(Category.RestActivity)
+            .SetRestData(
+                RestDefinitions.RestStage.AfterRest,
+                RestType.LongRest,
+                RestActivityDefinition.ActivityCondition.CanPrepareSpells,
+                nameof(FunctorSignatureSpells),
+                string.Empty)
             .AddToDB();
 
-        return invocationPoolWizardSignatureSpells;
+        internal static bool IsRestActivityAvailable(RestActivityDefinition activity, RulesetCharacterHero hero)
+        {
+            return
+                activity != RestActivitySignatureSpells ||
+                (hero.GetClassLevel(Wizard) >= 20 &&
+                 (Main.Settings.EnableSignatureSpellsRelearn ||
+                  hero.SpellRepertoires.All(x =>
+                      !x.ExtraSpellsByTag.TryGetValue(Signature, out var spells) ||
+                      spells.Count == 0)));
+        }
+
+        internal static bool IsPreparation(RulesetCharacter rulesetCharacter, out int maxPreparedSpell)
+        {
+            maxPreparedSpell = 2;
+
+            return rulesetCharacter.HasConditionOfCategoryAndType(
+                AttributeDefinitions.TagEffect, $"Condition{Signature}");
+        }
+
+        internal static bool IsInvalidSelectedSpell(RulesetCharacter rulesetCharacter, SpellDefinition spell)
+        {
+            return
+                rulesetCharacter.HasConditionOfCategoryAndType(
+                    AttributeDefinitions.TagEffect, $"Condition{Signature}") &&
+                spell.SpellLevel is not 3;
+        }
+
+        internal static bool ShouldConsumeSlot(RulesetCharacter caster, RulesetEffectSpell activeSpell)
+        {
+            if (activeSpell.EffectLevel != activeSpell.SpellDefinition.SpellLevel)
+            {
+                return true;
+            }
+
+            if (!activeSpell.SpellRepertoire.ExtraSpellsByTag
+                    .TryGetValue(Signature, out var signaturePreparedSpells))
+            {
+                return true;
+            }
+
+            var usablePower = PowerProvider.Get(PowerSignatureSpells, caster);
+
+            if (usablePower.remainingUses == 0)
+            {
+                return true;
+            }
+
+            for (var i = 0; i < signaturePreparedSpells.Count; i++)
+            {
+                if (signaturePreparedSpells[i] == activeSpell.SpellDefinition)
+                {
+                    switch (i)
+                    {
+                        case 0 when usablePower.remainingUses == 2:
+                        case 1 when usablePower.remainingUses == 1:
+                            return true;
+                        default:
+                            usablePower.remainingUses -= i == 0 ? 1 : 2;
+                            caster.LogCharacterUsedFeature(PowerSignatureSpells);
+                            return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        internal static FeatureDefinition BuildWizardSignatureSpells()
+        {
+            _ = ConditionDefinitionBuilder
+                .Create($"Condition{Signature}")
+                .SetGuiPresentationNoContent(true)
+                .SetSilent(Silent.WhenAddedOrRemoved)
+                .AddToDB();
+
+            ServiceRepository.GetService<IFunctorService>()
+                .RegisterFunctor(nameof(FunctorSignatureSpells), new FunctorSignatureSpells());
+
+            return PowerSignatureSpells;
+        }
+
+        private class FunctorSignatureSpells : Functor
+        {
+            public override IEnumerator Execute(
+                FunctorParametersDescription functorParameters,
+                FunctorExecutionContext context)
+            {
+                var inspectionScreen = Gui.GuiService.GetScreen<CharacterInspectionScreen>();
+                var partyStatusScreen = Gui.GuiService.GetScreen<GamePartyStatusScreen>();
+                var hero = functorParameters.RestingHero;
+
+                Gui.GuiService.GetScreen<RestModal>().KeepCurrentState = true;
+
+                var spellRepertoire = hero.SpellRepertoires.FirstOrDefault(x =>
+                    x.SpellCastingFeature.SpellReadyness == SpellReadyness.Prepared);
+
+                if (spellRepertoire == null)
+                {
+                    yield break;
+                }
+
+                var preparedSpellsClone = spellRepertoire.PreparedSpells.ToList();
+
+                spellRepertoire.ExtraSpellsByTag.TryAdd(Signature, spellRepertoire.AutoPreparedSpells.ToList());
+                spellRepertoire.PreparedSpells.SetRange(spellRepertoire.ExtraSpellsByTag[Signature]);
+                spellRepertoire.ExtraSpellsByTag[Signature] = [];
+
+                var activeCondition = hero.InflictCondition(
+                    $"Condition{Signature}",
+                    DurationType.Permanent,
+                    0,
+                    TurnOccurenceType.StartOfTurn,
+                    AttributeDefinitions.TagEffect,
+                    hero.guid,
+                    hero.CurrentFaction.Name,
+                    1,
+                    $"Condition{Signature}",
+                    0,
+                    0,
+                    0);
+
+                partyStatusScreen.SetupDisplayPreferences(false, false, false);
+
+                inspectionScreen.ShowSpellPreparation(
+                    functorParameters.RestingHero, Gui.GuiService.GetScreen<RestModal>(), spellRepertoire);
+
+                while (context.Async && inspectionScreen.Visible)
+                {
+                    yield return null;
+                }
+
+                spellRepertoire.ExtraSpellsByTag[Signature]
+                    .SetRange(spellRepertoire.PreparedSpells.Except(spellRepertoire.AutoPreparedSpells));
+                spellRepertoire.PreparedSpells.SetRange(preparedSpellsClone);
+                spellRepertoire.PreparedSpells.RemoveAll(x => spellRepertoire.ExtraSpellsByTag[Signature].Contains(x));
+                partyStatusScreen.SetupDisplayPreferences(true, true, true);
+                hero.RemoveCondition(activeCondition);
+            }
+        }
     }
 
     private sealed class ActionFinishedByMeArchDruid(
diff --git a/SolastaUnfinishedBusiness/Models/MerchantTypeContext.cs b/SolastaUnfinishedBusiness/Models/MerchantTypeContext.cs
index 7bd32b07dc..28b6ef5dd8 100644
--- a/SolastaUnfinishedBusiness/Models/MerchantTypeContext.cs
+++ b/SolastaUnfinishedBusiness/Models/MerchantTypeContext.cs
@@ -294,10 +294,9 @@ private static ItemDefinition BuildManual([NotNull] RecipeDefinition recipe, Ite
             .SetItemTags(TagsDefinitions.ItemTagStandard, TagsDefinitions.ItemTagPaper)
             .SetDocumentInformation(recipe, reference.DocumentDescription.ContentFragments)
             .SetGold(Main.Settings.RecipeCost)
+            .HideFromDungeonEditor()
             .AddToDB();
 
-        manual.inDungeonEditor = false;
-
         return manual;
     }
 
diff --git a/SolastaUnfinishedBusiness/Models/SrdAndHouseRulesContext.cs b/SolastaUnfinishedBusiness/Models/SrdAndHouseRulesContext.cs
index 00defe3825..21c92a5c1b 100644
--- a/SolastaUnfinishedBusiness/Models/SrdAndHouseRulesContext.cs
+++ b/SolastaUnfinishedBusiness/Models/SrdAndHouseRulesContext.cs
@@ -82,7 +82,6 @@ internal static void LateLoad()
         LoadSenseNormalVisionRangeMultiplier();
         SwitchAddBleedingToLesserRestoration();
         SwitchAllowClubsToBeThrown();
-        SwitchAllowTargetingSelectionWhenCastingChainLightningSpell();
         SwitchChangeSleetStormToCube();
         SwitchColdResistanceAndImmunityAlsoGrantsWeatherImmunity();
         SwitchConditionBlindedShouldNotAllowOpportunityAttack();
@@ -323,30 +322,6 @@ internal static void SwitchConditionBlindedShouldNotAllowOpportunityAttack()
         }
     }
 
-    /// <summary>
-    ///     Allow the user to select targets when using 'Chain Lightning'.
-    /// </summary>
-    internal static void SwitchAllowTargetingSelectionWhenCastingChainLightningSpell()
-    {
-        var spell = ChainLightning.EffectDescription;
-
-        if (Main.Settings.AllowTargetingSelectionWhenCastingChainLightningSpell)
-        {
-            // This is half fix, half houses rules since it's not completely SRD but better than implemented.
-            // Spell should arc from target (range 150ft) onto upto 3 extra selectable targets (range 30ft from first).
-            // Fix by allowing 4 selectable targets.
-            spell.targetType = TargetType.IndividualsUnique;
-            spell.targetParameter = 4;
-            spell.effectAdvancement.additionalTargetsPerIncrement = 1;
-        }
-        else
-        {
-            spell.targetType = TargetType.ArcFromIndividual;
-            spell.targetParameter = 3;
-            spell.effectAdvancement.additionalTargetsPerIncrement = 0;
-        }
-    }
-
     internal static void SwitchOfficialFoodRationsWeight()
     {
         var foodSrdWeight = Food_Ration;
diff --git a/SolastaUnfinishedBusiness/Patches/GameLocationTargetingManagerPatcher.cs b/SolastaUnfinishedBusiness/Patches/GameLocationTargetingManagerPatcher.cs
new file mode 100644
index 0000000000..bbae780898
--- /dev/null
+++ b/SolastaUnfinishedBusiness/Patches/GameLocationTargetingManagerPatcher.cs
@@ -0,0 +1,115 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using HarmonyLib;
+using JetBrains.Annotations;
+using SolastaUnfinishedBusiness.Api.GameExtensions;
+
+namespace SolastaUnfinishedBusiness.Patches;
+
+[UsedImplicitly]
+public static class GameLocationTargetingManagerPatcher
+{
+    //BUGFIX: Chain Lightning allow targeting enemies that cannot be perceived creating soft lock situations
+    [HarmonyPatch(typeof(GameLocationTargetingManager), "IGameLocationTargetingService.ComputeAndSortSubtargets")]
+    [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
+    [UsedImplicitly]
+    public static class ComputeAndSortSubtargets_Patch
+    {
+        [UsedImplicitly]
+        public static bool Prefix(
+            GameLocationTargetingManager __instance,
+            GameLocationCharacter caster,
+            RulesetEffect rulesetEffect,
+            GameLocationCharacter mainTarget,
+            List<GameLocationCharacter> subTargets)
+        {
+            ComputeAndSortSubtargets(__instance, caster, rulesetEffect, mainTarget, subTargets);
+
+            return false;
+        }
+
+        private static void ComputeAndSortSubtargets(
+            GameLocationTargetingManager __instance,
+            GameLocationCharacter caster,
+            RulesetEffect rulesetEffect,
+            GameLocationCharacter mainTarget,
+            List<GameLocationCharacter> subTargets)
+        {
+            subTargets.Clear();
+
+            if (rulesetEffect == null ||
+                rulesetEffect.EffectDescription.TargetType != RuleDefinitions.TargetType.ArcFromIndividual ||
+                rulesetEffect.EffectDescription.TargetParameter <= 0 ||
+                rulesetEffect.EffectDescription.TargetParameter2 <= 0)
+            {
+                return;
+            }
+
+            var maxTargets = rulesetEffect.ComputeTargetParameter();
+            var range = rulesetEffect.ComputeTargetParameter2();
+
+            var battleService = ServiceRepository.GetService<IGameLocationBattleService>();
+
+            foreach (var validEntity in ServiceRepository
+                         .GetService<IGameLocationCharacterService>().AllValidEntities
+                         .Where(x => x.RulesetActor is not RulesetCharacterEffectProxy))
+            {
+                if (validEntity.RulesetActor is RulesetGadget)
+                {
+                    var gadgetService = ServiceRepository.GetService<IGameLocationGadgetService>();
+                    var guid = validEntity.RulesetGadget.Guid;
+
+                    if (gadgetService.TryGetGadgetByGadgetGuid(guid, out var gameGadget))
+                    {
+                        var factoryService = ServiceRepository.GetService<IWorldLocationEntityFactoryService>();
+
+                        if (factoryService.TryFindWorldGadget(gameGadget, out var worldGadget) &&
+                            !worldGadget.HasTargetingFlow())
+                        {
+                            continue;
+                        }
+                    }
+                }
+
+                if (validEntity != mainTarget &&
+                    //BEGIN PATCH
+                    caster.CanPerceiveTarget(validEntity) &&
+                    //END PATCH
+                    battleService.IsWithinXCells(mainTarget, validEntity, range))
+                {
+                    subTargets.Add(validEntity);
+                }
+            }
+
+            __instance.compareCenter = mainTarget.LocationPosition;
+            subTargets.Sort(__instance);
+
+            while (subTargets.Count > maxTargets)
+            {
+                var flag = false;
+                for (var index = subTargets.Count - 1; index >= 0; --index)
+                {
+                    if (subTargets[index].IsOppositeSide(caster.Side))
+                    {
+                        continue;
+                    }
+
+                    subTargets.RemoveAt(index);
+                    flag = true;
+                    break;
+                }
+
+                if (!flag)
+                {
+                    break;
+                }
+            }
+
+            while (subTargets.Count > maxTargets)
+            {
+                subTargets.RemoveRange(maxTargets, subTargets.Count - maxTargets);
+            }
+        }
+    }
+}
diff --git a/SolastaUnfinishedBusiness/Patches/RulesetCharacterHeroPatcher.cs b/SolastaUnfinishedBusiness/Patches/RulesetCharacterHeroPatcher.cs
index 176a5dfe38..7bd93a158b 100644
--- a/SolastaUnfinishedBusiness/Patches/RulesetCharacterHeroPatcher.cs
+++ b/SolastaUnfinishedBusiness/Patches/RulesetCharacterHeroPatcher.cs
@@ -942,6 +942,16 @@ public static void Postfix(RulesetCharacterHero __instance)
         {
             __instance.afterRestActions.RemoveAll(activity =>
             {
+                if (!Level20Context.WizardSpellMastery.IsRestActivityAvailable(activity, __instance))
+                {
+                    return true;
+                }
+
+                if (!Level20Context.WizardSignatureSpells.IsRestActivityAvailable(activity, __instance))
+                {
+                    return true;
+                }
+
                 if (activity.functor != PowerBundleContext.UseCustomRestPowerFunctorName)
                 {
                     return false;
diff --git a/SolastaUnfinishedBusiness/Patches/RulesetCharacterPatcher.cs b/SolastaUnfinishedBusiness/Patches/RulesetCharacterPatcher.cs
index 2faad86c83..f7f36aafa4 100644
--- a/SolastaUnfinishedBusiness/Patches/RulesetCharacterPatcher.cs
+++ b/SolastaUnfinishedBusiness/Patches/RulesetCharacterPatcher.cs
@@ -2009,9 +2009,11 @@ public static bool Prefix(RulesetCharacter __instance, RulesetEffectSpell active
 
             if (effectLevel > 0)
             {
-                foreach (var featureDefinition in __instance.GetFeaturesByType<ISpellCastingAffinityProvider>()
-                             .Where(featureDefinition => featureDefinition.PreserveSlotRoll
-                                                         && featureDefinition.PreserveSlotLevelCap >= effectLevel))
+                foreach (var featureDefinition in __instance
+                             .GetFeaturesByType<ISpellCastingAffinityProvider>()
+                             .Where(featureDefinition =>
+                                 featureDefinition.PreserveSlotRoll &&
+                                 featureDefinition.PreserveSlotLevelCap >= effectLevel))
                 {
                     preserveSlotThreshold =
                         Math.Min(preserveSlotThreshold, featureDefinition.PreserveSlotThreshold);
@@ -2031,14 +2033,26 @@ public static bool Prefix(RulesetCharacter __instance, RulesetEffectSpell active
 
                     if (caster != null)
                     {
-                        EffectHelpers.StartVisualEffect(caster, caster, LesserRestoration,
-                            EffectHelpers.EffectType.Caster);
+                        EffectHelpers.StartVisualEffect(
+                            caster, caster, LesserRestoration, EffectHelpers.EffectType.Caster);
                     }
 
                     __instance.SpellSlotPreserved?.Invoke(__instance, preserveSlotThresholdFeature, rolledValue);
                 }
                 else
                 {
+                    //BEGIN PATCH: supports Wizard Spell Mastery and Signature Spells
+                    if (!Level20Context.WizardSpellMastery.ShouldConsumeSlot(__instance, activeSpell))
+                    {
+                        return false;
+                    }
+
+                    if (!Level20Context.WizardSignatureSpells.ShouldConsumeSlot(__instance, activeSpell))
+                    {
+                        return false;
+                    }
+                    //END PATCH
+
                     activeSpell.SpellRepertoire.SpendSpellSlot(activeSpell.SlotLevel);
                 }
             }
diff --git a/SolastaUnfinishedBusiness/Patches/RulesetSpellRepertoirePatcher.cs b/SolastaUnfinishedBusiness/Patches/RulesetSpellRepertoirePatcher.cs
index 937b8d1959..38110e407b 100644
--- a/SolastaUnfinishedBusiness/Patches/RulesetSpellRepertoirePatcher.cs
+++ b/SolastaUnfinishedBusiness/Patches/RulesetSpellRepertoirePatcher.cs
@@ -29,6 +29,41 @@ private static bool FormatTitle(RulesetSpellRepertoire __instance, ref string __
         return false;
     }
 
+    //PATCH: Supports Wizard Mastery and Signature spell features
+    [HarmonyPatch(typeof(RulesetSpellRepertoire), nameof(RulesetSpellRepertoire.MaxPreparedSpell), MethodType.Getter)]
+    [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
+    [UsedImplicitly]
+    public static class MaxPreparedSpell_Getter_Patch
+    {
+        [UsedImplicitly]
+        public static bool Prefix(RulesetSpellRepertoire __instance, ref int __result)
+        {
+            var caster = __instance.GetCasterHero();
+
+            if (caster == null)
+            {
+                return true;
+            }
+
+            if (Level20Context.WizardSpellMastery.IsPreparation(caster, out var maxSpellMastery))
+            {
+                __result = maxSpellMastery;
+
+                return false;
+            }
+
+            // ReSharper disable once InvertIf
+            if (Level20Context.WizardSignatureSpells.IsPreparation(caster, out var maxSignatureSpells))
+            {
+                __result = maxSignatureSpells;
+
+                return false;
+            }
+
+            return true;
+        }
+    }
+
     //PATCH: handles all different scenarios of spell slots consumption (casts, smites, point buys)
     [HarmonyPatch(typeof(RulesetSpellRepertoire), nameof(RulesetSpellRepertoire.SpendSpellSlot))]
     [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
diff --git a/SolastaUnfinishedBusiness/Patches/SpellBoxPatcher.cs b/SolastaUnfinishedBusiness/Patches/SpellBoxPatcher.cs
index 2dcd445ebd..1e052ff7d2 100644
--- a/SolastaUnfinishedBusiness/Patches/SpellBoxPatcher.cs
+++ b/SolastaUnfinishedBusiness/Patches/SpellBoxPatcher.cs
@@ -73,7 +73,7 @@ public static void Postfix(SpellBox __instance)
             const string CLASS_FORMAT = "Screen/&ClassExtraSpellDescriptionFormat";
             const string SUBCLASS_FORMAT = "Screen/&SubclassClassExtraSpellDescriptionFormat";
 
-            __instance.autoPreparedTitle.Text = "Screen/&MulticlassExtraSpellTitle";
+            //__instance.autoPreparedTitle.Text = "Screen/&MulticlassExtraSpellTitle";
 
             switch (type)
             {
diff --git a/SolastaUnfinishedBusiness/Patches/SpellRepertoirePanelPatcher.cs b/SolastaUnfinishedBusiness/Patches/SpellRepertoirePanelPatcher.cs
index a3acf70015..ab66c9769c 100644
--- a/SolastaUnfinishedBusiness/Patches/SpellRepertoirePanelPatcher.cs
+++ b/SolastaUnfinishedBusiness/Patches/SpellRepertoirePanelPatcher.cs
@@ -1,8 +1,15 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection.Emit;
 using HarmonyLib;
 using JetBrains.Annotations;
 using SolastaUnfinishedBusiness.Api;
+using SolastaUnfinishedBusiness.Api.Helpers;
 using SolastaUnfinishedBusiness.Models;
+using TMPro;
+using UnityEngine;
+using static SolastaUnfinishedBusiness.Models.Level20Context;
 
 namespace SolastaUnfinishedBusiness.Patches;
 
@@ -32,4 +39,94 @@ public static void Postfix(SpellRepertoirePanel __instance)
             }
         }
     }
+
+    //PATCH: Supports Wizard Mastery and Signature spell features
+    //UI allows other spells to be selected so easier to prevent it here
+    [HarmonyPatch(typeof(SpellRepertoirePanel), nameof(SpellRepertoirePanel.OnSpellSelectedForPreparation))]
+    [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
+    [UsedImplicitly]
+    public static class OnSpellSelectedForPreparation_Patch
+    {
+        [UsedImplicitly]
+        public static bool Prefix(SpellRepertoirePanel __instance, SpellBox spellBox)
+        {
+            var rulesetCharacter = __instance.GuiCharacter.RulesetCharacter;
+
+            return
+                !WizardSpellMastery.IsInvalidSelectedSpell(rulesetCharacter, spellBox.SpellDefinition) &&
+                !WizardSignatureSpells.IsInvalidSelectedSpell(rulesetCharacter, spellBox.SpellDefinition);
+        }
+    }
+
+    //PATCH: Supports Wizard Mastery and Signature spell features
+    [HarmonyPatch(typeof(SpellRepertoirePanel), nameof(SpellRepertoirePanel.RefreshPreparation))]
+    [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
+    [UsedImplicitly]
+    public static class RefreshPreparation_Patch
+    {
+        [UsedImplicitly]
+        public static IEnumerable<CodeInstruction> Transpiler([NotNull] IEnumerable<CodeInstruction> instructions)
+        {
+            var refreshInteractivePreparationMethod =
+                typeof(SpellsByLevelGroup).GetMethod("RefreshInteractivePreparation");
+            var myRefreshInteractivePreparationMethod =
+                new Action<SpellsByLevelGroup, bool, bool, List<SpellDefinition>, SpellRepertoirePanel>(
+                    RefreshInteractivePreparation).Method;
+
+            return instructions.ReplaceCalls(refreshInteractivePreparationMethod,
+                "SpellRepertoirePanel.RefreshPreparation",
+                new CodeInstruction(OpCodes.Ldarg_0),
+                new CodeInstruction(OpCodes.Call, myRefreshInteractivePreparationMethod));
+        }
+
+        private static void RepaintPanel(SpellRepertoirePanel __instance, string title, bool showDesc, bool showButton)
+        {
+            var titleTransform = __instance.PreparationPanel.transform.FindChildRecursive("Title");
+            var descriptionTransform = __instance.PreparationPanel.transform.FindChildRecursive("Description");
+            var automateButtonTransform = __instance.PreparationPanel.transform.FindChildRecursive("AutomateButton");
+
+            descriptionTransform!.gameObject.SetActive(showDesc);
+            // not the best solution but this object is getting re-activated somewhere else so moving off-screen
+            automateButtonTransform!.localPosition = showButton ? new Vector3(-12.5f, -61) : new Vector3(-1000, -1000);
+            titleTransform!.GetComponentInChildren<TextMeshProUGUI>().text = title;
+        }
+
+        private static void RefreshInteractivePreparation(
+            SpellsByLevelGroup spellsByLevelGroup,
+            bool canSelectSpells,
+            bool maxReached,
+            List<SpellDefinition> preparedSpells,
+            SpellRepertoirePanel spellRepertoirePanel)
+        {
+            var rulesetCharacter = spellRepertoirePanel.GuiCharacter.RulesetCharacter;
+
+            if (WizardSpellMastery.IsPreparation(rulesetCharacter, out _))
+            {
+                RepaintPanel(
+                    spellRepertoirePanel,
+                    Gui.Localize(WizardSpellMastery.FeatureSpellMastery.GuiPresentation.Title),
+                    true, false);
+
+                canSelectSpells = spellsByLevelGroup.SpellLevel is 1 or 2;
+            }
+            else if (WizardSignatureSpells.IsPreparation(rulesetCharacter, out _))
+            {
+                RepaintPanel(
+                    spellRepertoirePanel,
+                    Gui.Localize(WizardSignatureSpells.PowerSignatureSpells.GuiPresentation.Title),
+                    Main.Settings.EnableSignatureSpellsRelearn, false);
+
+                canSelectSpells = spellsByLevelGroup.SpellLevel is 3;
+            }
+            else
+            {
+                RepaintPanel(
+                    spellRepertoirePanel,
+                    Gui.Localize("Screen/&PreparePanelTitle"),
+                    true, true);
+            }
+
+            spellsByLevelGroup.RefreshInteractivePreparation(canSelectSpells, maxReached, preparedSpells);
+        }
+    }
 }
diff --git a/SolastaUnfinishedBusiness/Settings.cs b/SolastaUnfinishedBusiness/Settings.cs
index c7bc3b17bb..74c77a2554 100644
--- a/SolastaUnfinishedBusiness/Settings.cs
+++ b/SolastaUnfinishedBusiness/Settings.cs
@@ -213,6 +213,7 @@ public class Settings : UnityModManager.ModSettings
     public bool EnableRogueCunningStrike { get; set; }
     public bool EnableRogueFightingStyle { get; set; }
     public bool EnableRogueSteadyAim { get; set; }
+    public bool EnableRogueStrSaving { get; set; }
 
     // Visuals
     public bool OfferAdditionalLoreFriendlyNames { get; set; }
@@ -254,7 +255,6 @@ public class Settings : UnityModManager.ModSettings
     public bool KeepInvisibilityWhenUsingItems { get; set; }
     public bool IllusionSpellsAutomaticallyFailAgainstTrueSightInRange { get; set; }
     public bool BlindedConditionDontAllowAttackOfOpportunity { get; set; }
-    public bool AllowTargetingSelectionWhenCastingChainLightningSpell { get; set; }
     public bool RemoveHumanoidFilterOnHideousLaughter { get; set; }
     public bool AddBleedingToLesserRestoration { get; set; }
     public bool BestowCurseNoConcentrationRequiredForSlotLevel5OrAbove { get; set; }
@@ -286,7 +286,7 @@ public class Settings : UnityModManager.ModSettings
     public bool IgnoreHandXbowFreeHandRequirements { get; set; }
     public bool MakeAllMagicStaveArcaneFoci { get; set; }
     public bool ChangeDragonbornElementalBreathUsages { get; set; }
-    public bool EnableRogueStrSaving { get; set; }
+    public bool EnableSignatureSpellsRelearn { get; set; }
     public bool AccountForAllDiceOnSavageAttack { get; set; }
     public bool AllowFlightSuspend { get; set; }
     public bool FlightSuspendWingedBoots { get; set; }
diff --git a/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj b/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj
index 5b25e32424..c6a13e52a0 100644
--- a/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj
+++ b/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <LangVersion>12</LangVersion>
     <TargetFramework>net48</TargetFramework>
-    <AssemblyVersion>1.5.97.8</AssemblyVersion>
+    <AssemblyVersion>1.5.97.9</AssemblyVersion>
     <RepositoryUrl>https://github.com/SolastaMods/SolastaUnfinishedBusiness</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Configurations>Debug Install;Release Install</Configurations>
@@ -235,7 +235,6 @@
 
   <ItemGroup Condition="('$(Configuration)|$(Platform)' == 'Release|AnyCPU' Or '$(Configuration)|$(Platform)' == 'Release Install|AnyCPU')">
     <Compile Remove="Api/DatabaseHelper.cs"/>
-    <Compile Remove="FightingStyles\ZenArcher.cs"/>
   </ItemGroup>
 
   <ItemGroup Condition="('$(Configuration)|$(Platform)' == 'Debug|AnyCPU' Or '$(Configuration)|$(Platform)' == 'Debug Install|AnyCPU')">
diff --git a/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel01.cs b/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel01.cs
index c6a86d38f6..ea7dc09f5a 100644
--- a/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel01.cs
+++ b/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel01.cs
@@ -2066,6 +2066,7 @@ internal static SpellDefinition BuildFindFamiliar()
             .SetFullyControlledWhenAllied(true)
             .SetDefaultFaction(FactionDefinitions.Party)
             .SetBestiaryEntry(BestiaryDefinitions.BestiaryEntry.None)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .AddToDB();
 
         var spell = SpellDefinitionBuilder.Create(Fireball, "FindFamiliar")
@@ -2478,6 +2479,7 @@ private sealed class ActionFinishedByMeWitchBolt(
     {
         public IEnumerator OnActionFinishedByMe(CharacterAction action)
         {
+            // handle initial cases
             switch (action)
             {
                 case CharacterActionUsePower actionUsePower when
@@ -2498,6 +2500,16 @@ or ActivationTime.OnAttackOrSpellHitAuto
             var actingCharacter = action.ActingCharacter;
             var rulesetCharacter = actingCharacter.RulesetCharacter;
 
+            // any bonus, reaction, no cost is allowed
+            if (action.ActionType
+                is ActionDefinitions.ActionType.Bonus
+                or ActionDefinitions.ActionType.Reaction
+                or ActionDefinitions.ActionType.NoCost)
+            {
+                yield break;
+            }
+
+            // move allowed if still in range
             if (action.ActionId is ActionDefinitions.Id.TacticalMove or ActionDefinitions.Id.SpecialMove)
             {
                 if (Gui.Battle == null)
@@ -2529,7 +2541,7 @@ private sealed class ActionFinishedByMeWitchBoltEnemy(
         // ReSharper disable once SuggestBaseTypeForParameterInConstructor
         SpellDefinition spellWitchBolt,
         // ReSharper disable once SuggestBaseTypeForParameterInConstructor
-        ConditionDefinition conditionWitchBolt) : IActionFinishedByMe
+        ConditionDefinition conditionWitchBolt) : IActionFinishedByMe, IOnConditionAddedOrRemoved
     {
         public IEnumerator OnActionFinishedByMe(CharacterAction action)
         {
@@ -2566,7 +2578,24 @@ public IEnumerator OnActionFinishedByMe(CharacterAction action)
 
             if (rulesetSpell != null)
             {
-                rulesetCharacter.TerminateSpell(rulesetSpell);
+                rulesetCaster.TerminateSpell(rulesetSpell);
+            }
+        }
+
+        public void OnConditionAdded(RulesetCharacter target, RulesetCondition rulesetCondition)
+        {
+            // empty
+        }
+
+        public void OnConditionRemoved(RulesetCharacter target, RulesetCondition rulesetCondition)
+        {
+            var rulesetCaster = EffectHelpers.GetCharacterByGuid(rulesetCondition.SourceGuid);
+
+            var rulesetSpell = rulesetCaster?.SpellsCastByMe.FirstOrDefault(x => x.SpellDefinition == spellWitchBolt);
+
+            if (rulesetSpell != null)
+            {
+                rulesetCaster.TerminateSpell(rulesetSpell);
             }
         }
     }
diff --git a/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel02.cs b/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel02.cs
index 1097b73127..2f37967bd2 100644
--- a/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel02.cs
+++ b/SolastaUnfinishedBusiness/Spells/SpellBuildersLevel02.cs
@@ -500,16 +500,6 @@ internal static SpellDefinition BuildWitherAndBloom()
     {
         const string NAME = "WitherAndBloom";
 
-        var conditionSpellCastingBonus = ConditionDefinitionBuilder
-            .Create($"Condition{NAME}")
-            .SetGuiPresentationNoContent(true)
-            .SetSilent(Silent.WhenAddedOrRemoved)
-            .SetAmountOrigin(ConditionDefinition.OriginOfAmount.Fixed)
-            .AddToDB();
-
-        conditionSpellCastingBonus.AddCustomSubFeatures(
-            new ModifyDiceRollHitDiceWitherAndBloom(conditionSpellCastingBonus));
-
         var power = FeatureDefinitionPowerBuilder
             .Create($"Power{NAME}")
             .SetGuiPresentation(NAME, Category.Spell, hidden: true)
@@ -519,7 +509,8 @@ internal static SpellDefinition BuildWitherAndBloom()
                 EffectDescriptionBuilder
                     .Create()
                     .SetTargetingData(Side.Enemy, RangeType.Self, 0, TargetType.Sphere, 2)
-                    .SetSavingThrowData(false, AttributeDefinitions.Constitution, false,
+                    .SetSavingThrowData(
+                        false, AttributeDefinitions.Constitution, false,
                         EffectDifficultyClassComputation.SpellCastingFeature)
                     .SetEffectForms(
                         EffectFormBuilder
@@ -532,6 +523,14 @@ internal static SpellDefinition BuildWitherAndBloom()
                     .Build())
             .AddToDB();
 
+        var conditionSpellCastingBonus = ConditionDefinitionBuilder
+            .Create($"Condition{NAME}")
+            .SetGuiPresentationNoContent(true)
+            .SetSilent(Silent.WhenAddedOrRemoved)
+            .SetAmountOrigin(ConditionDefinition.OriginOfAmount.Fixed)
+            .SetFeatures(power)
+            .AddToDB();
+
         var spell = SpellDefinitionBuilder
             .Create(NAME)
             .SetGuiPresentation(Category.Spell, Sprites.GetSprite(NAME, Resources.WitherAndBloom, 128))
@@ -545,23 +544,28 @@ internal static SpellDefinition BuildWitherAndBloom()
             .SetEffectDescription(
                 EffectDescriptionBuilder
                     .Create()
+                    .SetDurationData(DurationType.Round)
                     .SetTargetingData(Side.Ally, RangeType.Distance, 12, TargetType.IndividualsUnique)
                     .SetEffectAdvancement(EffectIncrementMethod.PerAdditionalSlotLevel, additionalDicePerIncrement: 1)
-                    .SetCasterEffectParameters(VampiricTouch)
+                    .SetEffectForms(
+                        EffectFormBuilder.ConditionForm(
+                            conditionSpellCastingBonus,
+                            ConditionForm.ConditionOperation.Add, true))
+                    .SetCasterEffectParameters(FalseLife)
                     .Build())
             .AddToDB();
 
-        var customBehavior = new CustomBehaviorWitherAndBloom(spell, power, conditionSpellCastingBonus);
-
-        power.AddCustomSubFeatures(customBehavior);
-        spell.AddCustomSubFeatures(customBehavior);
+        conditionSpellCastingBonus.AddCustomSubFeatures(
+            new AddUsablePowersFromCondition(),
+            new CustomBehaviorWitherAndBloomPower(power, conditionSpellCastingBonus));
+        spell.AddCustomSubFeatures(new CustomBehaviorWitherAndBloom(power, conditionSpellCastingBonus));
 
         return spell;
     }
 
-    private sealed class ModifyDiceRollHitDiceWitherAndBloom(
-        // ReSharper disable once SuggestBaseTypeForParameterInConstructor
-        ConditionDefinition conditionSpellCastingBonus) : IModifyDiceRollHitDice
+    private sealed class CustomBehaviorWitherAndBloomPower(
+        FeatureDefinitionPower powerWitherAndBloom,
+        ConditionDefinition conditionWitherAndBloom) : IModifyDiceRollHitDice, IModifyEffectDescription
     {
         public void BeforeRoll(
             RulesetCharacterHero __instance,
@@ -572,30 +576,43 @@ public void BeforeRoll(
             ref bool isBonus)
         {
             if (__instance.TryGetConditionOfCategoryAndType(
-                    AttributeDefinitions.TagEffect, conditionSpellCastingBonus.Name, out var activeCondition))
+                    AttributeDefinitions.TagEffect, conditionWitherAndBloom.Name, out var activeCondition))
             {
-                modifier += activeCondition.Amount;
+                modifier = activeCondition.amount;
             }
         }
+
+        public bool IsValid(BaseDefinition definition, RulesetCharacter character, EffectDescription effectDescription)
+        {
+            return definition == powerWitherAndBloom;
+        }
+
+        public EffectDescription GetEffectDescription(
+            BaseDefinition definition,
+            EffectDescription effectDescription,
+            RulesetCharacter character,
+            RulesetEffect rulesetEffect)
+        {
+            if (character.TryGetConditionOfCategoryAndType(
+                    AttributeDefinitions.TagEffect, conditionWitherAndBloom.Name, out var activeCondition))
+            {
+                effectDescription.EffectForms[0].DamageForm.DiceNumber = activeCondition.EffectLevel;
+            }
+
+            return effectDescription;
+        }
     }
 
     private sealed class CustomBehaviorWitherAndBloom(
-        // ReSharper disable once SuggestBaseTypeForParameterInConstructor
-        SpellDefinition spellWitherAndBloom,
-        // ReSharper disable once SuggestBaseTypeForParameterInConstructor
         FeatureDefinitionPower powerWitherAndBloom,
-        // ReSharper disable once SuggestBaseTypeForParameterInConstructor
-        ConditionDefinition conditionSpellCastingBonus) : IMagicEffectInitiatedByMe
+        ConditionDefinition conditionWitherAndBloom) : IMagicEffectFinishedByMe
     {
-        private int _effectLevel;
+        private int _spellCastingAbility;
 
-        public IEnumerator OnMagicEffectInitiatedByMe(CharacterActionMagicEffect action, BaseDefinition baseDefinition)
+        public IEnumerator OnMagicEffectFinishedByMe(CharacterActionMagicEffect action, BaseDefinition baseDefinition)
         {
-            if (baseDefinition == powerWitherAndBloom &&
-                action.ActionParams.activeEffect is RulesetEffectPower rulesetEffectPower)
+            if (action.ActionParams.activeEffect is not RulesetEffectSpell rulesetEffectSpell)
             {
-                rulesetEffectPower.EffectDescription.EffectForms[0].DamageForm.diceNumber = _effectLevel;
-
                 yield break;
             }
 
@@ -609,13 +626,6 @@ public IEnumerator OnMagicEffectInitiatedByMe(CharacterActionMagicEffect action,
                 yield break;
             }
 
-            if (Gui.Battle == null ||
-                baseDefinition != spellWitherAndBloom ||
-                action.ActionParams.activeEffect is not RulesetEffectSpell rulesetEffectSpell)
-            {
-                yield break;
-            }
-
             var target = action.ActionParams.TargetCharacters[0];
             var rulesetTarget = target.RulesetCharacter.GetOriginalHero();
 
@@ -624,31 +634,22 @@ public IEnumerator OnMagicEffectInitiatedByMe(CharacterActionMagicEffect action,
                 yield break;
             }
 
-            _effectLevel = rulesetEffectSpell.EffectLevel;
-
-            var actingCharacter = action.ActingCharacter;
-            var rulesetCharacter = actingCharacter.RulesetCharacter;
-            var effectLevel = _effectLevel;
-            var modifier = AttributeDefinitions.ComputeAbilityScoreModifier(
-                rulesetCharacter.TryGetAttributeValue(rulesetEffectSpell.SpellRepertoire.SpellCastingAbility));
+            var attacker = action.ActingCharacter;
+            var rulesetAttacker = attacker.RulesetCharacter;
 
-            rulesetTarget.HitDieRolled += HitDieRolled;
+            _spellCastingAbility = AttributeDefinitions.ComputeAbilityScoreModifier(
+                rulesetAttacker.TryGetAttributeValue(rulesetEffectSpell.SpellRepertoire.SpellCastingAbility));
 
-            var activeCondition = rulesetTarget.InflictCondition(
-                conditionSpellCastingBonus.Name,
-                DurationType.Round,
-                0,
-                TurnOccurenceType.EndOfSourceTurn,
-                AttributeDefinitions.TagEffect,
-                rulesetCharacter.guid,
-                rulesetCharacter.CurrentFaction.Name,
-                1,
-                conditionSpellCastingBonus.Name,
-                modifier,
-                0,
-                0);
+            if (rulesetAttacker.TryGetConditionOfCategoryAndType(
+                    AttributeDefinitions.TagEffect, conditionWitherAndBloom.Name, out var activeCondition))
+            {
+                activeCondition.Amount = _spellCastingAbility;
+            }
 
             var hasHealed = false;
+            var effectLevel = rulesetEffectSpell.EffectLevel;
+
+            rulesetTarget.HitDieRolled += HitDieRolled;
 
             while (--effectLevel > 0 &&
                    rulesetTarget.RemainingHitDiceCount() > 0 &&
@@ -661,15 +662,15 @@ public IEnumerator OnMagicEffectInitiatedByMe(CharacterActionMagicEffect action,
                     {
                         StringParameter = Gui.Format(
                             "Reaction/&CustomReactionWitherAndBloomDescription",
-                            remainingHitPoints.ToString(), maxHitPoints.ToString(), actingCharacter.Name,
-                            modifier.ToString())
+                            remainingHitPoints.ToString(), maxHitPoints.ToString(), attacker.Name,
+                            _spellCastingAbility.ToString())
                     };
                 var reactionRequest = new ReactionRequestCustom("WitherAndBloom", reactionParams);
                 var count = actionManager.PendingReactionRequestGroups.Count;
 
                 actionManager.AddInterruptRequest(reactionRequest);
 
-                yield return battleManager.WaitForReactions(actingCharacter, actionManager, count);
+                yield return battleManager.WaitForReactions(attacker, actionManager, count);
 
                 if (!reactionParams.ReactionValidated)
                 {
@@ -680,27 +681,17 @@ public IEnumerator OnMagicEffectInitiatedByMe(CharacterActionMagicEffect action,
                 rulesetTarget.RollHitDie();
             }
 
-            rulesetTarget.RemoveCondition(activeCondition);
             rulesetTarget.HitDieRolled -= HitDieRolled;
 
-            var attacker = action.ActionParams.ActingCharacter;
-            var rulesetAttacker = attacker.RulesetCharacter;
-
             var implementationManager =
                 ServiceRepository.GetService<IRulesetImplementationService>() as RulesetImplementationManager;
 
             var usablePower = PowerProvider.Get(powerWitherAndBloom, rulesetAttacker);
             var targets = Gui.Battle.GetContenders(target, withinRange: 2);
-            var actionModifiers = new List<ActionModifier>();
-
-            for (var i = 0; i < targets.Count; i++)
-            {
-                actionModifiers.Add(new ActionModifier());
-            }
 
-            var actionParams = new CharacterActionParams(attacker, ActionDefinitions.Id.PowerNoCost)
+            // don't use PowerNoCost here as it breaks the spell under MP
+            var actionParams = new CharacterActionParams(attacker, ActionDefinitions.Id.SpendPower)
             {
-                ActionModifiers = actionModifiers,
                 RulesetEffect = implementationManager
                     .MyInstantiateEffectPower(rulesetAttacker, usablePower, false),
                 UsablePower = usablePower,
@@ -709,7 +700,7 @@ public IEnumerator OnMagicEffectInitiatedByMe(CharacterActionMagicEffect action,
 
             if (hasHealed)
             {
-                EffectHelpers.StartVisualEffect(actingCharacter, target, CureWounds, EffectHelpers.EffectType.Effect);
+                EffectHelpers.StartVisualEffect(attacker, target, CureWounds, EffectHelpers.EffectType.Effect);
             }
 
             ServiceRepository.GetService<ICommandService>()?
@@ -737,7 +728,8 @@ private void HitDieRolled(
                 extra:
                 [
                     (ConsoleStyleDuplet.ParameterType.AbilityInfo, Gui.FormatDieTitle(dieType)),
-                    (ConsoleStyleDuplet.ParameterType.Positive, $"{value - modifier}+{modifier}"),
+                    (ConsoleStyleDuplet.ParameterType.Positive,
+                        $"{value - _spellCastingAbility}+{_spellCastingAbility}"),
                     (ConsoleStyleDuplet.ParameterType.Positive, $"{value}")
                 ]);
         }
@@ -815,6 +807,7 @@ internal static SpellDefinition BuildShadowBlade()
             .SetOrUpdateGuiPresentation(Category.Item, ItemDefinitions.Enchanted_Dagger_Souldrinker)
             .SetItemTags(TagsDefinitions.ItemTagConjured)
             .MakeMagical()
+            .HideFromDungeonEditor()
             .AddToDB();
 
         itemShadowBlade.activeTags.Clear();
diff --git a/SolastaUnfinishedBusiness/Subclasses/Builders/GambitsBuilders.cs b/SolastaUnfinishedBusiness/Subclasses/Builders/GambitsBuilders.cs
index 654285250a..2b4305053a 100644
--- a/SolastaUnfinishedBusiness/Subclasses/Builders/GambitsBuilders.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/Builders/GambitsBuilders.cs
@@ -783,6 +783,7 @@ internal static void BuildGambits()
             .Create(ItemDefinitions.Dagger, "ConcealedDagger")
             .SetOrUpdateGuiPresentation("Item/&ConcealedDaggerTitle",
                 ItemDefinitions.Dagger.GuiPresentation.Description)
+            .HideFromDungeonEditor()
             .AddToDB();
 
         power.AddCustomSubFeatures(new SwiftThrow(concealedDagger, power));
diff --git a/SolastaUnfinishedBusiness/Subclasses/CircleOfTheAncientForest.cs b/SolastaUnfinishedBusiness/Subclasses/CircleOfTheAncientForest.cs
index e2cd9049ec..ef50f0e3cb 100644
--- a/SolastaUnfinishedBusiness/Subclasses/CircleOfTheAncientForest.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/CircleOfTheAncientForest.cs
@@ -234,6 +234,7 @@ private static FeatureDefinitionPowerSharedPool BuildHerbalBrew(
             .SetFoodDescription(foodDescription)
             .SetUsableDeviceDescription(baseItem.UsableDeviceDescription)
             .SetGold(0)
+            .HideFromDungeonEditor()
             .AddToDB();
 
         var brewForm = EffectFormBuilder
@@ -306,6 +307,7 @@ private static FeatureDefinitionPowerSharedPool BuildHerbalBrew(
             .SetUsableDeviceDescription(powerAncientForestPotion)
             .SetItemRarity(ItemRarity.Common)
             .SetRequiresIdentification(false)
+            .HideFromDungeonEditor()
             .AddToDB();
 
         var brewForm = EffectFormBuilder
diff --git a/SolastaUnfinishedBusiness/Subclasses/CircleOfTheNight.cs b/SolastaUnfinishedBusiness/Subclasses/CircleOfTheNight.cs
index 6ccf45ced2..a6355aaaaf 100644
--- a/SolastaUnfinishedBusiness/Subclasses/CircleOfTheNight.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/CircleOfTheNight.cs
@@ -221,6 +221,7 @@ private static MonsterDefinition HbWildShapeDireBear()
         var shape = MonsterDefinitionBuilder
             .Create(WildshapeBlackBear, "WildShapeDireBear")
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             // STR, DEX, CON, INT, WIS, CHA
             .SetAbilityScores(20, 10, 16, 2, 13, 7)
             .SetArmorClass(14)
@@ -239,6 +240,7 @@ private static MonsterDefinition HbWildShapeAirElemental()
         var shape = MonsterDefinitionBuilder
             .Create(Air_Elemental, "WildShapeAirElemental")
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape, Name)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .SetAbilityScores(14, 20, 14, 6, 10, 6) // STR, DEX, CON, INT, WIS, CHA
             .SetArmorClass(15)
             .SetStandardHitPoints(90)
@@ -253,6 +255,7 @@ private static MonsterDefinition HbWildShapeFireElemental()
         var shape = MonsterDefinitionBuilder
             .Create(Fire_Elemental, "WildShapeFireElemental")
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape, Name)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .AddToDB();
 
         return shape;
@@ -263,6 +266,7 @@ private static MonsterDefinition HbWildShapeEarthElemental()
         var shape = MonsterDefinitionBuilder
             .Create(Earth_Elemental, "WildShapeEarthElemental")
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape, Name)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .AddToDB();
 
         return shape;
@@ -273,6 +277,7 @@ private static MonsterDefinition HbWildShapeWaterElemental()
         var shape = MonsterDefinitionBuilder
             .Create(Ice_Elemental, "WildShapeWaterElemental")
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape, Name)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .AddToDB();
 
         return shape;
@@ -302,6 +307,7 @@ private static MonsterDefinition HbWildShapeCrimsonSpider()
         var shape = MonsterDefinitionBuilder
             .Create(CrimsonSpider, "WildShapeCrimsonSpider")
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape, Name)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .AddToDB();
 
         shape.AttackIterations[1].monsterAttackDefinition = attackCrimsonBite;
@@ -331,6 +337,7 @@ private static MonsterDefinition HbWildShapeMinotaurElite()
         var shape = MonsterDefinitionBuilder
             .Create(MinotaurElite, "WildShapeMinotaurElite")
             .SetOrUpdateGuiPresentation(Category.Monster)
+            .SetDungeonMakerPresence(MonsterDefinition.DungeonMaker.None)
             .SetCreatureTags(TagsDefinitions.CreatureTagWildShape, Name)
             .SetArmorClass(16)
             .SetStandardHitPoints(126)
diff --git a/SolastaUnfinishedBusiness/Subclasses/CollegeOfElegance.cs b/SolastaUnfinishedBusiness/Subclasses/CollegeOfElegance.cs
index 6289ff9578..32e8d2fa95 100644
--- a/SolastaUnfinishedBusiness/Subclasses/CollegeOfElegance.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/CollegeOfElegance.cs
@@ -267,12 +267,6 @@ public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
                 yield break;
             }
 
-            if (rulesetEffect != null &&
-                rulesetEffect.EffectDescription.RangeType is not (RangeType.MeleeHit or RangeType.RangeHit))
-            {
-                yield break;
-            }
-
             var rulesetHelper = helper.RulesetCharacter;
 
             if (helper != defender ||
diff --git a/SolastaUnfinishedBusiness/Subclasses/DomainTempest.cs b/SolastaUnfinishedBusiness/Subclasses/DomainTempest.cs
index eb809cd287..2fc2ec5b2b 100644
--- a/SolastaUnfinishedBusiness/Subclasses/DomainTempest.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/DomainTempest.cs
@@ -323,7 +323,7 @@ private static string GetAdditionalDamageType(
     }
 
     private sealed class CustomBehaviorWrathOfTheStorm(FeatureDefinitionPower powerWrathOfTheStorm)
-        : IPhysicalAttackBeforeHitConfirmedOnMe, IMagicEffectBeforeHitConfirmedOnMe, IActionFinishedByEnemy
+        : IAttackBeforeHitPossibleOnMeOrAlly, IActionFinishedByEnemy
     {
         private bool _isValid;
 
@@ -388,35 +388,15 @@ public IEnumerator OnActionFinishedByEnemy(CharacterAction action, GameLocationC
             }
         }
 
-        public IEnumerator OnMagicEffectBeforeHitConfirmedOnMe(
+        public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
             GameLocationBattleManager battleManager,
-            GameLocationCharacter attacker,
-            GameLocationCharacter defender,
-            ActionModifier actionModifier,
-            RulesetEffect rulesetEffect,
-            List<EffectForm> actualEffectForms,
-            bool firstTarget,
-            bool criticalHit)
-        {
-            _isValid = attacker.IsWithinRange(defender, 1) &&
-                       attacker.CanReact() &&
-                       defender.CanPerceiveTarget(attacker) &&
-                       rulesetEffect.EffectDescription.RangeType is RangeType.MeleeHit or RangeType.RangeHit;
-
-            yield break;
-        }
-
-        public IEnumerator OnPhysicalAttackBeforeHitConfirmedOnMe(
-            GameLocationBattleManager battleManager,
-            GameLocationCharacter attacker,
+            [UsedImplicitly] GameLocationCharacter attacker,
             GameLocationCharacter defender,
+            GameLocationCharacter helper,
             ActionModifier actionModifier,
             RulesetAttackMode attackMode,
-            bool rangedAttack,
-            AdvantageType advantageType,
-            List<EffectForm> actualEffectForms,
-            bool firstTarget,
-            bool criticalHit)
+            RulesetEffect rulesetEffect,
+            int attackRoll)
         {
             _isValid = attacker.IsWithinRange(defender, 1) &&
                        attacker.CanReact() &&
diff --git a/SolastaUnfinishedBusiness/Subclasses/InnovationArmor.cs b/SolastaUnfinishedBusiness/Subclasses/InnovationArmor.cs
index 5e527fb9ce..8873597358 100644
--- a/SolastaUnfinishedBusiness/Subclasses/InnovationArmor.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/InnovationArmor.cs
@@ -78,7 +78,7 @@ private static FeatureDefinitionAutoPreparedSpells BuildAutoPreparedSpells()
             .AddPreparedSpellGroup(5, MirrorImage, Shatter)
             .AddPreparedSpellGroup(9, HypnoticPattern, LightningBolt)
             .AddPreparedSpellGroup(13, FireShield, GreaterInvisibility)
-            .AddPreparedSpellGroup(17, SpellsContext.FarStep, WallOfForce)
+            .AddPreparedSpellGroup(17, SpellsContext.FarStep, HoldMonster)
             .AddToDB();
     }
 
diff --git a/SolastaUnfinishedBusiness/Subclasses/InnovationWeapon.cs b/SolastaUnfinishedBusiness/Subclasses/InnovationWeapon.cs
index 435bb67793..440b05269d 100644
--- a/SolastaUnfinishedBusiness/Subclasses/InnovationWeapon.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/InnovationWeapon.cs
@@ -72,7 +72,7 @@ private static FeatureDefinitionAutoPreparedSpells BuildAutoPreparedSpells()
             .AddPreparedSpellGroup(5, BrandingSmite, SpiritualWeapon)
             .AddPreparedSpellGroup(9, RemoveCurse, BeaconOfHope)
             .AddPreparedSpellGroup(13, FireShield, DeathWard)
-            .AddPreparedSpellGroup(17, MassCureWounds, WallOfForce)
+            .AddPreparedSpellGroup(17, MassCureWounds, SpellsContext.Telekinesis)
             .AddToDB();
     }
 
diff --git a/SolastaUnfinishedBusiness/Subclasses/MartialArcaneArcher.cs b/SolastaUnfinishedBusiness/Subclasses/MartialArcaneArcher.cs
index 8ebf288bf9..dbe1c5912f 100644
--- a/SolastaUnfinishedBusiness/Subclasses/MartialArcaneArcher.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/MartialArcaneArcher.cs
@@ -749,13 +749,14 @@ public IEnumerator OnTryAlterOutcomeAttack(
             if (!actionManager ||
                 action.AttackRollOutcome is not (RollOutcome.Failure or RollOutcome.CriticalFailure) ||
                 helper != attacker ||
+                !helper.CanReact() ||
                 !IsBow(attackMode, null, null))
             {
                 yield break;
             }
 
             var reactionParams =
-                new CharacterActionParams(attacker, (ActionDefinitions.Id)ExtraActionId.DoNothingFree)
+                new CharacterActionParams(attacker, (ActionDefinitions.Id)ExtraActionId.DoNothingReaction)
                 {
                     StringParameter = "Reaction/&CustomReactionMartialArcaneArcherGuidedShotDescription"
                 };
diff --git a/SolastaUnfinishedBusiness/Subclasses/MartialForceKnight.cs b/SolastaUnfinishedBusiness/Subclasses/MartialForceKnight.cs
index 0e2c6f6c40..a9b1ef1a6f 100644
--- a/SolastaUnfinishedBusiness/Subclasses/MartialForceKnight.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/MartialForceKnight.cs
@@ -775,12 +775,6 @@ public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
             RulesetEffect rulesetEffect,
             int attackRoll)
         {
-            if (rulesetEffect != null &&
-                rulesetEffect.EffectDescription.RangeType is not (RangeType.MeleeHit or RangeType.RangeHit))
-            {
-                yield break;
-            }
-
             var rulesetHelper = helper.RulesetCharacter;
 
             if (!helper.CanReact() ||
diff --git a/SolastaUnfinishedBusiness/Subclasses/OathOfAltruism.cs b/SolastaUnfinishedBusiness/Subclasses/OathOfAltruism.cs
index 604e05f5ad..0e143120f0 100644
--- a/SolastaUnfinishedBusiness/Subclasses/OathOfAltruism.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/OathOfAltruism.cs
@@ -37,7 +37,7 @@ public OathOfAltruism()
                 BuildSpellGroup(5, CalmEmotions, HoldPerson),
                 BuildSpellGroup(9, Counterspell, HypnoticPattern),
                 BuildSpellGroup(13, DominateBeast, GuardianOfFaith),
-                BuildSpellGroup(17, HoldMonster, WallOfForce))
+                BuildSpellGroup(17, HoldMonster, MassCureWounds))
             .SetSpellcastingClass(CharacterClassDefinitions.Paladin)
             .AddToDB();
 
@@ -229,12 +229,6 @@ public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
             RulesetEffect rulesetEffect,
             int attackRoll)
         {
-            if (rulesetEffect != null &&
-                rulesetEffect.EffectDescription.RangeType is not (RangeType.MeleeHit or RangeType.RangeHit))
-            {
-                yield break;
-            }
-
             var rulesetHelper = helper.RulesetCharacter;
 
             if (helper == defender ||
diff --git a/SolastaUnfinishedBusiness/Subclasses/PatronMoonlitScion.cs b/SolastaUnfinishedBusiness/Subclasses/PatronMoonlitScion.cs
index 8be8356536..b144097cf5 100644
--- a/SolastaUnfinishedBusiness/Subclasses/PatronMoonlitScion.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/PatronMoonlitScion.cs
@@ -166,9 +166,11 @@ public PatronMoonlitScion()
         // Lunar Chill Debuff
 
         var conditionLunarChillEnemy = ConditionDefinitionBuilder
-            .Create(ConditionDefinitions.ConditionHindered_By_Frost, $"Condition{Name}LunarChillEnemy")
+            .Create(ConditionDefinitions.ConditionHindered, $"Condition{Name}LunarChillEnemy")
             .SetOrUpdateGuiPresentation($"Power{Name}LunarChill", Category.Feature)
+            .SetParentCondition(ConditionDefinitions.ConditionHindered)
             .SetPossessive()
+            .SetFeatures()
             .CopyParticleReferences(FeatureDefinitionPowers.PowerDomainElementalHeraldOfTheElementsCold)
             .AddToDB();
 
diff --git a/SolastaUnfinishedBusiness/Subclasses/RangerSkyWarrior.cs b/SolastaUnfinishedBusiness/Subclasses/RangerSkyWarrior.cs
index f4d13d102a..774fe02cbf 100644
--- a/SolastaUnfinishedBusiness/Subclasses/RangerSkyWarrior.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/RangerSkyWarrior.cs
@@ -295,12 +295,6 @@ public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
             RulesetEffect rulesetEffect,
             int attackRoll)
         {
-            if (rulesetEffect != null &&
-                rulesetEffect.EffectDescription.RangeType is not (RangeType.MeleeHit or RangeType.RangeHit))
-            {
-                yield break;
-            }
-
             var rulesetHelper = helper.RulesetCharacter;
 
             if (helper != defender ||
diff --git a/SolastaUnfinishedBusiness/Subclasses/RangerSurvivalist.cs b/SolastaUnfinishedBusiness/Subclasses/RangerSurvivalist.cs
index 1d43acd443..48e5e3f681 100644
--- a/SolastaUnfinishedBusiness/Subclasses/RangerSurvivalist.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/RangerSurvivalist.cs
@@ -57,14 +57,13 @@ public RangerSurvivalist()
         // Disabling Strike
 
         var conditionDisablingStrike = ConditionDefinitionBuilder
-            .Create(ConditionDefinitions.ConditionHindered_By_Frost, $"Condition{Name}DisablingStrike")
+            .Create(ConditionDefinitions.ConditionHindered, $"Condition{Name}DisablingStrike")
             .SetOrUpdateGuiPresentation(Category.Condition)
             .SetParentCondition(ConditionDefinitions.ConditionHindered)
             .SetPossessive()
+            .SetFeatures()
             .AddToDB();
 
-        conditionDisablingStrike.specialDuration = false;
-
         // kept name for backward compatibility
         var additionalDamageDisablingStrike = FeatureDefinitionPowerBuilder
             .Create($"AdditionalDamage{Name}DisablingStrike")
diff --git a/SolastaUnfinishedBusiness/Subclasses/RoguishDuelist.cs b/SolastaUnfinishedBusiness/Subclasses/RoguishDuelist.cs
index 4bd24a82e0..30d68f0caa 100644
--- a/SolastaUnfinishedBusiness/Subclasses/RoguishDuelist.cs
+++ b/SolastaUnfinishedBusiness/Subclasses/RoguishDuelist.cs
@@ -81,12 +81,20 @@ public RoguishDuelist()
 
         // Reflexive Parry
 
+        var conditionReflexiveParty = ConditionDefinitionBuilder
+            .Create($"Condition{Name}ReflexiveParty")
+            .SetGuiPresentationNoContent(true)
+            .SetSilent(Silent.WhenAddedOrRemoved)
+            .SetSpecialInterruptions(ConditionInterruption.AnyBattleTurnEnd)
+            .AddToDB();
+
         var featureReflexiveParry = FeatureDefinitionBuilder
             .Create($"Feature{Name}ReflexiveParry")
             .SetGuiPresentation(Category.Feature)
             .AddToDB();
 
-        featureReflexiveParry.AddCustomSubFeatures(new CustomBehaviorReflexiveParry(featureReflexiveParry));
+        featureReflexiveParry.AddCustomSubFeatures(
+            new CustomBehaviorReflexiveParry(featureReflexiveParry, conditionReflexiveParty));
 
         // LEVEL 17
 
@@ -145,25 +153,26 @@ internal static bool TargetIsDuelingWithRoguishDuelist(
     //
 
     private sealed class CustomBehaviorReflexiveParry(
-        FeatureDefinition featureReflexiveParry) : IAttackBeforeHitPossibleOnMeOrAlly
+        FeatureDefinition featureReflexiveParry,
+        ConditionDefinition conditionReflexiveParty) : IPhysicalAttackBeforeHitConfirmedOnMe
     {
-        public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
+        public IEnumerator OnPhysicalAttackBeforeHitConfirmedOnMe(
             GameLocationBattleManager battleManager,
-            [UsedImplicitly] GameLocationCharacter attacker,
+            GameLocationCharacter attacker,
             GameLocationCharacter defender,
-            GameLocationCharacter helper,
             ActionModifier actionModifier,
             RulesetAttackMode attackMode,
-            RulesetEffect rulesetEffect,
-            int attackRoll)
+            bool rangedAttack,
+            AdvantageType advantageType,
+            List<EffectForm> actualEffectForms,
+            bool firstTarget,
+            bool criticalHit)
         {
             var rulesetDefender = defender.RulesetCharacter;
 
-            if (helper != defender ||
-                rulesetEffect != null ||
-                !ValidatorsWeapon.IsMelee(attackMode) ||
-                !defender.OncePerTurnIsValid(featureReflexiveParry.Name) ||
+            if (!ValidatorsWeapon.IsMelee(attackMode) ||
                 rulesetDefender.HasAnyConditionOfTypeOrSubType(
+                    conditionReflexiveParty.Name,
                     ConditionDefinitions.ConditionDazzled.Name,
                     ConditionDefinitions.ConditionIncapacitated.Name,
                     ConditionDefinitions.ConditionShocked.Name,
@@ -172,8 +181,19 @@ public IEnumerator OnAttackBeforeHitPossibleOnMeOrAlly(
                 yield break;
             }
 
-            defender.UsedSpecialFeatures.TryAdd(featureReflexiveParry.Name, 0);
-
+            rulesetDefender.InflictCondition(
+                conditionReflexiveParty.Name,
+                DurationType.Round,
+                0,
+                TurnOccurenceType.StartOfTurn,
+                AttributeDefinitions.TagEffect,
+                rulesetDefender.guid,
+                rulesetDefender.CurrentFaction.Name,
+                1,
+                conditionReflexiveParty.Name,
+                0,
+                0,
+                0);
             actionModifier.DefenderDamageMultiplier *= 0.5f;
             rulesetDefender.DamageHalved(rulesetDefender, featureReflexiveParry);
         }
diff --git a/SolastaUnfinishedBusiness/Translations/de/Feats/Group-de.txt b/SolastaUnfinishedBusiness/Translations/de/Feats/Group-de.txt
index 578c2475d7..c8287670ab 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Feats/Group-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Feats/Group-de.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Kampf: Nahkampf
 Feat/&FeatGroupOldTacticsDescription=Erhöhen Sie Ihre Stärke oder Geschicklichkeit um 1. Einmal pro Runde können Sie einen Gelegenheitsangriff gegen das Ziel durchführen, wenn ein liegender Feind in Reichweite Ihrer Nahkampfwaffe aufsteht.
 Feat/&FeatGroupOldTacticsTitle=Alte Taktiken
-Feat/&FeatGroupOrcishAggressionDescription=Deine Aggression brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Stärke oder Konstitution um 1, bis zu einem Maximum von 20.\n• Als Bonusaktion können Sie, wenn Sie eine Nahkampfwaffe in der Haupthand führen, bis zu Ihrer Geschwindigkeit aufladen Gehen Sie auf einen Feind Ihrer Wahl zu und greifen Sie die Kreatur mit Ihrer Hauptwaffe an.
+Feat/&FeatGroupOrcishAggressionDescription=Deine Aggression brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Stärke oder Konstitution um 1, bis zu einem Maximum von 20.\n• Als Bonusaktion können Sie, wenn Sie eine Nahkampfwaffe in der Haupthand führen, bis zu Ihrer Geschwindigkeit aufladen Gehen Sie auf einen Feind Ihrer Wahl zu und greifen Sie die Kreatur mit Ihrer Hauptwaffe an. Mit dieser Funktion können Leistungsbonuszeiten pro langer Pause genutzt werden.
 Feat/&FeatGroupOrcishAggressionTitle=Orkische Aggression
 Feat/&FeatGroupOrcishFuryDescription=Deine Wut brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Stärke oder Konstitution um 1, bis zu einem Maximum von 20.\n• Wenn Sie mit einem Angriff mit einer einfachen Waffe oder einer Kampfwaffe zuschlagen, können Sie eine der Waffen würfeln Schadenswürfel ein weiteres Mal und füge diesen als zusätzlichen Schaden zur Schadensart der Waffe hinzu. Sobald Sie diese Fähigkeit nutzen, können Sie sie erst wieder einsetzen, wenn Sie eine kurze oder lange Pause eingelegt haben.\n• Unmittelbar nachdem Sie Ihre Eigenschaft „Unerbittliche Ausdauer“ eingesetzt haben, können Sie Ihre Reaktion nutzen, um einen Waffenangriff auszuführen.
 Feat/&FeatGroupOrcishFuryTitle=Orkische Wut
diff --git a/SolastaUnfinishedBusiness/Translations/de/Feats/MeleeCombat-de.txt b/SolastaUnfinishedBusiness/Translations/de/Feats/MeleeCombat-de.txt
index 35c04e9004..231b7277c8 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Feats/MeleeCombat-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Feats/MeleeCombat-de.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=Sie beherrschen die Kunst, Ihre Feinde zu vernic
 Feat/&FeatCrusherConTitle=Brecher [Con]
 Feat/&FeatCrusherStrDescription=Sie sind geübt in der Kunst, Ihre Feinde zu vernichten. Erhöhen Sie Ihre Stärke um 1, bis zu einem Maximum von 20. Wenn Sie eine Kreatur mit einem Angriff treffen, der Wuchtschaden verursacht, stoßen Sie den Feind einmal pro Runde um 1,5 m zurück. Wenn Sie einen kritischen Treffer erzielen, werden Angriffswürfe gegen diese Kreatur bis zum Beginn Ihrer nächsten Runde mit Vorteil ausgeführt.
 Feat/&FeatCrusherStrTitle=Brecher [Str]
-Feat/&FeatDefensiveDuelistDescription=Wenn du eine Finesse-Waffe verwendest, mit der du gut umgehen kannst, und eine andere Kreatur dich mit einem Nahkampfangriff trifft, kannst du deine Reaktion nutzen, um deinen Fähigkeitsbonus zu deiner AC für diesen Angriff hinzuzufügen, was möglicherweise dazu führt, dass der Angriff dich verfehlt.
+Feat/&FeatDefensiveDuelistDescription=Wenn du eine Nahkampfwaffe verwendest, mit der du gut umgehen kannst, und eine andere Kreatur dich mit einem Nahkampfangriff trifft, kannst du deine Reaktion nutzen, um deinen Fähigkeitsbonus zu deiner AC für diesen Angriff hinzuzufügen, was möglicherweise dazu führt, dass der Angriff dich verfehlt.
 Feat/&FeatDefensiveDuelistTitle=Defensiver Duellant
 Feat/&FeatFellHandedDescription=Du beherrschst Handaxt, Streitaxt, Großaxt, Kriegshammer und Hammer. Sie erhalten die folgenden Vorteile, wenn Sie eine davon verwenden:\n• Einen Bonus von +1 auf Angriffswürfe, die Sie mit der Waffe ausführen.\n• Immer wenn Sie bei einem Nahkampfangriffswurf und -treffer im Vorteil sind, werfen Sie das Ziel zu Boden Der niedrigere der beiden W20-Würfe würde das Ziel ebenfalls treffen.\n• Immer wenn Sie bei einem Nahkampfangriffswurf im Nachteil sind und verfehlen, erleidet das Ziel Wuchtschaden in Höhe Ihres Stärkemodifikators, wenn der höhere der beiden W20-Würfe das Ziel treffen würde .
 Feat/&FeatFellHandedTitle=Gefallen
diff --git a/SolastaUnfinishedBusiness/Translations/de/Feats/OtherFeats-de.txt b/SolastaUnfinishedBusiness/Translations/de/Feats/OtherFeats-de.txt
index c2bf26a3dd..bc76ce7156 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Feats/OtherFeats-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Feats/OtherFeats-de.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Erhöhe deine Konstitution um 1 auf maximal 20.\nDu
 Feat/&FeatChefConTitle=Koch [mit]
 Feat/&FeatChefWisDescription=Erhöhe deine Weisheit um 1 auf maximal 20.\nDu kannst 1 Stunde damit verbringen, eine Mahlzeit zu kochen, die dich und deine Gefährten für 1W8 HP heilt.\nEinmal am Tag kannst du eine Stunde damit verbringen, eine bestimmte Zahl zu kochen Anzahl an Leckereien in Höhe Ihres Fähigkeitsbonus, die beim Verzehr 5 vorübergehende HP gewähren.
 Feat/&FeatChefWisTitle=Chefkoch [Wis]
-Feat/&FeatCriticalVirtuosoDescription=Ihr kritischer Schwellenwert wird um 1 gesenkt.
 Feat/&FeatDungeonDelverDescription=Wenn Sie auf die versteckten Fallen und Geheimtüren achten, die in vielen Dungeons zu finden sind, erhalten Sie die folgenden Vorteile:\n• Sie haben einen Vorteil bei Prüfungen auf Weisheit (Wahrnehmung) und Intelligenz (Untersuchung).\n• Sie haben einen Vorteil bei Rettungswürfen Vermeiden Sie Fallen oder widerstehen Sie ihnen.\n• Sie haben Widerstand gegen den durch Fallen verursachten Schaden.\n• Wenn Sie schnell reisen, wird Ihr passiver Weisheitswert (Wahrnehmung) nicht mit der normalen Strafe von -5 belastet.
 Feat/&FeatDungeonDelverTitle=Dungeon-Delver
 Feat/&FeatEldritchAdeptDescription=Sie lernen eine Eldritch-Anrufungsoption Ihrer Wahl von der Hexenmeisterklasse. Wenn für den Aufruf eine Voraussetzung erforderlich ist, können Sie diesen Aufruf nur auswählen, wenn Sie ein Hexenmeister sind und die Voraussetzung erfüllen. Immer wenn Sie eine Stufe aufsteigen, können Sie den Aufruf durch einen anderen aus der Hexenmeisterklasse ersetzen.
diff --git a/SolastaUnfinishedBusiness/Translations/de/Feats/Races-de.txt b/SolastaUnfinishedBusiness/Translations/de/Feats/Races-de.txt
index bacbb0896d..fe16b25d38 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Feats/Races-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Feats/Races-de.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=Du hegst einen tiefen Hass auf eine bestimm
 Feat/&FeatGrudgeBearerWisTitle=Grollträger [Wis]
 Feat/&FeatInfernalConstitutionDescription=Das teuflische Blut fließt stark in dir und setzt eine Widerstandskraft frei, die der einiger Unholde ähnelt. Du erhältst die folgenden Vorteile:\n• Erhöhe deine Konstitution um 1, bis zu einem Maximum von 20.\n• Du bist resistent gegen Kälte- und Giftschaden.\n• Du hast einen Vorteil bei Rettungswürfen gegen Vergiftung.
 Feat/&FeatInfernalConstitutionTitle=Höllische Verfassung
-Feat/&FeatOrcishAggressionConDescription=Deine Aggression brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Konstitution um 1, bis zu einem Maximum von 20.\n• Als Bonusaktion können Sie, wenn Sie eine Nahkampfwaffe in der Haupthand führen, bis zu Ihrer Geschwindigkeit auf einen zustürmen Feind deiner Wahl und greife die Kreatur kostenlos mit deiner Hauptwaffe an.
+Feat/&FeatOrcishAggressionConDescription=Deine Aggression brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Konstitution um 1, bis zu einem Maximum von 20.\n• Als Bonusaktion können Sie, wenn Sie eine Nahkampfwaffe in der Haupthand führen, bis zu Ihrer Geschwindigkeit auf einen zustürmen Feind deiner Wahl und greife die Kreatur kostenlos mit deiner Hauptwaffe an. Mit dieser Funktion können Leistungsbonuszeiten pro langer Pause genutzt werden.
 Feat/&FeatOrcishAggressionConTitle=Orkische Aggression [Con]
-Feat/&FeatOrcishAggressionDescription=Deine Aggression brennt unermüdlich. Du erhältst die folgenden Vorteile:\n• Deine Stärke wird um 1 erhöht, bis zu einem Maximum von 20.\n• Als Bonusaktion kannst du, wenn du eine Nahkampfwaffe in der Haupthand trägst, mit deiner Geschwindigkeit auf einen Feind deiner Wahl zustürmen und die Kreatur mit deiner Hauptwaffe frei angreifen.
+Feat/&FeatOrcishAggressionDescription=Deine Aggression brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Stärke um 1, bis zu einem Maximum von 20.\n• Als Bonusaktion können Sie, wenn Sie eine Nahkampfwaffe in der Haupthand führen, bis zu Ihrer Geschwindigkeit auf einen zustürmen Feind deiner Wahl und greife die Kreatur kostenlos mit deiner Hauptwaffe an. Mit dieser Funktion können Leistungsbonuszeiten pro langer Pause genutzt werden.
 Feat/&FeatOrcishAggressionTitle=Orkische Aggression [Str]
 Feat/&FeatOrcishFuryConDescription=Deine Wut brennt unermüdlich. Sie erhalten die folgenden Vorteile:\n• Erhöhen Sie Ihre Konstitution um 1, bis zu einem Maximum von 20.\n• Wenn Sie mit einem Angriff mit einer einfachen Waffe oder einer Kampfwaffe zuschlagen, können Sie einen der Schadenswürfel der Waffe werfen ein weiteres Mal und füge es als zusätzlichen Schaden zur Schadensart der Waffe hinzu. Sobald Sie diese Fähigkeit nutzen, können Sie sie erst wieder einsetzen, wenn Sie eine kurze oder lange Pause eingelegt haben.\n• Unmittelbar nachdem Sie Ihre Eigenschaft „Unerbittliche Ausdauer“ eingesetzt haben, können Sie Ihre Reaktion nutzen, um einen Waffenangriff auszuführen.
 Feat/&FeatOrcishFuryConTitle=Orkischer Zorn [Con]
diff --git a/SolastaUnfinishedBusiness/Translations/de/Feats/RangedCombat-de.txt b/SolastaUnfinishedBusiness/Translations/de/Feats/RangedCombat-de.txt
index 64b693b41d..1c9e1b55e8 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Feats/RangedCombat-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Feats/RangedCombat-de.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=Du hast bei deinem nächst
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Zielsicher
 Condition/&ConditionFeatSteadyAimRestrainedDescription=Du kannst dich bis zum Ende deines Zuges nicht bewegen.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Durch Zielstrebigkeit zurückgehalten
-Feat/&FeatBowMasteryDescription=Ihr Expertentraining mit Bögen gewährt Ihnen diese Vorteile:\n• Sie erhalten einen Bonus von +1 auf Schadenswürfe, die Sie mit Kurzbogen und Langbogen machen.\n• Wenn Sie in Ihrem Zug die Angriffsaktion mit einem Kurzbogen verwenden, können Sie als Bonusaktion einen Fernkampfangriff durchführen und dabei Ihren Attributmodifikator zum Schaden hinzufügen.\n• Sie können bei Angriffs- und Schadenswürfen, die Sie mit einem Langbogen machen, Stärke statt Geschicklichkeit verwenden.
+Feat/&FeatBowMasteryDescription=Wenn Sie in Ihrem Zug die Angriffsaktion mit einem Bogen verwenden, können Sie als Bonusaktion einen Fernkampfwaffenangriff ausführen und dabei Ihren Attributmodifikator zum Schaden hinzufügen.
 Feat/&FeatBowMasteryTitle=Bogenbeherrschung
-Feat/&FeatCrossbowMasteryDescription=Ihr Expertentraining mit Armbrüsten gewährt Ihnen folgende Vorteile:\n• Sie erhalten einen Bonus von +1 auf Schadenswürfe, die Sie mit schweren, leichten und Handarmbrüsten ausführen.\n• Wenn Sie die Angriffsaktion mit einer leichten oder Handarmbrust verwenden Wenn du an der Reihe bist, kannst du als Bonusaktion einen Fernkampfwaffenangriff durchführen, der deinen Attributmodifikator zum Schaden addiert.\n• Du kannst bei Angriffs- und Schadenswürfen, die du mit einer schweren Armbrust ausführst, Stärke anstelle von Geschicklichkeit verwenden.
+Feat/&FeatCrossbowMasteryDescription=Wenn Sie in Ihrem Zug die Angriffsaktion mit einer Armbrust verwenden, können Sie als Bonusaktion einen Fernkampfwaffenangriff ausführen und dabei Ihren Attributmodifikator zum Schaden hinzufügen.
 Feat/&FeatCrossbowMasteryTitle=Armbrust-Meisterschaft
 Feat/&FeatDeadeyeDescription=Sie haben gelernt, Genauigkeit einzutauschen, um tödlichere Schüsse zu landen:\n• Wenn Sie mit einer Fernkampfwaffe angreifen, können Sie einen Abzug von -5 auf Ihren Angriffswurf in Kauf nehmen, um zusätzlichen Schaden von +10 zu verursachen.\n• Greift an Langstreckenangriffe erzwingen keinen Nachteil und Fernkampfwaffenangriffe ignorieren halbe Deckung und dreiviertel Deckung.
 Feat/&FeatDeadeyeTitle=Scharfschütze
diff --git a/SolastaUnfinishedBusiness/Translations/de/FightingStyles-de.txt b/SolastaUnfinishedBusiness/Translations/de/FightingStyles-de.txt
index 2a294a71bd..8bd2c92428 100644
--- a/SolastaUnfinishedBusiness/Translations/de/FightingStyles-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/FightingStyles-de.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=Verheerender Schaden!
 Feedback/&AdditionalDamageCripplingLine={1} erleidet verkrüppelnden Schaden.
 Feedback/&AdditionalDamageExecutionerFormat=Ausführung!
 Feedback/&AdditionalDamageExecutionerLine={0} führt {1} aus und verursacht +{2} zusätzlichen Schaden!
+FightingStyle/&AstralReachDescription=Die Reichweite Ihres unbewaffneten Schlags erhöht sich um 5 Fuß.
+FightingStyle/&AstralReachTitle=Astralreichweite
 FightingStyle/&BlindFightingDescription=Sie haben Blindsicht mit einer Reichweite von 10 Fuß. Innerhalb dieser Reichweite können Sie effektiv alles sehen, was sich nicht völlig in Deckung befindet, selbst wenn Sie geblendet sind oder sich in der Dunkelheit befinden. Darüber hinaus können Sie innerhalb dieser Reichweite eine unsichtbare Kreatur sehen, es sei denn, die Kreatur versteckt sich erfolgreich vor Ihnen.
 FightingStyle/&BlindFightingTitle=Blindes Kämpfen
-FightingStyle/&CripplingDescription=Wenn Sie mit einem Nahkampfangriff zuschlagen, können Sie bis zum Ende Ihres nächsten Zuges die Geschwindigkeit Ihrer Gegner um 10 Fuß und ihre Rüstungsklasse um 1 verringern.
+FightingStyle/&CripplingDescription=Bei einem Nahkampfangriffstreffer verringerst du die Geschwindigkeit deiner Gegner bis zum Ende deines nächsten Zuges um 10 Fuß.
 FightingStyle/&CripplingTitle=Verkrüppelnd
-FightingStyle/&ExecutionerDescription=Du addierst deinen Fähigkeitsbonus zum Schaden gegen Kreaturen, die geblendet, verängstigt, gefesselt, außer Gefecht gesetzt, gelähmt, am Boden liegend oder betäubt sind.
+FightingStyle/&ExecutionerDescription=Sie addieren Ihren Fähigkeitsbonus zum Schaden gegen geblendete, verängstigte, zurückgehaltene, außer Gefecht gesetzte, gelähmte, liegende oder betäubte Kreaturen.
 FightingStyle/&ExecutionerTitle=Henker
-FightingStyle/&HandAndAHalfDescription=Wenn Sie eine einhändige oder vielseitige Nahkampfwaffe und keine andere Waffe oder keinen anderen Schild tragen, erhalten Sie einen Bonus von +1 auf Ihre Angriffswürfe mit der Waffe und einen Bonus von +1 auf Ihre Rüstungsklasse.
+FightingStyle/&HandAndAHalfDescription=Sie erhalten einen Bonus von +1 auf Ihre Angriffswürfe und einen Bonus von +1 auf Ihre Rüstungsklasse, wenn Sie eine einhändige Nahkampfwaffe oder eine vielseitige Waffe und keine andere Waffe oder einen anderen Schild tragen.
 FightingStyle/&HandAndAHalfTitle=Klassischer Schwertkampf
 FightingStyle/&InterceptionDescription=Wenn eine Kreatur, die du sehen kannst, ein anderes Ziel als dich in einem Umkreis von 5 Fuß um dich herum mit einem Angriff trifft, kannst du deine Reaktion nutzen, um den Schaden, den das Ziel erleidet, um 1W10 + deinen Fähigkeitsbonus zu reduzieren. Um diese Reaktion nutzen zu können, müssen Sie einen Schild oder eine einfache oder kriegerische Waffe tragen.
 FightingStyle/&InterceptionTitle=Abfangen
-FightingStyle/&LungerDescription=Wenn Sie nur eine Nahkampfwaffe ohne schwere Waffe und mit einer freien Zweithand führen, erhöht sich die Reichweite dieser Waffe um 1,5 m.
+FightingStyle/&LungerDescription=Die Reichweite Ihrer Nahkampfwaffe erhöht sich um 5 Fuß, wenn Sie eine Waffe ohne schweres Etikett und keine andere Waffe oder keinen anderen Schild tragen.
 FightingStyle/&LungerTitle=Lunge
 FightingStyle/&MercilessDescription=Wenn Sie in Ihrem Zug ein Ziel mit einem Nahkampfwaffenangriff auf 0 HP reduzieren, müssen Feinde in einem Umkreis des niedergeschlagenen Ziels in Höhe der Hälfte Ihres Fähigkeitsbonus (aufgerundet) und die das Ziel sehen können, einen Weisheitswurf (SG 8 +) machen Ihr Fähigkeitsbonus + Ihr Stärkemodifikator) oder bis zum Ende Ihres nächsten Zuges Angst vor Ihnen haben. Wenn der auslösende Angriff ein kritischer Treffer ist, entspricht der Radius stattdessen Ihrem Fähigkeitsbonus.
 FightingStyle/&MercilessTitle=Gnadenlos
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=Du erwirbst Schildfähigkeiten und si
 FightingStyle/&MonkShieldExpertTitle=Klosterschildtraining
 FightingStyle/&PolearmExpertDescription=Ihr Expertentraining mit einer Stangenwaffe gewährt Ihnen diese Vorteile:\n• Wenn Sie die Angriffsaktion ausführen und nur mit einer Stangenwaffe angreifen, können Sie eine Bonusaktion verwenden, um einen Nahkampfangriff mit dem anderen Ende der Waffe durchzuführen. Dieser Angriff verwendet denselben Fähigkeitsmodifikator wie der Primärangriff und verursacht 1W4 Wuchtschaden.\n• Andere Kreaturen provozieren einen Gelegenheitsangriff von dir, wenn sie in die Reichweite gelangen, die du mit einer Stangenwaffe hast.
 FightingStyle/&PolearmExpertTitle=Stangenwaffenmeister
-FightingStyle/&PugilistDescription=Deine unbewaffneten Schläge verursachen zusätzlich 1W4 Wuchtschaden und als Bonusaktion kannst du mit der Nebenhand zuschlagen. Wenn Sie freie Hand haben, können Sie als Bonusaktion schieben.
+FightingStyle/&PugilistDescription=Deine unbewaffneten Schläge verursachen zusätzlich 1W4 Wuchtschaden und als Bonusaktion kannst du mit der Nebenhand zuschlagen. Sie können als Bonusaktion schieben, wenn Sie keine andere Waffe oder keinen anderen Schild haben.
 FightingStyle/&PugilistTitle=Faustkämpfer
 FightingStyle/&RemarkableTechniqueDescription=Sie verfügen über eine Kampfausbildung, die es Ihnen ermöglicht, spezielle Kampftechniken, sogenannte Manöver, auszuführen:\n• Sie lernen ein Manöver Ihrer Wahl aus der Battle Master-Unterklasse. Der Manöver-SG dieser Manöver beträgt 8 + Fähigkeitsbonus + Stärke- oder Geschicklichkeitsmodifikator, je nachdem, welcher Wert höher ist.\n• Sie erhalten 1 Überlegenheitswürfel. Der Würfel ist ein W6 und vergrößert sich nicht, wenn Sie kein Kampfmeister sind. Dieser Würfel wird verwendet, um Ihre Manöver voranzutreiben. Es wird verbraucht, wenn Sie es verwenden, und wird wiedergewonnen, wenn Sie eine kurze oder lange Pause beenden.
 FightingStyle/&RemarkableTechniqueTitle=Überlegene Technik
-FightingStyle/&RopeItUpDescription=Deine Wurfangriffe erhalten +1 auf Angriffs- und Schadenswürfe, du erhöhst sowohl die Fern- als auch die Kurzreichweite um 10 Fuß und sie kehrt sofort nach dem Einsatz für einen Wurfangriff auf deine Hand zurück.
-FightingStyle/&RopeItUpTitle=Seil es hoch
+FightingStyle/&RopeItUpDescription=Wenn Sie einen Fernangriff mit einer Wurfwaffe durchführen, erhöhen Sie deren kurze Reichweite um 10 Fuß und ihre große Reichweite um 20 Fuß. Darüber hinaus kehrt die Waffe sofort wieder in Ihre Hand zurück, nachdem sie für einen Wurfangriff verwendet wurde.
+FightingStyle/&RopeItUpTitle=Meister der Wurfwaffen
 FightingStyle/&SentinelDescription=Du beherrschst Techniken, um jeden Verlust in der Abwehr eines Feindes auszunutzen:\n• Wenn du eine Kreatur mit einem Gelegenheitsangriff triffst, wird die Geschwindigkeit der Kreatur für den Rest der Runde auf 0 gesetzt.\n• Kreaturen provozieren Gelegenheitsangriffe von Sie selbst, wenn sie die Aktion „Entfernen“ ausführen, bevor sie Ihre Reichweite verlassen.\n• Sie können Ihre Reaktion nutzen, um einen Nahkampfwaffenangriff gegen die angreifende Kreatur durchzuführen, wenn eine Kreatur ein anderes Ziel als Sie angreift.
 FightingStyle/&SentinelTitle=Wächter
-FightingStyle/&ShieldExpertDescription=Sie haben den Umgang mit einem Schild als Waffe gelernt. Es wird zu einer Nahkampfwaffe, die Sie beherrschen und die 1W4 Wuchtschaden verursacht. Wenn Sie einen Schild tragen, gewinnen Sie einen Vorteil bei Stoßversuchen.
-FightingStyle/&ShieldExpertTitle=Schildexperte
-FightingStyle/&TorchbearerDescription=Du bist geübt im Umgang mit einer Fackel im Kampf. Einmal pro Spielzug können Sie sich als Bonusaktion dafür entscheiden, eine von Ihnen ausgerüstete Lichtquelle zu verwenden, um zu versuchen, einen Feind, den Sie berühren können, in Brand zu setzen. Ihr Ziel muss bei einem Geschicklichkeitsrettungswurf erfolgreich sein (SG 8 + Ihr Fähigkeitsbonus + Ihr Geschicklichkeitsmodifikator) oder 1W4 Feuerschaden pro Spielzug für 1 Minute oder bis er erloschen ist, erleiden.
+FightingStyle/&ShieldExpertDescription=Sie können Ihre Bonusaktion nutzen, um eine Kreatur mit Ihrem Schild zu schlagen und sie für einen Moment in eine spezielle improvisierte Waffe zu verwandeln, mit der Sie vertraut sind. Führe einen Nahkampfwaffenangriff gegen eine Kreatur in einem Umkreis von 5 Fuß um dich aus und verwende dabei deinen Stärkemodifikator für den Angriff. Wenn du triffst, erleidet die Kreatur 1W4 + Stärkemodifikator als Wuchtschaden.
+FightingStyle/&ShieldExpertTitle=Schildschlag
+FightingStyle/&TorchbearerDescription=Als Bonusaktion können Sie eine von Ihnen ausgerüstete Lichtquelle verwenden, um zu versuchen, einen Feind, den Sie berühren können, in Brand zu setzen. Ihr Ziel muss bei einem Geschicklichkeitsrettungswurf erfolgreich sein (SG 8 + Ihr Fähigkeitsbonus + Ihr Geschicklichkeitsmodifikator) oder 1W4 Feuerschaden pro Spielzug für 1 Minute oder bis er erloschen ist, erleiden.
 FightingStyle/&TorchbearerTitle=Fackelträger
 FightingStyle/&ZenArcherDescription=Ihre Intuition leitet Ihre Hand, wenn Sie einen Bogen benutzen. Erhöhen Sie Ihr Weisheitsattribut um 1 auf maximal 20. Sie können Ihren Weisheitsmodifikator anstelle Ihres Geschicklichkeitsmodifikators für die Angriffs- und Schadenswürfe mit diesen Waffen verwenden.
 FightingStyle/&ZenArcherTitle=Kluges Bogenschießen
diff --git a/SolastaUnfinishedBusiness/Translations/de/Level20-de.txt b/SolastaUnfinishedBusiness/Translations/de/Level20-de.txt
index 9f8d525fa4..5f724981e6 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Level20-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Level20-de.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=Ab der 17. Stufe erhal
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Reinheit des Lichts
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=Ab der 17. Stufe erlangen Sie die Fähigkeit, im Körper einer Person tödliche Vibrationen auszulösen. Wenn Sie eine Kreatur mit einem unbewaffneten Schlag treffen, können Sie 3 Ki-Punkte ausgeben, um diese nicht wahrnehmbaren Vibrationen auszulösen, die 24 Stunden lang anhalten. Die Vibrationen sind harmlos, es sei denn, Sie beenden sie durch Ihre Aktion. Wenn Sie diese Aktion verwenden, muss die Kreatur einen Konstitutionsrettungswurf durchführen. Wenn dies fehlschlägt, wird es auf 1 Trefferpunkt reduziert und ist bis zum Beginn seines nächsten Zuges betäubt. Wenn es gelingt, erleidet es 10d10 nekrotischen Schaden.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Zitternde Palme
+Feature/&FeatureWizardSpellMasteryDescription=Du hast bestimmte Zauber so gut gemeistert, dass du sie nach Belieben wirken kannst. Wählen Sie zwei Zaubersprüche der 1. oder 2. Stufe aus, die sich in Ihrem Zauberbuch befinden. Sie können diese Zauber auf der niedrigsten Stufe wirken, ohne einen Zauberslot zu verbrauchen, wenn Sie sie vorbereitet haben. Wenn Sie einen der Zauber auf einer höheren Stufe wirken möchten, müssen Sie wie gewohnt einen Zauberplatz aufwenden.
+Feature/&FeatureWizardSpellMasteryTitle=Zauberbeherrschung
 Feature/&GrantInvocationsSpellMasteryDescription=Du hast bestimmte Zauber so gut gemeistert, dass du sie nach Belieben wirken kannst. Die ersten beiden Zaubersprüche der 1. und 2. Stufe, die du vorbereitest, kannst du auf ihrer niedrigsten Stufe wirken, ohne einen Zauberplatz zu verbrauchen. Wenn du einen der Zauber auf einer höheren Stufe wirken möchtest, musst du wie üblich einen Zauberplatz verbrauchen.
 Feature/&GrantInvocationsSpellMasteryTitle=Zauberbeherrschung
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Wählen Sie einen Signaturzauber aus, den Sie lernen möchten.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Signaturzauber
 Feature/&InvocationPoolWizardSignatureSpellsDescription=Du meisterst zwei mächtige Zaubersprüche und kannst sie mit wenig Aufwand wirken. Wählen Sie zwei Zaubersprüche der 3. Stufe als Ihre Signaturzauber. Du hast diese Zauber immer vorbereitet, sie zählen nicht zu der Anzahl der Zauber, die du vorbereitet hast, und du kannst jeden von ihnen auf der 3. Stufe einmal wirken, ohne einen Zauberslot zu verbrauchen. Wenn Sie dies tun, können Sie dies nicht erneut tun, bis Sie eine kurze oder lange Pause beendet haben.
 Feature/&InvocationPoolWizardSignatureSpellsTitle=Signaturzauber
 Feature/&MagicAffinityArchDruidDescription=Sie können Ihren Wildshape unbegrenzt oft verwenden. Darüber hinaus können Sie die verbalen und somatischen Komponenten Ihrer Druidenzauber sowie alle materiellen Komponenten ignorieren, für die keine Kosten anfallen und die nicht von einem Zauber verbraucht werden. Sie erhalten diesen Vorteil sowohl in Ihrer normalen Form als auch in Ihrer Biestform von Wildshape.
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=Ab der 17. Stufe er
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Körperliche Perfektion
 Feature/&PowerWarlockEldritchMasterDescription=Sie können auf Ihre innere Reserve an mystischer Kraft zurückgreifen und gleichzeitig Ihren Gönner bitten, verbrauchte Zauberslots zurückzugewinnen. Sie können 1 Minute damit verbringen, Ihren Gönner um Hilfe zu bitten, um alle verbrauchten Zauberslots aus Ihrer Paktmagie-Funktion zurückzugewinnen. Sobald Sie mit dieser Funktion Zauberslots wiedererlangen, müssen Sie eine lange Pause einlegen, bevor Sie dies erneut tun können.
 Feature/&PowerWarlockEldritchMasterTitle=Eldritch-Meister
+Feature/&PowerWizardSignatureSpellsDescription=Du meisterst zwei mächtige Zaubersprüche und kannst sie mit wenig Aufwand wirken. Wählen Sie zwei Zaubersprüche der 3. Stufe aus Ihrem Zauberbuch als Ihre Signaturzauber. Du hast diese Zauber immer vorbereitet, sie zählen nicht zu der Anzahl der Zauber, die du vorbereitet hast, und du kannst jeden von ihnen auf der 3. Stufe einmal wirken, ohne einen Zauberslot zu verbrauchen. Wenn Sie dies tun, können Sie dies nicht erneut tun, bis Sie eine kurze oder lange Pause beendet haben.
+Feature/&PowerWizardSignatureSpellsTitle=Signaturzauber
 Feature/&SenseRangerFeralSensesDescription=Du erhältst übernatürliche Sinne, die dir helfen, Kreaturen zu bekämpfen, die du nicht sehen kannst. Wenn du eine Kreatur angreifst, die du nicht sehen kannst, führt deine Unfähigkeit, sie zu sehen, nicht zu einem Nachteil bei deinen Angriffswürfen gegen sie.
 Feature/&SenseRangerFeralSensesTitle=Wilde Sinne
 Feedback/&AdditionalDamageBrutalAssaultFormat=Brutaler Überfall!
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=Sie können 1 Ki bezahlen, um 1 Treff
 Reaction/&UsePhysicalPerfectionReactDescription=Sie können 1 Ki bezahlen, um 1 Trefferpunkt wiederherzustellen.
 Reaction/&UsePhysicalPerfectionReactTitle=Heilen
 Reaction/&UsePhysicalPerfectionTitle=Körperliche Perfektion
+RestActivity/&RestActivitySignatureSpellsDescription=Sie können Ihre Signaturzauber einmalig auswählen.
+RestActivity/&RestActivitySignatureSpellsTitle=Signaturzauber
+RestActivity/&RestActivitySpellMasteryDescription=Sie können Ihre Liste der Meisterschaftszauber ändern, wenn Sie eine lange Pause beendet haben.
+RestActivity/&RestActivitySpellMasteryTitle=Zauberbeherrschung
 Rules/&DamagePureDescription=Unmerkliche Vibrationen, die das Opfer von innen heraus auflösen.
 Rules/&DamagePureTitle=Rein
+Screen/&SignatureSpellsExtraSpellDescription=Dieser Spezialzauber ist immer vorbereitet und verbraucht einmal pro langer Pause keinen Zauberslot, wenn er auf der Stufe gewirkt wird.
+Screen/&SignatureSpellsExtraSpellTitle=Signaturzauber
+Screen/&SpellMasteryExtraSpellDescription=Dieser Meisterschaftszauber ist immer vorbereitet und verbraucht keinen Zauberslot, wenn er auf der gleichen Stufe gewirkt wird.
+Screen/&SpellMasteryExtraSpellTitle=Zauberbeherrschung
 Tooltip/&MustHaveQuiveringPalmCondition=Ist nicht von der Zitternden Palme gezeichnet
diff --git a/SolastaUnfinishedBusiness/Translations/de/Others-de.txt b/SolastaUnfinishedBusiness/Translations/de/Others-de.txt
index 6279b08aab..775be3d8f4 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Others-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Others-de.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Brutaler Schlag aktivieren/deaktivieren
 Action/&BrutalStrikeToggleTitle=Brutaler Schlag
 Action/&CastPlaneMagicDescription=Wirke einen der Zaubersprüche, die du durch „Plane Touched“-Talente erhalten hast
 Action/&CastPlaneMagicTitle=Kanalebenenmagie
-Action/&CastSignatureSpellsDescription=Wirke diese Zauber der 3. Stufe, ohne einen Slot auszugeben
-Action/&CastSignatureSpellsTitle=Signaturzauber
-Action/&CastSpellMasteryDescription=Wirke deine vorbereiteten Zauber der 1. oder 2. Stufe, ohne einen Slot auszugeben
-Action/&CastSpellMasteryTitle=Zauberbeherrschung
 Action/&CoordinatedAssaultToggleDescription=Koordinierten Angriff aktivieren/deaktivieren
 Action/&CoordinatedAssaultToggleTitle=Koordinierter Angriff
 Action/&CunningStrikeToggleDescription=Cunning Strike aktivieren/deaktivieren
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Leistung
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Kompetenz
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Bevorzugter Feind
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Affinität zum Geländetyp
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Signaturzauber
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Zauberhafte drakonische Abstammung
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Waffentraining
 UI/&ForcePreferredCantripDescription=Wenn diese Option aktiviert ist, kann nur der bevorzugte Cantrip ausgelöst werden. Wenn der bevorzugte Cantrip nicht ausgewählt ist, wird unabhängig von diesem Schalter der erste gültige Cantrip ausgelöst.
diff --git a/SolastaUnfinishedBusiness/Translations/de/Settings-de.txt b/SolastaUnfinishedBusiness/Translations/de/Settings-de.txt
index 9e06fa444f..e3eef2f9c4 100644
--- a/SolastaUnfinishedBusiness/Translations/de/Settings-de.txt
+++ b/SolastaUnfinishedBusiness/Translations/de/Settings-de.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Erlaube das Wirken von Zaubersprüchen mit zusätzliche
 ModUi/&AllowHornsOnAllRaces=Erlaube Hörner bei allen Rennen <i><color=#F0DAA0>[Ergebnisse können je nach Rasse, Kopf und Hupe schrecklich aussehen]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Erlauben Sie mehr realen Status im Rest-Panel <i><color=#F0DAA0>[Nach-Ruhe-Aktionen im Vor-Panel ausblenden und Wiederherstellungsfunktionen im Nach-Panel]</color></i>
 ModUi/&AllowStackedMaterialComponent=Gestapelte Materialkomponente <i><color=#F0DAA0> zulassen[z.B. 2x500gp Diamant entspricht 1000gp Diamant]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Ermögliche die Zielauswahl beim Wirken des Zaubers <color=#D89555>Kettenblitz</color>
 ModUi/&AllowUnmarkedSorcerers=Erlaube <color=#D89555>Sorcerer</color> ohne Ursprungsmarkierungen und Tätowierungen
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=Die <color=#1E81B0>ALT</color>-Taste hebt nur Gadgets im Sichtfeld der Gruppe hervor <i><color=#F0DAA0>[nur benutzerdefinierte Dungeons]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Ermöglichen Sie die Abstimmung von <color=#D89555>Arkaner Schildstab</color> durch jede Klasse
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Deaktivieren Sie <color=#D8955
 ModUi/&DisableUnofficialTranslations=Deaktivieren Sie die Unterstützung inoffizieller Übersetzungen, um den Mod zu beschleunigen <i><color=#F0DAA0>[es sei denn, ich spreche Chinesisch, Italienisch, Japanisch, Koreanisch oder Spanisch]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Zeigt beim Levelaufstieg alle bekannten Zauber anderer Klassen an</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Paktslots für <color=#D89555>Hexenmeister</color> bei der Zauberauswahl statt im Charakterfenster anzeigen</i>
-ModUi/&DocsArcaneShots=DOCS: Arkane Schüsse
-ModUi/&DocsBackgrounds=DOCS: Hintergründe
-ModUi/&DocsFeats=DOCS: Leistungen
-ModUi/&DocsFightingStyles=DOCS: Kampfstile
-ModUi/&DocsInfusions=DOCS: Infusionen
-ModUi/&DocsInvocations=DOCS: Aufrufe
-ModUi/&DocsManeuvers=DOCS: Manöver
-ModUi/&DocsMetamagic=DOCS: Metamagie
-ModUi/&DocsRaces=DOCS: Rennen
-ModUi/&DocsSpells=DOCS: Zauber
-ModUi/&DocsSubclasses=DOCS: Unterklassen
-ModUi/&DocsSubraces=DOCS: Subraces
+ModUi/&DocsArcaneShots=Arkane Schüsse
+ModUi/&DocsBackgrounds=Hintergründe
+ModUi/&DocsFeats=Leistungen
+ModUi/&DocsFightingStyles=Kampfstile
+ModUi/&DocsInfusions=Infusionen
+ModUi/&DocsInvocations=Aufrufe
+ModUi/&DocsManeuvers=Manöver
+ModUi/&DocsMetamagic=Metamagie
+ModUi/&DocsRaces=Rennen
+ModUi/&DocsSpells=Zauber
+ModUi/&DocsSubclasses=Unterklassen
+ModUi/&DocsSubraces=Subraces
+ModUi/&DocsVersatilities=Vielseitigkeit
 ModUi/&Donate=<b><color=#D89555>Spenden:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=Helme nicht auf grafischen Charakteren anzeigen <b><i><color=#C04040E0>[Neustart erforderlich]</color></i></b>
 ModUi/&DontEndTurnAfterReady=Beenden Sie den Zug nicht, nachdem Sie die Bereitschaftsaktion verwendet haben <i><color=#F0DAA0>[ermöglicht die Verwendung der Bonusaktion oder zusätzlicher Hauptaktionen aus Tempo oder anderen Quellen]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Aktivieren Sie die Wahl des <color=#D89555>Schur
 ModUi/&EnableRogueSteadyAim=Aktivieren Sie <color=#D89555>Rogue</color> <b>Steady Aim</b> auf Klassenstufe 3 <i><color=#F0DAA0>[Bonusaktion verschafft Ihnen einen Vorteil bei Ihrem nächsten Angriffswurf in der aktuellen Runde, wenn Sie sind noch nicht umgezogen]</color></i>
 ModUi/&EnableRogueStrSaving=Aktivieren Sie <color=#D89555>Schurke</color>, um DEX- oder STR-Modifikatoren für <b>List/Teufelsschlag</b>, <b>Schwächender/Verbesserter Schlag</b> und <b>Klingenhagel zu verwenden </b>
 ModUi/&EnableSaveByLocation=Aktivieren Sie die Speicherung nach Kampagnen/Standorten
+ModUi/&EnableSignatureSpellsRelearn=Aktivieren Sie <color=#D89555>Zauberer</color>-Signaturzauber, die bei jeder langen Pause <i><color=#F0DAA0>[statt einmal auf Stufe 20]</color></i> vorbereitet werden
 ModUi/&EnableSortingDungeonMakerAssets=Aktivieren Sie die Asset-Sortierung im Dungeon Maker-Editor
 ModUi/&EnableStatsOnHeroTooltip=Statistiken im Tooltip des Helden anzeigen <i><color=#F0DAA0>[d. h.: kritische Treffer, kritische Fehlschläge usw.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=• Außerdem erhöht jeder Held das Gewicht um einen W20-Wurf, um ein wenig Zufälligkeit zu gewährleisten
diff --git a/SolastaUnfinishedBusiness/Translations/en/Feats/Group-en.txt b/SolastaUnfinishedBusiness/Translations/en/Feats/Group-en.txt
index 8ff0d631a0..01c4d8370e 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Feats/Group-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Feats/Group-en.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Combat: Melee
 Feat/&FeatGroupOldTacticsDescription=Increase your Strength or Dexterity by 1. Once per round, when a prone enemy within range of your melee weapon stands up you may make an attack of opportunity against the target.
 Feat/&FeatGroupOldTacticsTitle=Old Tactics
-Feat/&FeatGroupOrcishAggressionDescription=Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Strength or Constitution by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon.
+Feat/&FeatGroupOrcishAggressionDescription=Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Strength or Constitution by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon. This feature can be used proficiency bonus times per long rest.
 Feat/&FeatGroupOrcishAggressionTitle=Orcish Aggression
 Feat/&FeatGroupOrcishFuryDescription=Your fury burns tirelessly. You gain the following benefits:\n• Increase your Strength or Constitution by 1, up to a maximum of 20.\n• When you hit with an attack made with a simple or martial weapon, you can roll one of the weapon's damage dice an additional time and add it as extra damage of the weapon's damage type. Once you use this ability, you can't use it again until you finish a short or long rest.\n• Immediately after you use your Relentless Endurance trait, you can use your reaction to make one weapon attack.
 Feat/&FeatGroupOrcishFuryTitle=Orcish Fury
diff --git a/SolastaUnfinishedBusiness/Translations/en/Feats/MeleeCombat-en.txt b/SolastaUnfinishedBusiness/Translations/en/Feats/MeleeCombat-en.txt
index 42670248ad..5d44557f06 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Feats/MeleeCombat-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Feats/MeleeCombat-en.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=You are practiced in the art of crushing your en
 Feat/&FeatCrusherConTitle=Crusher [Con]
 Feat/&FeatCrusherStrDescription=You are practiced in the art of crushing your enemies. Increase your Strength by 1, to a maximum of 20. When you hit a creature with an attack that deals bludgeoning damage, once per turn you push the enemy by 5ft. When you score a critical hit attack rolls against that creature are made with advantage until the start of your next turn.
 Feat/&FeatCrusherStrTitle=Crusher [Str]
-Feat/&FeatDefensiveDuelistDescription=When you are wielding a finesse weapon with which you are proficient and another creature hits you with a melee attack, you can use your reaction to add your proficiency bonus to your AC for that attack, potentially causing the attack to miss you.
+Feat/&FeatDefensiveDuelistDescription=When you are wielding a melee weapon with which you are proficient and another creature hits you with a melee attack, you can use your reaction to add your proficiency bonus to your AC for that attack, potentially causing the attack to miss you.
 Feat/&FeatDefensiveDuelistTitle=Defensive Duelist
 Feat/&FeatFellHandedDescription=You master the handaxe, battleaxe, greataxe, warhammer and maul. You gain the following benefits when using any of them:\n• A +1 bonus to attack rolls you make with the weapon.\n• Whenever you have advantage on a melee attack roll and hit, you knock the target prone if the lower of the two d20 rolls would also hit the target.\n• Whenever you have disadvantage on a melee attack roll and miss, the target takes bludgeoning damage equal to your Strength modifier if higher of the two d20 rolls would hit the target.
 Feat/&FeatFellHandedTitle=Fell Handed
diff --git a/SolastaUnfinishedBusiness/Translations/en/Feats/OtherFeats-en.txt b/SolastaUnfinishedBusiness/Translations/en/Feats/OtherFeats-en.txt
index e038b8dd57..a05be190ed 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Feats/OtherFeats-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Feats/OtherFeats-en.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Increase your Constitution by 1, to a maximum of 20
 Feat/&FeatChefConTitle=Chef [Con]
 Feat/&FeatChefWisDescription=Increase your Wisdom by 1, to a maximum of 20.\nYou can spend 1 hour to cook a meal to heal you and your companions for 1d8 HP.\nOnce a day, you may spend an hour to cook a number of treats equal to your proficiency bonus that provide 5 temporary HP when eaten.
 Feat/&FeatChefWisTitle=Chef [Wis]
-Feat/&FeatCriticalVirtuosoDescription=Your critical threshold is lowered by 1.
 Feat/&FeatDungeonDelverDescription=Alert to the hidden traps and secret doors found in many dungeons, you gain the following benefits:\n• You have advantage on Wisdom (Perception) and Intelligence (Investigation) checks.\n• You have advantage on saving throws made to avoid or resist traps.\n• You have resistance to the damage dealt by traps.\n• Travelling at a fast pace doesn't impose the normal -5 penalty on your passive Wisdom (Perception) score.
 Feat/&FeatDungeonDelverTitle=Dungeon Delver
 Feat/&FeatEldritchAdeptDescription=You learn one Eldritch Invocation option of your choice from the warlock class. If the invocation has a prerequisite, you can choose that invocation only if you're a warlock and only if you meet the prerequisite. Whenever you gain a level, you can replace the invocation with another one from the warlock class.
diff --git a/SolastaUnfinishedBusiness/Translations/en/Feats/Races-en.txt b/SolastaUnfinishedBusiness/Translations/en/Feats/Races-en.txt
index b3ad530772..7324a66628 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Feats/Races-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Feats/Races-en.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=You have a deep hatred for a particular kin
 Feat/&FeatGrudgeBearerWisTitle=Grudge Bearer [Wis]
 Feat/&FeatInfernalConstitutionDescription=Fiendish blood runs strong in you, unlocking a resilience akin to that possessed by some fiends. You gain the following benefits:\n• Increase your Constitution by 1, to a maximum of 20.\n• You have resistance to cold and poison damage.\n• You have advantage on saving throws against being poisoned.
 Feat/&FeatInfernalConstitutionTitle=Infernal Constitution
-Feat/&FeatOrcishAggressionConDescription=Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Constitution by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon.
+Feat/&FeatOrcishAggressionConDescription=Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Constitution by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon. This feature can be used proficiency bonus times per long rest.
 Feat/&FeatOrcishAggressionConTitle=Orcish Aggression [Con]
-Feat/&FeatOrcishAggressionDescription=Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Strength by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon.
+Feat/&FeatOrcishAggressionDescription=Your aggression burns tirelessly. You gain the following benefits:\n• Increase your Strength by 1, up to a maximum of 20.\n• As a bonus action, when wielding a melee weapon in main hand, you can charge up to your speed toward an enemy of your choice and free attack the creature with your main weapon. This feature can be used proficiency bonus times per long rest.
 Feat/&FeatOrcishAggressionTitle=Orcish Aggression [Str]
 Feat/&FeatOrcishFuryConDescription=Your fury burns tirelessly. You gain the following benefits:\n• Increase your Constitution by 1, up to a maximum of 20.\n• When you hit with an attack made with a simple or martial weapon, you can roll one of the weapon's damage dice an additional time and add it as extra damage of the weapon's damage type. Once you use this ability, you can't use it again until you finish a short or long rest.\n• Immediately after you use your Relentless Endurance trait, you can use your reaction to make one weapon attack.
 Feat/&FeatOrcishFuryConTitle=Orcish Fury [Con]
diff --git a/SolastaUnfinishedBusiness/Translations/en/Feats/RangedCombat-en.txt b/SolastaUnfinishedBusiness/Translations/en/Feats/RangedCombat-en.txt
index 6f454f1fbb..48e9260c19 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Feats/RangedCombat-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Feats/RangedCombat-en.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=You have advantage on your
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Steady Aim
 Condition/&ConditionFeatSteadyAimRestrainedDescription=You cannot move until the end of your turn.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Restrained by Steady Aim
-Feat/&FeatBowMasteryDescription=Your expert training with bows grants you these benefits:\n• You gain a +1 bonus to damage rolls you make with shortbow and longbow.\n• When you use the Attack action with a shortbow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.\n• You can use Strength instead of Dexterity on attack and damage rolls you make with a longbow.
+Feat/&FeatBowMasteryDescription=When you use the Attack action with a bow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.
 Feat/&FeatBowMasteryTitle=Bow Mastery
-Feat/&FeatCrossbowMasteryDescription=Your expert training with crossbows grants you these benefits:\n• You gain a +1 bonus to damage rolls you make with heavy, light and hand crossbows.\n• When you use the Attack action with a light or hand crossbow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.\n• You can use Strength instead of Dexterity on attack and damage rolls you make with a heavy crossbow.
+Feat/&FeatCrossbowMasteryDescription=When you use the Attack action with a crossbow on your turn, you can make one ranged weapon attack as a bonus action, adding your attribute modifier to damage.
 Feat/&FeatCrossbowMasteryTitle=Crossbow Mastery
 Feat/&FeatDeadeyeDescription=You have learned to trade accuracy to land deadlier shots:\n• When attacking with a ranged weapon, you can choose to take a -5 penalty to your attack roll in order to do additional +10 damage.\n• Attacks at long range don't impose disadvantage and ranged weapon attack ignores half cover and three-quarters cover.
 Feat/&FeatDeadeyeTitle=Sharpshooter
diff --git a/SolastaUnfinishedBusiness/Translations/en/FightingStyles-en.txt b/SolastaUnfinishedBusiness/Translations/en/FightingStyles-en.txt
index f5f1ecf74b..a0777f3846 100644
--- a/SolastaUnfinishedBusiness/Translations/en/FightingStyles-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/FightingStyles-en.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=Crippling Damage!
 Feedback/&AdditionalDamageCripplingLine={1} suffers crippling damage.
 Feedback/&AdditionalDamageExecutionerFormat=Execution!
 Feedback/&AdditionalDamageExecutionerLine={0} executes {1} for +{2} extra damage!
+FightingStyle/&AstralReachDescription=Your Unarmed Strike reach increases by 5 ft.
+FightingStyle/&AstralReachTitle=Astral Reach
 FightingStyle/&BlindFightingDescription=You have blind sight with a range of 10 ft. Within that range, you can effectively see anything that isn't behind total cover, even if you're blinded or in darkness. Moreover, you can see an invisible creature within that range, unless the creature successfully hides from you.
 FightingStyle/&BlindFightingTitle=Blind Fighting
-FightingStyle/&CripplingDescription=Upon hitting with a melee attack, you can reduce the speed of your opponents by 10 ft and reduce their armor class by 1 until the end of your next turn.
+FightingStyle/&CripplingDescription=You reduce the speed of your opponents by 10 ft until the end of your next turn on a melee attack hit.
 FightingStyle/&CripplingTitle=Crippling
-FightingStyle/&ExecutionerDescription=You add your proficiency bonus to damage against creatures that are blinded, frightened, restrained, incapacitated, paralyzed, prone or stunned.
+FightingStyle/&ExecutionerDescription=You add your proficiency bonus to damage against blinded, frightened, restrained, incapacitated, paralyzed, prone or stunned creatures.
 FightingStyle/&ExecutionerTitle=Executioner
-FightingStyle/&HandAndAHalfDescription=While wielding a melee one-handed or versatile weapon and no other weapon or shield, you gain a +1 bonus to your attack rolls with the weapon and a +1 to your Armor Class.
+FightingStyle/&HandAndAHalfDescription=You gain a +1 bonus to your attack rolls and a +1 to bonus to your Armor Class while wielding a melee one-handed or versatile weapon and no other weapon or shield.
 FightingStyle/&HandAndAHalfTitle=Classical Swordplay
 FightingStyle/&InterceptionDescription=When a creature you can see hits a target, other than you, within 5 feet of you with an attack, you can use your reaction to reduce the damage the target takes by 1d10 + your proficiency bonus. You must wield a shield or a simple or martial weapon to use this reaction.
 FightingStyle/&InterceptionTitle=Interception
-FightingStyle/&LungerDescription=While wielding only one melee weapon without the heavy tag and a free offhand, that weapon's range increases by 5 ft.
+FightingStyle/&LungerDescription=Your melee weapon reach increases by 5 ft while wielding a weapon without the heavy tag and no other weapon or shield.
 FightingStyle/&LungerTitle=Lunger
 FightingStyle/&MercilessDescription=When you reduce a target to 0 HP using a melee weapon attack on your turn, enemies within a radius of the downed target equal to half of your proficiency bonus (rounded up) who can see the target must make a Wisdom save (DC 8 + your proficiency bonus + your Strength modifier) or become frightened of you until the end of your next turn. If the triggering attack is a critical hit, the radius is instead equal to your proficiency bonus.
 FightingStyle/&MercilessTitle=Merciless
@@ -24,19 +26,19 @@ FightingStyle/&MonkShieldExpertDescription=You gain Shield proficiency, and they
 FightingStyle/&MonkShieldExpertTitle=Monastic Shield Training
 FightingStyle/&PolearmExpertDescription=Your expert training with a polearm grants you these benefits:\n• When you take the Attack action and attack with only a polearm weapon, you can use a bonus action to make a melee attack with the opposite end of the weapon. This attack uses the same ability modifier as the primary attack and deals 1d4 bludgeoning damage.\n• Other creatures provoke an opportunity attack from you when they enter the reach you have with wielding a polearm weapon.
 FightingStyle/&PolearmExpertTitle=Polearm Master
-FightingStyle/&PugilistDescription=Your unarmed strikes deal an additional 1d4 bludgeoning damage, and you can punch with your offhand as a bonus action. You can shove as a bonus action if you have free hand.
+FightingStyle/&PugilistDescription=Your unarmed strikes deal an additional 1d4 bludgeoning damage, and you can punch with your offhand as a bonus action. You can shove as a bonus action if you have no other weapon or shield.
 FightingStyle/&PugilistTitle=Pugilist
 FightingStyle/&RemarkableTechniqueDescription=You have martial training that allows you to perform special combat techniques called maneuvers:\n• You learn one maneuver of your choice from the Battle Master subclass. The Maneuver DC of these maneuvers is 8 + proficiency bonus + Strength or Dexterity modifier, whichever is higher.\n• You gain 1 Superiority Die. The die is a d6, and it doesn't increase in size if you are not a Battle Master. This die is used to fuel your maneuvers. It is expended when you use it, and is regained when you finish a short or long rest.
 FightingStyle/&RemarkableTechniqueTitle=Superior Technique
-FightingStyle/&RopeItUpDescription=Your thrown strikes get +1 to attack and damage rolls, you increase both it's long and short range by 10 feet, and it returns to your hand immediately after it is used to make a thrown attack.
-FightingStyle/&RopeItUpTitle=Rope it Up
+FightingStyle/&RopeItUpDescription=When you are making a ranged attack with a thrown weapon, increase its short range by 10 feet and its long range by 20 feet. In addition, the weapon returns into your hand immediately after it is used to make a thrown attack.
+FightingStyle/&RopeItUpTitle=Thrown Weapons Master
 FightingStyle/&SentinelDescription=You have mastered techniques to take advantage of every drop in any enemy's guard:\n• When you hit a creature with an opportunity attack, the creature's speed becomes 0 for the rest of the turn.\n• Creatures provoke opportunity attacks from you even if they take the Disengage action before leaving your reach.\n• You can use your reaction to make a melee weapon attack against the attacking creature when a creature makes an attack against a target other than you.
 FightingStyle/&SentinelTitle=Sentinel
-FightingStyle/&ShieldExpertDescription=You have trained in the use of a shield as a weapon. It becomes a melee weapon that you are proficient with that deals 1d4 bludgeoning damage. You gain advantage on shove attempts while wielding a shield.
-FightingStyle/&ShieldExpertTitle=Shield Expert
-FightingStyle/&TorchbearerDescription=You are skilled in the use of a torch in battle. Once per turn, as a bonus action, you may elect to use a light source you have equipped to attempt to set an enemy you can touch on fire. Your target must succeed on a Dexterity saving throw (DC 8 + your proficiency bonus + your Dexterity modifier) or take 1d4 fire damage per turn for 1 minute or until extinguished.
+FightingStyle/&ShieldExpertDescription=You can use your bonus action to bash a creature using your shield, turning it momentarily into a special improvised weapon that you are proficient with. Make a melee weapon attack against a creature within 5 feet of you using your Strength modifier for the attack. If you hit, the creature takes 1d4 + Strength modifier as bludgeoning damage.
+FightingStyle/&ShieldExpertTitle=Shield Bash
+FightingStyle/&TorchbearerDescription=As a bonus action, you may elect to use a light source you have equipped to attempt to set an enemy you can touch on fire. Your target must succeed on a Dexterity saving throw (DC 8 + your proficiency bonus + your Dexterity modifier) or take 1d4 fire damage per turn for 1 minute or until extinguished.
 FightingStyle/&TorchbearerTitle=Torchbearer
-FightingStyle/&ZenArcherDescription=Your intuition guides your hand when using a bow. Increase your Wisdom attribute by 1, to a maximum of 20. You can use your Wisdom modifier instead of your Dexterity modifer for the attack and damage rolls with these weapons.
+FightingStyle/&ZenArcherDescription=Your intuition guides your hand when using a bow. Increase your Wisdom attribute by 1, to a maximum of 20. You can use your Wisdom modifier instead of your Dexterity modifier for the attack and damage rolls with these weapons.
 FightingStyle/&ZenArcherTitle=Wise Archery
 Reaction/&CustomReactionInterceptionDescription=Reduce the damage {0} takes from {1} by 1d10 + your proficiency bonus.
 Reaction/&CustomReactionInterceptionReactDescription=Intercept this attack.
diff --git a/SolastaUnfinishedBusiness/Translations/en/Level20-en.txt b/SolastaUnfinishedBusiness/Translations/en/Level20-en.txt
index c53a9b1c0b..9cfb7f7ff7 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Level20-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Level20-en.txt
@@ -74,12 +74,8 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=Starting at 17th level
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Purity of Light
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=Starting at 17th level, you gain the ability to set up lethal vibrations in someone's body. When you hit a creature with an unarmed strike, you can spend 3 Ki points to start these imperceptible vibrations, which last for 24 hours. The vibrations are harmless unless you use your action to end them. When you use this action, the creature must make a Constitution saving throw. If it fails, it is reduced to 1 hit point and becomes stunned until the start of their next turn. If it succeeds, it takes 10d10 necrotic damage.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Quivering Palm
-Feature/&GrantInvocationsSpellMasteryDescription=You have achieved such mastery over certain spells that you can cast them at will. The first two 1st and 2nd-level wizard spells that you prepare can be cast at their lowest level without expending a spell slot. If you want to cast either spell at a higher level, you must expend a spell slot as normal.
-Feature/&GrantInvocationsSpellMasteryTitle=Spell Mastery
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Select a Signature Spell to learn.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Signature Spells
-Feature/&InvocationPoolWizardSignatureSpellsDescription=You gain mastery over two powerful spells and can cast them with little effort. Choose two 3rd-level wizard spells as your signature spells. You always have these spells prepared, they don't count against the number of spells you have prepared, and you can cast each of them once at 3rd level without expending a spell slot. When you do so, you can't do so again until you finish a short or long rest.
-Feature/&InvocationPoolWizardSignatureSpellsTitle=Signature Spells
+Feature/&FeatureWizardSpellMasteryDescription=You have achieved such mastery over certain spells that you can cast them at will. Choose two 1st-level or 2nd-level wizard spells that are in your spellbook. You can cast those spells at their lowest level without expending a spell slot when you have them prepared. If you want to cast either spell at a higher level, you must expend a spell slot as normal.
+Feature/&FeatureWizardSpellMasteryTitle=Spell Mastery
 Feature/&MagicAffinityArchDruidDescription=You can use your Wildshape an unlimited number of times. Additionally, you can ignore the verbal and somatic components of your druid spells, as well as any material components that lack a cost and aren't consumed by a spell. You gain this benefit in both your normal shape and your beast shape from Wildshape.
 Feature/&MagicAffinityArchDruidTitle=Arch Druid
 Feature/&MagicAffinitySorcererChildRiftMagicMasteryDescription=Starting at 18th level, whenever you roll a d20 to regain a spell slot from your Rift Magic feature, you can now regain any slot level upon rolling an 18, 19 or 20.
@@ -142,6 +138,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=Starting at 17th le
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Physical Perfection
 Feature/&PowerWarlockEldritchMasterDescription=You can draw on your inner reserve of mystical power while entreating your patron to regain expended spell slots. You can spend 1 minute entreating your patron for aid to regain all your expended spell slots from your Pact Magic feature. Once you regain spell slots with this feature, you must finish a long rest before you can do so again.
 Feature/&PowerWarlockEldritchMasterTitle=Eldritch Master
+Feature/&PowerWizardSignatureSpellsDescription=You gain mastery over two powerful spells and can cast them with little effort. Choose two 3rd-level wizard spells in your spellbook as your signature spells. You always have these spells prepared, they don't count against the number of spells you have prepared, and you can cast each of them once at 3rd level without expending a spell slot. When you do so, you can't do so again until you finish a short or long rest.
+Feature/&PowerWizardSignatureSpellsTitle=Signature Spells
 Feature/&SenseRangerFeralSensesDescription=You gain preternatural senses that help you fight creatures you can't see. When you attack a creature you cannot see, your inability to see it doesn't impose disadvantage on your attack rolls against it.
 Feature/&SenseRangerFeralSensesTitle=Feral Senses
 Feedback/&AdditionalDamageBrutalAssaultFormat=Brutal Assault!
@@ -158,6 +156,14 @@ Reaction/&UsePhysicalPerfectionDescription=You can pay 1 Ki to restore 1 hit poi
 Reaction/&UsePhysicalPerfectionReactDescription=You can pay 1 Ki to restore 1 hit points.
 Reaction/&UsePhysicalPerfectionReactTitle=Heal
 Reaction/&UsePhysicalPerfectionTitle=Physical Perfection
+RestActivity/&RestActivitySignatureSpellsDescription=You can select your signature spells once.
+RestActivity/&RestActivitySignatureSpellsTitle=Signature Spells
+RestActivity/&RestActivitySpellMasteryDescription=You can change your list of mastery spells when you finish a long rest.
+RestActivity/&RestActivitySpellMasteryTitle=Spell Mastery
 Rules/&DamagePureDescription=Imperceptible vibrations that disintegrate the victim from within.
 Rules/&DamagePureTitle=Pure
+Screen/&SignatureSpellsExtraSpellDescription=This Signature spell is always prepared and, once per long rest, it doesn't consume a spell slot when cast at level.
+Screen/&SignatureSpellsExtraSpellTitle=Signature
+Screen/&SpellMasteryExtraSpellDescription=This Mastery spell is always prepared and doesn't consume a spell slot when cast at level.
+Screen/&SpellMasteryExtraSpellTitle=Mastery
 Tooltip/&MustHaveQuiveringPalmCondition=Isn't marked by Quivering Palm
diff --git a/SolastaUnfinishedBusiness/Translations/en/Others-en.txt b/SolastaUnfinishedBusiness/Translations/en/Others-en.txt
index 360543ac74..642d65b3d0 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Others-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Others-en.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Activate/deactivate Brutal Strike
 Action/&BrutalStrikeToggleTitle=Brutal Strike
 Action/&CastPlaneMagicDescription=Cast one of the spells you got from Plane Touched feats
 Action/&CastPlaneMagicTitle=Channel Plane Magic
-Action/&CastSignatureSpellsDescription=Cast these 3rd level spells without spending a slot
-Action/&CastSignatureSpellsTitle=Signature Spells
-Action/&CastSpellMasteryDescription=Cast your 1st or 2nd level prepared spells without spending a slot
-Action/&CastSpellMasteryTitle=Spell Mastery
 Action/&CoordinatedAssaultToggleDescription=Activate/deactivate Coordinated Assault
 Action/&CoordinatedAssaultToggleTitle=Coordinated Assault
 Action/&CunningStrikeToggleDescription=Activate/deactivate Cunning Strike
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Power
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Proficiency
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Preferred Enemy
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Terrain Type Affinity
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Signature Spell
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Sorcerous Draconic Ancestry
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Weapon Training
 UI/&ForcePreferredCantripDescription=If this toggled is ON, only the preferred cantrip can trigger. If the preferred cantrip isn't selected, then the first valid cantrip will trigger, regardless of this toggle.
diff --git a/SolastaUnfinishedBusiness/Translations/en/Settings-en.txt b/SolastaUnfinishedBusiness/Translations/en/Settings-en.txt
index c9d613220a..0d61c6b3ec 100644
--- a/SolastaUnfinishedBusiness/Translations/en/Settings-en.txt
+++ b/SolastaUnfinishedBusiness/Translations/en/Settings-en.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Allow casting spells with extra action from being Haste
 ModUi/&AllowHornsOnAllRaces=Allow horns on all races <i><color=#F0DAA0>[results might look terrible depending on race, head and horn]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Allow more real state on rest panel <i><color=#F0DAA0>[hide after rest actions on before panel and recovery features on after panel]</color></i>
 ModUi/&AllowStackedMaterialComponent=Allow stacked material component <i><color=#F0DAA0>[e.g. 2x500gp diamond is equivalent to 1000gp diamond]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Allow target selection when casting the <color=#D89555>Chain Lightning</color> spell
 ModUi/&AllowUnmarkedSorcerers=Allow <color=#D89555>Sorcerer</color> without origin markings and tattoos
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=<color=#1E81B0>ALT</color> key only highlights gadgets in party field of view <i><color=#F0DAA0>[custom dungeons only]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Allow <color=#D89555>Arcane Shieldstaff</color> to be attuned by any class
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Disable <color=#D89555>Superio
 ModUi/&DisableUnofficialTranslations=Disable unofficial translations support to speed up mod <i><color=#F0DAA0>[unless I speak Chinese, Italian, Japanese, Korean or Spanish]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Display all known spells from other classes during level up</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Display <color=#D89555>Warlock</color> pact slots on spell selection instead of character panel</i>
-ModUi/&DocsArcaneShots=DOCS: Arcane Shots
-ModUi/&DocsBackgrounds=DOCS: Backgrounds
-ModUi/&DocsFeats=DOCS: Feats
-ModUi/&DocsFightingStyles=DOCS: Fighting Styles
-ModUi/&DocsInfusions=DOCS: Infusions
-ModUi/&DocsInvocations=DOCS: Invocations
-ModUi/&DocsManeuvers=DOCS: Maneuvers
-ModUi/&DocsMetamagic=DOCS: Metamagic
-ModUi/&DocsRaces=DOCS: Races
-ModUi/&DocsSpells=DOCS: Spells
-ModUi/&DocsSubclasses=DOCS: Subclasses
-ModUi/&DocsSubraces=DOCS: Subraces
+ModUi/&DocsArcaneShots=Arcane Shots
+ModUi/&DocsBackgrounds=Backgrounds
+ModUi/&DocsFeats=Feats
+ModUi/&DocsFightingStyles=Fighting Styles
+ModUi/&DocsInfusions=Infusions
+ModUi/&DocsInvocations=Invocations
+ModUi/&DocsManeuvers=Maneuvers
+ModUi/&DocsMetamagic=Metamagic
+ModUi/&DocsRaces=Races
+ModUi/&DocsSpells=Spells
+ModUi/&DocsSubclasses=Subclasses
+ModUi/&DocsSubraces=Subraces
+ModUi/&DocsVersatilities=Versatilities
 ModUi/&Donate=<b><color=#D89555>Donate:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=Don't display helmets on graphic characters <b><i><color=#C04040E0>[Requires Restart]</color></i></b>
 ModUi/&DontEndTurnAfterReady=Don't end turn after using <color=#D89555>ready action</color> <i><color=#F0DAA0>[allows to use Bonus Action or any extra Main actions from Haste or other sources]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Enable <color=#D89555>Rogue</color> <b>Fighting
 ModUi/&EnableRogueSteadyAim=Enable <color=#D89555>Rogue</color> <b>Steady Aim</b> at level 3 <i><color=#F0DAA0>[bonus action gives advantage on your next attack roll in the current turn if you haven't moved yet]</color></i>
 ModUi/&EnableRogueStrSaving=Enable <color=#D89555>Rogue</color> to use DEX or STR modifiers on <b>Cunning/Devious Strike</b>, <b>Debilitating/Improved Strike</b>, and <b>Hail of Blades</b>
 ModUi/&EnableSaveByLocation=Enable save by campaigns / locations
+ModUi/&EnableSignatureSpellsRelearn=Enable <color=#D89555>Wizard</color> signature spells to be prepared every long rest <i><color=#F0DAA0>[instead of once at level 20]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Enable assets sorting on Dungeon Maker editor
 ModUi/&EnableStatsOnHeroTooltip=Display stats on hero's tooltip <i><color=#F0DAA0>[i.e.: critical hits, critical failures, etc.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=<i>+ Also each hero adds a D20 roll to weight for a bit of randomness <color=#F0DAA0>[choice weight = votes * hero Charisma modifier + D20 roll]</color></i>
diff --git a/SolastaUnfinishedBusiness/Translations/es/Feats/Group-es.txt b/SolastaUnfinishedBusiness/Translations/es/Feats/Group-es.txt
index 7429f85289..a3b4296da5 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Feats/Group-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Feats/Group-es.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Combate: cuerpo a cuerpo
 Feat/&FeatGroupOldTacticsDescription=Aumenta tu Fuerza o Destreza en 1. Una vez por ronda, cuando un enemigo tumbado dentro del alcance de tu arma cuerpo a cuerpo se levanta, puedes realizar un ataque de oportunidad contra el objetivo.
 Feat/&FeatGroupOldTacticsTitle=Viejas tácticas
-Feat/&FeatGroupOrcishAggressionDescription=Tu agresión arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu Fuerza o Constitución en 1, hasta un máximo de 20.\n• Como acción adicional, cuando empuñas un arma cuerpo a cuerpo en la mano principal, puedes cargar hasta tu velocidad. hacia un enemigo de tu elección y ataca libremente a la criatura con tu arma principal.
+Feat/&FeatGroupOrcishAggressionDescription=Tu agresión arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu Fuerza o Constitución en 1, hasta un máximo de 20.\n• Como acción adicional, cuando empuñas un arma cuerpo a cuerpo en la mano principal, puedes cargar hasta tu velocidad. hacia un enemigo de tu elección y ataca libremente a la criatura con tu arma principal. Esta función se puede utilizar en tiempos de bonificación de competencia por descanso prolongado.
 Feat/&FeatGroupOrcishAggressionTitle=Agresión orca
 Feat/&FeatGroupOrcishFuryDescription=Tu furia arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu Fuerza o Constitución en 1, hasta un máximo de 20.\n• Cuando golpeas con un ataque realizado con un arma simple o marcial, puedes tirar uno de los dados de daño una vez más y agrégalos como daño adicional al tipo de daño del arma. Una vez que uses esta habilidad, no podrás volver a usarla hasta que termines un descanso corto o largo.\n• Inmediatamente después de usar tu rasgo Resistencia implacable, puedes usar tu reacción para realizar un ataque con arma.
 Feat/&FeatGroupOrcishFuryTitle=Furia orca
diff --git a/SolastaUnfinishedBusiness/Translations/es/Feats/MeleeCombat-es.txt b/SolastaUnfinishedBusiness/Translations/es/Feats/MeleeCombat-es.txt
index a5a8878dd1..a75fb197b5 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Feats/MeleeCombat-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Feats/MeleeCombat-es.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=Tienes práctica en el arte de aplastar a tus en
 Feat/&FeatCrusherConTitle=Trituradora [Con]
 Feat/&FeatCrusherStrDescription=Tienes práctica en el arte de aplastar a tus enemigos. Aumenta tu Fuerza en 1, hasta un máximo de 20. Cuando golpeas a una criatura con un ataque que causa un daño contundente, una vez por turno empujas al enemigo 5 pies. Cuando consigues un golpe crítico, las tiradas de ataque contra esa criatura se realizan con ventaja hasta el comienzo de tu siguiente turno.
 Feat/&FeatCrusherStrTitle=Trituradora [Str]
-Feat/&FeatDefensiveDuelistDescription=Cuando empuñas un arma delicada con la que eres competente y otra criatura te golpea con un ataque cuerpo a cuerpo, puedes usar tu reacción para agregar tu bonificación de competencia a tu CA para ese ataque, lo que podría provocar que el ataque no te alcance.
+Feat/&FeatDefensiveDuelistDescription=Cuando empuñas un arma cuerpo a cuerpo con la que eres competente y otra criatura te golpea con un ataque cuerpo a cuerpo, puedes usar tu reacción para agregar tu bonificación de competencia a tu CA para ese ataque, lo que podría causar que el ataque no te alcance.
 Feat/&FeatDefensiveDuelistTitle=Duelista defensivo
 Feat/&FeatFellHandedDescription=Dominas el hacha de mano, el hacha de batalla, el hacha grande, el martillo de guerra y el mazo. Obtienes los siguientes beneficios al usar cualquiera de ellos:\n• Una bonificación de +1 a las tiradas de ataque que realizas con el arma.\n• Siempre que tienes ventaja en una tirada de ataque cuerpo a cuerpo y golpeas, derribas al objetivo si la menor de las dos tiradas de d20 también impactaría al objetivo.\n• Siempre que tengas desventaja en una tirada de ataque cuerpo a cuerpo y falles, el objetivo sufre un daño contundente igual a tu modificador de Fuerza si la mayor de las dos tiradas de d20 impactaría al objetivo. .
 Feat/&FeatFellHandedTitle=Cayó con la mano
diff --git a/SolastaUnfinishedBusiness/Translations/es/Feats/OtherFeats-es.txt b/SolastaUnfinishedBusiness/Translations/es/Feats/OtherFeats-es.txt
index 4e3d827569..c181cccc50 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Feats/OtherFeats-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Feats/OtherFeats-es.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Aumenta tu Constitución en 1, hasta un máximo de
 Feat/&FeatChefConTitle=Chef [Con]
 Feat/&FeatChefWisDescription=Aumenta tu Sabiduría en 1, hasta un máximo de 20.\nPuedes dedicar 1 hora a cocinar una comida para curarte a ti y a tus compañeros por 1d8 HP.\nUna vez al día, puedes dedicar una hora a cocinar varios de golosinas equivalentes a tu bonificación de competencia que proporcionan 5 HP temporales cuando se comen.
 Feat/&FeatChefWisTitle=Chef [Wis]
-Feat/&FeatCriticalVirtuosoDescription=Su umbral crítico se reduce en 1.
 Feat/&FeatDungeonDelverDescription=Al estar alerta de las trampas ocultas y las puertas secretas que se encuentran en muchas mazmorras, obtienes los siguientes beneficios:\n• Tienes ventaja en las pruebas de Sabiduría (Percepción) e Inteligencia (Investigación).\n• Tienes ventaja en las tiradas de salvación realizadas para evita o resiste las trampas.\n• Tienes resistencia al daño causado por las trampas.\n• Viajar a un ritmo rápido no impone la penalización normal de -5 en tu puntuación pasiva de Sabiduría (Percepción).
 Feat/&FeatDungeonDelverTitle=Explorador de mazmorras
 Feat/&FeatEldritchAdeptDescription=Aprendes una opción de Invocación sobrenatural de tu elección de la clase de brujo. Si la invocación tiene un requisito previo, puedes elegir esa invocación sólo si eres un brujo y sólo si cumples el requisito previo. Cada vez que ganes un nivel, podrás reemplazar la invocación por otra de la clase de brujo.
diff --git a/SolastaUnfinishedBusiness/Translations/es/Feats/Races-es.txt b/SolastaUnfinishedBusiness/Translations/es/Feats/Races-es.txt
index bbefbb427c..75c3307e77 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Feats/Races-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Feats/Races-es.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=Sientes un profundo odio por un tipo partic
 Feat/&FeatGrudgeBearerWisTitle=Portador de rencor [Wis]
 Feat/&FeatInfernalConstitutionDescription=La sangre diabólica corre fuerte en ti, desbloqueando una resiliencia similar a la que poseen algunos demonios. Obtienes los siguientes beneficios:\n• Aumenta tu Constitución en 1, hasta un máximo de 20.\n• Tienes resistencia al daño por frío y veneno.\n• Tienes ventaja en las tiradas de salvación contra ser envenenado.
 Feat/&FeatInfernalConstitutionTitle=Constitución infernal
-Feat/&FeatOrcishAggressionConDescription=Tu agresión arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu Constitución en 1, hasta un máximo de 20.\n• Como acción adicional, cuando empuñas un arma cuerpo a cuerpo en la mano principal, puedes cargar hasta tu velocidad hacia un enemigo de tu elección y ataca libremente a la criatura con tu arma principal.
+Feat/&FeatOrcishAggressionConDescription=Tu agresión arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu Constitución en 1, hasta un máximo de 20.\n• Como acción adicional, cuando empuñas un arma cuerpo a cuerpo en la mano principal, puedes cargar hasta tu velocidad hacia un enemigo de tu elección y ataca libremente a la criatura con tu arma principal. Esta función se puede utilizar en tiempos de bonificación de competencia por descanso prolongado.
 Feat/&FeatOrcishAggressionConTitle=Agresión orca [Con]
-Feat/&FeatOrcishAggressionDescription=Tu agresión arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu fuerza en 1, hasta un máximo de 20.\n• Como acción adicional, cuando empuñas un arma cuerpo a cuerpo en la mano principal, puedes cargar hasta tu velocidad hacia un enemigo de tu elección y ataca libremente a la criatura con tu arma principal.
+Feat/&FeatOrcishAggressionDescription=Tu agresión arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu fuerza en 1, hasta un máximo de 20.\n• Como acción adicional, cuando empuñas un arma cuerpo a cuerpo en la mano principal, puedes cargar hasta tu velocidad hacia un enemigo de tu elección y ataca libremente a la criatura con tu arma principal. Esta función se puede utilizar en tiempos de bonificación de competencia por descanso prolongado.
 Feat/&FeatOrcishAggressionTitle=Agresión orca [Str]
 Feat/&FeatOrcishFuryConDescription=Tu furia arde incansablemente. Obtienes los siguientes beneficios:\n• Aumenta tu Constitución en 1, hasta un máximo de 20.\n• Cuando golpeas con un ataque realizado con un arma simple o marcial, puedes tirar uno de los dados de daño del arma. una vez adicional y agréguelo como daño adicional al tipo de daño del arma. Una vez que uses esta habilidad, no podrás volver a usarla hasta que termines un descanso corto o largo.\n• Inmediatamente después de usar tu rasgo Resistencia implacable, puedes usar tu reacción para realizar un ataque con arma.
 Feat/&FeatOrcishFuryConTitle=Furia orca [Con]
diff --git a/SolastaUnfinishedBusiness/Translations/es/Feats/RangedCombat-es.txt b/SolastaUnfinishedBusiness/Translations/es/Feats/RangedCombat-es.txt
index 08be49be87..f19333f306 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Feats/RangedCombat-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Feats/RangedCombat-es.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=Tienes ventaja en tu próx
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Buena puntería
 Condition/&ConditionFeatSteadyAimRestrainedDescription=No puedes moverte hasta el final de tu turno.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Restringido por objetivo constante
-Feat/&FeatBowMasteryDescription=Tu entrenamiento experto con arcos te otorga estos beneficios:\n• Obtienes una bonificación de +1 a las tiradas de daño que realizas con arco corto y arco largo.\n• Cuando usas la acción de Ataque con un arco corto en tu turno, puedes hacer un ataque con arma a distancia como acción adicional, añadiendo tu modificador de atributo al daño.\n• Puedes usar Fuerza en lugar de Destreza en las tiradas de ataque y daño que hagas con un arco largo.
+Feat/&FeatBowMasteryDescription=Cuando usas la acción de Ataque con un arco en tu turno, puedes realizar un ataque con arma a distancia como acción adicional, agregando tu modificador de atributo al daño.
 Feat/&FeatBowMasteryTitle=Dominio del arco
-Feat/&FeatCrossbowMasteryDescription=Tu entrenamiento experto con ballestas te otorga estos beneficios:\n• Obtienes una bonificación de +1 a las tiradas de daño que realizas con ballestas pesadas, ligeras y de mano.\n• Cuando usas la acción de ataque con una ballesta ligera o de mano En tu turno, puedes realizar un ataque con arma a distancia como acción adicional, agregando tu modificador de atributo al daño.\n• Puedes usar Fuerza en lugar de Destreza en las tiradas de ataque y daño que hagas con una ballesta pesada.
+Feat/&FeatCrossbowMasteryDescription=Cuando usas la acción de Ataque con una ballesta en tu turno, puedes realizar un ataque con arma a distancia como acción adicional, agregando tu modificador de atributo al daño.
 Feat/&FeatCrossbowMasteryTitle=Dominio de la ballesta
 Feat/&FeatDeadeyeDescription=Has aprendido a cambiar la precisión para acertar tiros más letales:\n• Cuando atacas con un arma a distancia, puedes elegir recibir una penalización de -5 a tu tirada de ataque para causar +10 de daño adicional.\n• Ataques a El largo alcance no impone desventajas y el ataque con armas a distancia ignora la mitad de la cobertura y las tres cuartas partes de la cobertura.
 Feat/&FeatDeadeyeTitle=Tirador de primera
diff --git a/SolastaUnfinishedBusiness/Translations/es/FightingStyles-es.txt b/SolastaUnfinishedBusiness/Translations/es/FightingStyles-es.txt
index 949036bd1c..c328bbd298 100644
--- a/SolastaUnfinishedBusiness/Translations/es/FightingStyles-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/FightingStyles-es.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=¡Daño paralizante!
 Feedback/&AdditionalDamageCripplingLine={1} sufre un daño paralizante.
 Feedback/&AdditionalDamageExecutionerFormat=¡Ejecución!
 Feedback/&AdditionalDamageExecutionerLine=¡{0} ejecuta {1} para causar +{2} daño adicional!
+FightingStyle/&AstralReachDescription=El alcance de tu golpe desarmado aumenta en 5 pies.
+FightingStyle/&AstralReachTitle=Alcance Astral
 FightingStyle/&BlindFightingDescription=Tienes vista ciega con un alcance de 10 pies. Dentro de ese rango, puedes ver efectivamente cualquier cosa que no esté detrás de una cobertura total, incluso si estás cegado o en la oscuridad. Además, puedes ver una criatura invisible dentro de ese rango, a menos que la criatura se oculte con éxito de ti.
 FightingStyle/&BlindFightingTitle=Lucha a ciegas
-FightingStyle/&CripplingDescription=Al golpear con un ataque cuerpo a cuerpo, puedes reducir la velocidad de tus oponentes en 10 pies y reducir su clase de armadura en 1 hasta el final de tu siguiente turno.
+FightingStyle/&CripplingDescription=Reduces la velocidad de tus oponentes en 10 pies hasta el final de tu siguiente turno con un ataque cuerpo a cuerpo.
 FightingStyle/&CripplingTitle=Herida
 FightingStyle/&ExecutionerDescription=Añades tu bonificación de competencia al daño contra criaturas ciegas, asustadas, restringidas, incapacitadas, paralizadas, boca abajo o aturdidas.
 FightingStyle/&ExecutionerTitle=Verdugo
-FightingStyle/&HandAndAHalfDescription=Mientras empuñas un arma cuerpo a cuerpo de una mano o versátil y ninguna otra arma o escudo, obtienes una bonificación de +1 a tus tiradas de ataque con el arma y un +1 a tu clase de armadura.
+FightingStyle/&HandAndAHalfDescription=Obtienes una bonificación de +1 a tus tiradas de ataque y una bonificación de +1 a tu clase de armadura mientras empuñas un arma cuerpo a cuerpo con una sola mano o versátil y ninguna otra arma o escudo.
 FightingStyle/&HandAndAHalfTitle=Esgrima clásica
 FightingStyle/&InterceptionDescription=Cuando una criatura que puedes ver golpea a un objetivo, que no seas tú, a 5 pies de ti con un ataque, puedes usar tu reacción para reducir el daño que recibe el objetivo en 1d10 + tu bonificación de competencia. Debes empuñar un escudo o un arma simple o marcial para utilizar esta reacción.
 FightingStyle/&InterceptionTitle=Interceptación
-FightingStyle/&LungerDescription=Mientras empuñas solo un arma cuerpo a cuerpo sin la etiqueta pesada y una mano libre, el alcance de esa arma aumenta en 5 pies.
+FightingStyle/&LungerDescription=El alcance de tu arma cuerpo a cuerpo aumenta en 5 pies mientras empuñas un arma sin la etiqueta pesada y ninguna otra arma o escudo.
 FightingStyle/&LungerTitle=Pulmones
 FightingStyle/&MercilessDescription=Cuando reduces a un objetivo a 0 HP usando un ataque con arma cuerpo a cuerpo en tu turno, los enemigos dentro de un radio del objetivo derribado igual a la mitad de tu bonificación de competencia (redondeado hacia arriba) que puedan ver al objetivo deben realizar una salvación de Sabiduría (CD 8 + tu bonificación de competencia + tu modificador de Fuerza) o tener miedo de ti hasta el final de tu siguiente turno. Si el ataque desencadenante es un golpe crítico, el radio es igual a tu bonificación de competencia.
 FightingStyle/&MercilessTitle=Despiadado
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=Obtienes competencia en Escudo y eso
 FightingStyle/&MonkShieldExpertTitle=Entrenamiento con escudo monástico
 FightingStyle/&PolearmExpertDescription=Tu entrenamiento experto con un arma de asta te otorga estos beneficios:\n• Cuando realizas la acción de Ataque y atacas solo con un arma de asta, puedes usar una acción adicional para realizar un ataque cuerpo a cuerpo con el extremo opuesto del arma. Este ataque utiliza el mismo modificador de habilidad que el ataque principal e inflige 1d4 de daño contundente.\n• Otras criaturas provocan un ataque de oportunidad de tu parte cuando entran en tu alcance empuñando un arma de asta.
 FightingStyle/&PolearmExpertTitle=Maestro de armas de asta
-FightingStyle/&PugilistDescription=Tus golpes desarmados causan 1d4 de daño contundente adicional y puedes golpear con la mano izquierda como acción adicional. Puedes empujar como acción adicional si tienes las manos libres.
+FightingStyle/&PugilistDescription=Tus golpes desarmados causan 1d4 de daño contundente adicional y puedes golpear con la mano izquierda como acción adicional. Puedes empujar como acción adicional si no tienes otra arma o escudo.
 FightingStyle/&PugilistTitle=Pugilista
 FightingStyle/&RemarkableTechniqueDescription=Tienes entrenamiento marcial que te permite realizar técnicas de combate especiales llamadas maniobras:\n• Aprendes una maniobra de tu elección de la subclase Maestro de batalla. La CD de maniobra de estas maniobras es 8 + bonificación de competencia + modificador de Fuerza o Destreza, lo que sea mayor.\n• Obtienes 1 Dado de Superioridad. El dado es un d6 y no aumenta de tamaño si no eres un Battle Master. Este dado se utiliza para impulsar tus maniobras. Se gasta cuando lo usas y se recupera cuando terminas un descanso corto o largo.
 FightingStyle/&RemarkableTechniqueTitle=Técnica Superior
-FightingStyle/&RopeItUpDescription=Tus golpes lanzados obtienen +1 a las tiradas de ataque y daño, aumentas su alcance largo y corto en 10 pies y regresa a tu mano inmediatamente después de usarlo para realizar un ataque lanzado.
-FightingStyle/&RopeItUpTitle=Átalo
+FightingStyle/&RopeItUpDescription=Cuando realices un ataque a distancia con un arma arrojadiza, aumenta su alcance corto en 10 pies y su alcance largo en 20 pies. Además, el arma vuelve a tu mano inmediatamente después de usarla para realizar un ataque lanzado.
+FightingStyle/&RopeItUpTitle=Maestro de armas arrojadizas
 FightingStyle/&SentinelDescription=Has dominado técnicas para aprovechar cada caída en la guardia de cualquier enemigo:\n• Cuando golpeas a una criatura con un ataque de oportunidad, la velocidad de la criatura se vuelve 0 por el resto del turno.\n• Las criaturas provocan ataques de oportunidad de incluso si realizan la acción de Desengancharse antes de salir de tu alcance.\n• Puedes usar tu reacción para realizar un ataque con arma cuerpo a cuerpo contra la criatura atacante cuando una criatura realiza un ataque contra un objetivo que no seas tú.
 FightingStyle/&SentinelTitle=Centinela
-FightingStyle/&ShieldExpertDescription=Te has entrenado en el uso de un escudo como arma. Se convierte en un arma cuerpo a cuerpo con la que eres competente y que causa 1d4 de daño contundente. Obtienes ventaja en los intentos de empujar mientras empuñas un escudo.
-FightingStyle/&ShieldExpertTitle=Experto en escudos
-FightingStyle/&TorchbearerDescription=Eres experto en el uso de una antorcha en batalla. Una vez por turno, como acción adicional, puedes optar por usar una fuente de luz que hayas equipado para intentar prender fuego a un enemigo que puedas tocar. Tu objetivo debe superar una tirada de salvación de Destreza (CD 8 + tu bonificación de competencia + tu modificador de Destreza) o sufrir 1d4 de daño por fuego por turno durante 1 minuto o hasta que se extinga.
+FightingStyle/&ShieldExpertDescription=Puedes usar tu acción adicional para golpear a una criatura usando tu escudo, convirtiéndola momentáneamente en un arma especial improvisada con la que eres competente. Realiza un ataque con arma cuerpo a cuerpo contra una criatura a 5 pies de ti usando tu modificador de Fuerza para el ataque. Si golpeas, la criatura recibe 1d4 + modificador de Fuerza como daño contundente.
+FightingStyle/&ShieldExpertTitle=Golpe de escudo
+FightingStyle/&TorchbearerDescription=Como acción adicional, puedes optar por utilizar una fuente de luz que hayas equipado para intentar prender fuego a un enemigo que puedas tocar. Tu objetivo debe superar una tirada de salvación de Destreza (CD 8 + tu bonificación de competencia + tu modificador de Destreza) o sufrir 1d4 de daño por fuego por turno durante 1 minuto o hasta que se extinga.
 FightingStyle/&TorchbearerTitle=Portador de la antorcha
 FightingStyle/&ZenArcherDescription=Tu intuición guía tu mano cuando usas un arco. Aumenta tu atributo de Sabiduría en 1, hasta un máximo de 20. Puedes usar tu modificador de Sabiduría en lugar de tu modificador de Destreza para las tiradas de ataque y daño con estas armas.
 FightingStyle/&ZenArcherTitle=Tiro con arco sabio
diff --git a/SolastaUnfinishedBusiness/Translations/es/Level20-es.txt b/SolastaUnfinishedBusiness/Translations/es/Level20-es.txt
index 19af2f752d..ccceb73657 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Level20-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Level20-es.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=A partir del nivel 17,
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Pureza de la luz
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=A partir del nivel 17, obtienes la capacidad de generar vibraciones letales en el cuerpo de alguien. Cuando golpeas a una criatura con un golpe desarmado, puedes gastar 3 puntos de Ki para iniciar estas vibraciones imperceptibles, que duran 24 horas. Las vibraciones son inofensivas a menos que utilices tu acción para acabar con ellas. Cuando usas esta acción, la criatura debe realizar una tirada de salvación de Constitución. Si falla, se reduce a 1 punto de vida y queda aturdido hasta el comienzo de su siguiente turno. Si tiene éxito, sufre 10d10 de daño necrótico.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Palma temblorosa
+Feature/&FeatureWizardSpellMasteryDescription=Has logrado tal dominio sobre ciertos hechizos que puedes lanzarlos a voluntad. Elige dos hechizos de mago de nivel 1 o 2 que estén en tu libro de hechizos. Puedes lanzar esos hechizos en su nivel más bajo sin gastar un espacio de hechizo cuando los tengas preparados. Si quieres lanzar cualquiera de los hechizos a un nivel superior, debes gastar un espacio de hechizo como de costumbre.
+Feature/&FeatureWizardSpellMasteryTitle=Dominio de hechizos
 Feature/&GrantInvocationsSpellMasteryDescription=Has logrado tal dominio sobre ciertos hechizos que puedes lanzarlos a voluntad. Los dos primeros hechizos de mago de nivel 1 y 2 que prepares se pueden lanzar en su nivel más bajo sin gastar un espacio de hechizo. Si quieres lanzar cualquiera de los hechizos a un nivel superior, debes gastar un espacio de hechizo como de costumbre.
 Feature/&GrantInvocationsSpellMasteryTitle=Dominio de hechizos
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Selecciona un hechizo característico para aprender.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Hechizos característicos
 Feature/&InvocationPoolWizardSignatureSpellsDescription=Obtienes dominio sobre dos hechizos poderosos y puedes lanzarlos con poco esfuerzo. Elige dos hechizos de mago de tercer nivel como tus hechizos característicos. Siempre tienes estos hechizos preparados, no cuentan para el número de hechizos que has preparado y puedes lanzar cada uno de ellos una vez en el nivel 3 sin gastar un espacio de hechizo. Cuando lo hagas, no podrás volver a hacerlo hasta que termines un descanso corto o largo.
 Feature/&InvocationPoolWizardSignatureSpellsTitle=Hechizos característicos
 Feature/&MagicAffinityArchDruidDescription=Puedes utilizar tu Wildshape un número ilimitado de veces. Además, puedes ignorar los componentes verbales y somáticos de tus hechizos de druida, así como cualquier componente material que carezca de costo y no sea consumido por un hechizo. Obtienes este beneficio tanto en tu forma normal como en tu forma de bestia de Wildshape.
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=A partir del nivel
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Perfección Física
 Feature/&PowerWarlockEldritchMasterDescription=Puedes recurrir a tu reserva interior de poder místico mientras suplicas a tu patrón que recupere los espacios para hechizos gastados. Puedes pasar 1 minuto pidiéndole ayuda a tu patrón para recuperar todos los espacios para hechizos gastados de tu función Pact Magic. Una vez que recuperes espacios para hechizos con esta característica, debes terminar un descanso prolongado antes de poder hacerlo nuevamente.
 Feature/&PowerWarlockEldritchMasterTitle=Maestro sobrenatural
+Feature/&PowerWizardSignatureSpellsDescription=Obtienes dominio sobre dos hechizos poderosos y puedes lanzarlos con poco esfuerzo. Elige dos hechizos de mago de tercer nivel en tu libro de hechizos como tus hechizos característicos. Siempre tienes estos hechizos preparados, no cuentan para el número de hechizos que has preparado y puedes lanzar cada uno de ellos una vez en el nivel 3 sin gastar un espacio de hechizo. Cuando lo hagas, no podrás volver a hacerlo hasta que termines un descanso corto o largo.
+Feature/&PowerWizardSignatureSpellsTitle=Hechizos característicos
 Feature/&SenseRangerFeralSensesDescription=Obtienes sentidos sobrenaturales que te ayudan a luchar contra criaturas que no puedes ver. Cuando atacas a una criatura que no puedes ver, tu incapacidad para verla no impone desventaja en tus tiradas de ataque contra ella.
 Feature/&SenseRangerFeralSensesTitle=Sentidos salvajes
 Feedback/&AdditionalDamageBrutalAssaultFormat=¡Brutal asalto!
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=Puedes pagar 1 Ki para restaurar 1 pu
 Reaction/&UsePhysicalPerfectionReactDescription=Puedes pagar 1 Ki para restaurar 1 punto de vida.
 Reaction/&UsePhysicalPerfectionReactTitle=Sanar
 Reaction/&UsePhysicalPerfectionTitle=Perfección Física
+RestActivity/&RestActivitySignatureSpellsDescription=Puedes seleccionar tus hechizos característicos una vez.
+RestActivity/&RestActivitySignatureSpellsTitle=Hechizos característicos
+RestActivity/&RestActivitySpellMasteryDescription=Puedes cambiar tu lista de hechizos de dominio cuando termines un descanso prolongado.
+RestActivity/&RestActivitySpellMasteryTitle=Dominio de hechizos
 Rules/&DamagePureDescription=Vibraciones imperceptibles que desintegran a la víctima desde dentro.
 Rules/&DamagePureTitle=Puro
+Screen/&SignatureSpellsExtraSpellDescription=Este hechizo característico siempre está preparado y, una vez por descanso prolongado, no consume un espacio de hechizo cuando se lanza en el nivel.
+Screen/&SignatureSpellsExtraSpellTitle=Hechizos característicos
+Screen/&SpellMasteryExtraSpellDescription=Este hechizo de Maestría siempre está preparado y no consume un espacio de hechizo cuando se lanza en el nivel.
+Screen/&SpellMasteryExtraSpellTitle=Dominio de hechizos
 Tooltip/&MustHaveQuiveringPalmCondition=No está marcado por la palma temblorosa
diff --git a/SolastaUnfinishedBusiness/Translations/es/Others-es.txt b/SolastaUnfinishedBusiness/Translations/es/Others-es.txt
index 10cce0bd07..45a84ded50 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Others-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Others-es.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Activar/desactivar Golpe Brutal
 Action/&BrutalStrikeToggleTitle=Golpe brutal
 Action/&CastPlaneMagicDescription=Lanza uno de los hechizos que obtuviste de las hazañas de Plane Touched
 Action/&CastPlaneMagicTitle=Magia del plano del canal
-Action/&CastSignatureSpellsDescription=Lanza estos hechizos de tercer nivel sin gastar un espacio
-Action/&CastSignatureSpellsTitle=Hechizos característicos
-Action/&CastSpellMasteryDescription=Lanza tus hechizos preparados de 1er o 2do nivel sin gastar un espacio
-Action/&CastSpellMasteryTitle=Dominio de hechizos
 Action/&CoordinatedAssaultToggleDescription=Activar/desactivar Asalto Coordinado
 Action/&CoordinatedAssaultToggleTitle=Asalto coordinado
 Action/&CunningStrikeToggleDescription=Activar/desactivar Golpe Astuto
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Fuerza
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Competencia
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Enemigo preferido
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Afinidad del tipo de terreno
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Hechizo de firma
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Ascendencia dracónica hechicera
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Entrenamiento con armas
 UI/&ForcePreferredCantripDescription=Si esto está activado, solo se puede activar el truco preferido. Si el truco preferido no está seleccionado, entonces se activará el primer truco válido, independientemente de esta opción.
diff --git a/SolastaUnfinishedBusiness/Translations/es/Settings-es.txt b/SolastaUnfinishedBusiness/Translations/es/Settings-es.txt
index 9a167dd323..d1a53815a3 100644
--- a/SolastaUnfinishedBusiness/Translations/es/Settings-es.txt
+++ b/SolastaUnfinishedBusiness/Translations/es/Settings-es.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Permitir lanzar hechizos con acción adicional por esta
 ModUi/&AllowHornsOnAllRaces=Permitir cuernos en todas las razas <i><color=#F0DAA0>[los resultados pueden parecer terribles dependiendo de la raza, cabeza y cuerno]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Permitir más estado real en el panel de descanso <i><color=#F0DAA0>[ocultar acciones posteriores al descanso en el panel anterior y funciones de recuperación en el panel posterior]</color></i>
 ModUi/&AllowStackedMaterialComponent=Permitir componente de material apilado <i><color=#F0DAA0>[p. ej. 2x500gp diamante es equivalente a 1000gp diamante]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Permitir la selección de objetivos al lanzar el hechizo <color=#D89555>Cadena de relámpagos</color>
 ModUi/&AllowUnmarkedSorcerers=Permitir <color=#D89555>Hechicero</color> sin marcas de origen ni tatuajes
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=La tecla <color=#1E81B0>ALT</color> solo resalta los dispositivos en el campo de visión del grupo <i><color=#F0DAA0>[solo mazmorras personalizadas]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Permitir que cualquier clase sintonice <color=#D89555>Bastón de escudo arcano</color>
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Deshabilita <color=#D89555>Sup
 ModUi/&DisableUnofficialTranslations=Desactive la compatibilidad con traducciones no oficiales para acelerar el mod <i><color=#F0DAA0>[a menos que hable chino, italiano, japonés, coreano o español]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Mostrar todos los hechizos conocidos de otras clases durante la subida de nivel</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Mostrar espacios de pacto <color=#D89555>Brujo</color> en la selección de hechizos en lugar del panel de personajes</i>
-ModUi/&DocsArcaneShots=DOCS: Disparos arcanos
-ModUi/&DocsBackgrounds=DOCUMENTOS: Antecedentes
-ModUi/&DocsFeats=DOCUMENTOS: Hazañas
-ModUi/&DocsFightingStyles=DOCS: Estilos de lucha
-ModUi/&DocsInfusions=DOCS: Infusiones
-ModUi/&DocsInvocations=DOCS: Invocaciones
-ModUi/&DocsManeuvers=DOCS: Maniobras
-ModUi/&DocsMetamagic=DOCUMENTOS: Metamágica
-ModUi/&DocsRaces=DOCUMENTOS: Carreras
-ModUi/&DocsSpells=DOCUMENTOS: Hechizos
-ModUi/&DocsSubclasses=DOCS: Subclases
-ModUi/&DocsSubraces=DOCS: Subrazas
+ModUi/&DocsArcaneShots=Disparos arcanos
+ModUi/&DocsBackgrounds=Antecedentes
+ModUi/&DocsFeats=Hazañas
+ModUi/&DocsFightingStyles=Estilos de lucha
+ModUi/&DocsInfusions=Infusiones
+ModUi/&DocsInvocations=Invocaciones
+ModUi/&DocsManeuvers=Maniobras
+ModUi/&DocsMetamagic=Metamágica
+ModUi/&DocsRaces=Carreras
+ModUi/&DocsSpells=Hechizos
+ModUi/&DocsSubclasses=Subclases
+ModUi/&DocsSubraces=Subrazas
+ModUi/&DocsVersatilities=Versatilidades
 ModUi/&Donate=<b><color=#D89555>Donar:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=No mostrar cascos en caracteres gráficos <b><i><color=#C04040E0>[Requiere reinicio]</color></i></b>
 ModUi/&DontEndTurnAfterReady=No finalice el turno después de usar la acción lista <i><color=#F0DAA0>[permite usar la acción adicional o cualquier acción principal adicional de Prisa u otras fuentes]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Habilita la elección de <color=#D89555>Pícaro<
 ModUi/&EnableRogueSteadyAim=Habilita <color=#D89555>Rogue</color> <b>Steady Aim</b> en el nivel de clase 3 <i><color=#F0DAA0>[la acción adicional te da ventaja en tu próxima tirada de ataque en el turno actual si aún no me he movido]</color></i>
 ModUi/&EnableRogueStrSaving=Habilite a <color=#D89555>Pícaro</color> para que use modificadores de DEX o STR en <b>Astucia/Golpe diabólico</b>, <b>Golpe debilitante/mejorado</b> y <b>Lluvia de espadas. </b>
 ModUi/&EnableSaveByLocation=Habilitar guardar por campañas/ubicaciones
+ModUi/&EnableSignatureSpellsRelearn=Habilite los hechizos característicos del <color=#D89555>Mago</color> para que se preparen cada descanso prolongado <i><color=#F0DAA0>[en lugar de una vez en el nivel 20]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Habilitar la clasificación de activos en el editor de Dungeon Maker
 ModUi/&EnableStatsOnHeroTooltip=Mostrar estadísticas en la información sobre herramientas del héroe <i><color=#F0DAA0>[es decir, golpes críticos, fallas críticas, etc.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=• Además, cada héroe agrega una tirada de D20 al peso para darle un poco de aleatoriedad.
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Feats/Group-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Feats/Group-fr.txt
index 59d21b0db6..6f2be5199a 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Feats/Group-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Feats/Group-fr.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Combat : Mêlée
 Feat/&FeatGroupOldTacticsDescription=Augmentez votre Force ou votre Dextérité de 1. Une fois par round, lorsqu'un ennemi à terre à portée de votre arme de mêlée se relève, vous pouvez lancer une attaque d'opportunité contre la cible.
 Feat/&FeatGroupOldTacticsTitle=Vieilles tactiques
-Feat/&FeatGroupOrcishAggressionDescription=Votre agressivité brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Force ou votre Constitution de 1, jusqu'à un maximum de 20.\n• En guise d'action bonus, lorsque vous maniez une arme de mêlée dans la main principale, vous pouvez charger jusqu'à votre vitesse. vers un ennemi de votre choix et attaquez librement la créature avec votre arme principale.
+Feat/&FeatGroupOrcishAggressionDescription=Votre agressivité brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Force ou votre Constitution de 1, jusqu'à un maximum de 20.\n• En guise d'action bonus, lorsque vous maniez une arme de mêlée dans la main principale, vous pouvez charger jusqu'à votre vitesse. vers un ennemi de votre choix et attaquez librement la créature avec votre arme principale. Cette fonctionnalité peut être utilisée pour les bonus de compétence par repos long.
 Feat/&FeatGroupOrcishAggressionTitle=Agression orque
 Feat/&FeatGroupOrcishFuryDescription=Votre fureur brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Force ou votre Constitution de 1, jusqu'à un maximum de 20.\n• Lorsque vous frappez avec une attaque effectuée avec une arme simple ou martiale, vous pouvez lancer l'un des jets de l'arme. dés de dégâts une fois de plus et ajoutez-les comme dégâts supplémentaires au type de dégâts de l'arme. Une fois que vous avez utilisé cette capacité, vous ne pouvez plus l'utiliser avant d'avoir terminé un repos court ou long.\n• Immédiatement après avoir utilisé votre trait Endurance implacable, vous pouvez utiliser votre réaction pour effectuer une attaque avec une arme.
 Feat/&FeatGroupOrcishFuryTitle=Fureur orque
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Feats/MeleeCombat-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Feats/MeleeCombat-fr.txt
index f700443296..baa2a7cd10 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Feats/MeleeCombat-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Feats/MeleeCombat-fr.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=Vous êtes habitué à l'art d'écraser vos enne
 Feat/&FeatCrusherConTitle=Concasseur [Con]
 Feat/&FeatCrusherStrDescription=Vous êtes habitué à l'art d'écraser vos ennemis. Augmentez votre Force de 1, jusqu'à un maximum de 20. Lorsque vous touchez une créature avec une attaque qui inflige des dégâts contondants, une fois par tour, vous poussez l'ennemi de 1,50 mètre. Lorsque vous obtenez un coup critique, les jets d'attaque contre cette créature sont effectués avec avantage jusqu'au début de votre prochain tour.
 Feat/&FeatCrusherStrTitle=Broyeur [Str]
-Feat/&FeatDefensiveDuelistDescription=Lorsque vous maniez une arme de finesse avec laquelle vous maîtrisez et qu'une autre créature vous frappe avec une attaque de mêlée, vous pouvez utiliser votre réaction pour ajouter votre bonus de maîtrise à votre CA pour cette attaque, ce qui pourrait faire en sorte que l'attaque vous manque.
+Feat/&FeatDefensiveDuelistDescription=Lorsque vous maniez une arme de mêlée que vous maîtrisez et qu'une autre créature vous frappe avec une attaque de mêlée, vous pouvez utiliser votre réaction pour ajouter votre bonus de maîtrise à votre CA pour cette attaque, ce qui pourrait faire en sorte que l'attaque vous manque.
 Feat/&FeatDefensiveDuelistTitle=Duelliste défensif
 Feat/&FeatFellHandedDescription=Vous maîtrisez la hache, la hache de combat, la grande hache, le marteau de guerre et le maul. Vous bénéficiez des avantages suivants lorsque vous utilisez l'un d'entre eux :\n• Un bonus de +1 aux jets d'attaque que vous effectuez avec l'arme.\n• Chaque fois que vous avez l'avantage sur un jet d'attaque en mêlée et que vous touchez, vous mettez la cible à terre si le plus faible des deux jets de d20 toucherait également la cible.\n• Chaque fois que vous êtes désavantagé lors d'un jet d'attaque en mêlée et que vous ratez, la cible subit des dégâts contondants égaux à votre modificateur de Force si le plus élevé des deux jets de d20 touche la cible. .
 Feat/&FeatFellHandedTitle=Tombé remis
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Feats/OtherFeats-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Feats/OtherFeats-fr.txt
index 16f93df601..a3f0a864f8 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Feats/OtherFeats-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Feats/OtherFeats-fr.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Augmentez votre Constitution de 1, jusqu'à un maxi
 Feat/&FeatChefConTitle=Chef [Avec]
 Feat/&FeatChefWisDescription=Augmentez votre Sagesse de 1, jusqu'à un maximum de 20.\nVous pouvez passer 1 heure à préparer un repas pour vous soigner, vous et vos compagnons, pour 1d8 PV.\nUne fois par jour, vous pouvez passer une heure à cuisiner un certain nombre de points. de friandises égales à votre bonus de compétence qui fournissent 5 PV temporaires lorsqu'elles sont mangées.
 Feat/&FeatChefWisTitle=Chef [Sagesse]
-Feat/&FeatCriticalVirtuosoDescription=Votre seuil critique est abaissé de 1.
 Feat/&FeatDungeonDelverDescription=Alerté aux pièges cachés et aux portes secrètes trouvés dans de nombreux donjons, vous bénéficiez des avantages suivants :\n• Vous avez un avantage aux tests de Sagesse (Perception) et d'Intelligence (Enquête).\n• Vous avez un avantage aux jets de sauvegarde effectués pour évitez ou résistez aux pièges.\n• Vous avez une résistance aux dégâts infligés par les pièges.\n• Voyager à un rythme rapide n'impose pas la pénalité normale de -5 sur votre score passif de Sagesse (Perception).
 Feat/&FeatDungeonDelverTitle=Sondeur de donjon
 Feat/&FeatEldritchAdeptDescription=Vous apprenez une option d’invocation surnaturelle de votre choix auprès de la classe de démoniste. Si l'invocation a un prérequis, vous ne pouvez choisir cette invocation que si vous êtes un démoniste et seulement si vous remplissez le prérequis. Chaque fois que vous gagnez un niveau, vous pouvez remplacer l'invocation par une autre de la classe démoniste.
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Feats/Races-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Feats/Races-fr.txt
index 2b085bb0a1..1d6d27a3ff 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Feats/Races-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Feats/Races-fr.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=Vous avez une haine profonde pour un type p
 Feat/&FeatGrudgeBearerWisTitle=Porteur de rancune [Sagesse]
 Feat/&FeatInfernalConstitutionDescription=Le sang diabolique coule en vous, libérant une résilience semblable à celle que possèdent certains démons. Vous bénéficiez des avantages suivants :\n• Augmentez votre Constitution de 1, jusqu'à un maximum de 20.\n• Vous avez une résistance aux dégâts de froid et de poison.\n• Vous avez un avantage aux jets de sauvegarde contre l'empoisonnement.
 Feat/&FeatInfernalConstitutionTitle=Constitution infernale
-Feat/&FeatOrcishAggressionConDescription=Votre agressivité brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Constitution de 1, jusqu'à un maximum de 20.\n• Par une action bonus, lorsque vous maniez une arme de mêlée dans la main principale, vous pouvez charger jusqu'à votre vitesse vers un ennemi de votre choix et attaquez librement la créature avec votre arme principale.
+Feat/&FeatOrcishAggressionConDescription=Votre agressivité brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Constitution de 1, jusqu'à un maximum de 20.\n• Par une action bonus, lorsque vous maniez une arme de mêlée dans la main principale, vous pouvez charger jusqu'à votre vitesse vers un ennemi de votre choix et attaquez librement la créature avec votre arme principale. Cette fonctionnalité peut être utilisée pour les bonus de compétence par repos long.
 Feat/&FeatOrcishAggressionConTitle=Agression orque [Con]
-Feat/&FeatOrcishAggressionDescription=Votre agressivité brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Force de 1, jusqu'à un maximum de 20.\n• Comme une action bonus, lorsque vous maniez une arme de mêlée dans la main principale, vous pouvez charger jusqu'à votre vitesse vers un ennemi de votre choix et attaquez librement la créature avec votre arme principale.
+Feat/&FeatOrcishAggressionDescription=Votre agressivité brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Force de 1, jusqu'à un maximum de 20.\n• Comme une action bonus, lorsque vous maniez une arme de mêlée dans la main principale, vous pouvez charger jusqu'à votre vitesse vers un ennemi de votre choix et attaquez librement la créature avec votre arme principale. Cette fonctionnalité peut être utilisée pour les bonus de compétence par repos long.
 Feat/&FeatOrcishAggressionTitle=Agression orque [Str]
 Feat/&FeatOrcishFuryConDescription=Votre fureur brûle inlassablement. Vous bénéficiez des avantages suivants :\n• Augmentez votre Constitution de 1, jusqu'à un maximum de 20.\n• Lorsque vous frappez avec une attaque effectuée avec une arme simple ou martiale, vous pouvez lancer l'un des dés de dégâts de l'arme. une fois supplémentaire et ajoutez-le comme dégâts supplémentaires au type de dégâts de l'arme. Une fois que vous avez utilisé cette capacité, vous ne pouvez plus l'utiliser avant d'avoir terminé un repos court ou long.\n• Immédiatement après avoir utilisé votre trait Endurance implacable, vous pouvez utiliser votre réaction pour effectuer une attaque avec une arme.
 Feat/&FeatOrcishFuryConTitle=Fureur orque [Con]
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Feats/RangedCombat-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Feats/RangedCombat-fr.txt
index 8faf502dbb..9c61f43092 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Feats/RangedCombat-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Feats/RangedCombat-fr.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=Vous avez l'avantage lors
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Objectif constant
 Condition/&ConditionFeatSteadyAimRestrainedDescription=Vous ne pouvez pas vous déplacer jusqu'à la fin de votre tour.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Retenu par une visée constante
-Feat/&FeatBowMasteryDescription=Votre entraînement expert avec les arcs vous accorde les avantages suivants :\n• Vous bénéficiez d'un bonus de +1 aux jets de dégâts que vous effectuez avec l'arc court et l'arc long.\n• Lorsque vous utilisez l'action Attaque avec un arc court à votre tour, vous pouvez faire une attaque avec une arme à distance comme action bonus, ajoutant votre modificateur d'attribut aux dégâts.\n• Vous pouvez utiliser la Force au lieu de la Dextérité lors des jets d'attaque et de dégâts que vous effectuez avec un arc long.
+Feat/&FeatBowMasteryDescription=Lorsque vous utilisez l'action Attaque avec un arc pendant votre tour, vous pouvez effectuer une attaque avec une arme à distance en tant qu'action bonus, en ajoutant votre modificateur d'attribut aux dégâts.
 Feat/&FeatBowMasteryTitle=Maîtrise de l'arc
-Feat/&FeatCrossbowMasteryDescription=Votre entraînement expert avec les arbalètes vous accorde les avantages suivants :\n• Vous bénéficiez d'un bonus de +1 aux jets de dégâts que vous effectuez avec des arbalètes lourdes, légères et à main.\n• Lorsque vous utilisez l'action Attaque avec une arbalète légère ou à main. À votre tour, vous pouvez effectuer une attaque avec une arme à distance en tant qu'action bonus, en ajoutant votre modificateur d'attribut aux dégâts.\n• Vous pouvez utiliser la Force au lieu de la Dextérité lors des jets d'attaque et de dégâts que vous effectuez avec une arbalète lourde.
+Feat/&FeatCrossbowMasteryDescription=Lorsque vous utilisez l'action Attaque avec une arbalète à votre tour, vous pouvez effectuer une attaque avec une arme à distance en tant qu'action bonus, en ajoutant votre modificateur d'attribut aux dégâts.
 Feat/&FeatCrossbowMasteryTitle=Maîtrise de l'arbalète
 Feat/&FeatDeadeyeDescription=Vous avez appris à troquer la précision pour tirer des tirs plus meurtriers :\n• Lorsque vous attaquez avec une arme à distance, vous pouvez choisir de subir une pénalité de -5 à votre jet d'attaque afin d'infliger +10 dégâts supplémentaires.\n• Attaques à la longue portée n'impose pas de désavantage et l'attaque avec une arme à distance ignore la moitié et les trois quarts de la couverture.
 Feat/&FeatDeadeyeTitle=Tireur d'élite
diff --git a/SolastaUnfinishedBusiness/Translations/fr/FightingStyles-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/FightingStyles-fr.txt
index 7b7b8f26cc..5fe9f93c97 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/FightingStyles-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/FightingStyles-fr.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=Des dégâts paralysants !
 Feedback/&AdditionalDamageCripplingLine={1} subit des dégâts paralysants.
 Feedback/&AdditionalDamageExecutionerFormat=Exécution!
 Feedback/&AdditionalDamageExecutionerLine={0} exécute {1} pour +{2} dégâts supplémentaires !
+FightingStyle/&AstralReachDescription=La portée de votre frappe à mains nues augmente de 1,50 m.
+FightingStyle/&AstralReachTitle=Portée astrale
 FightingStyle/&BlindFightingDescription=Vous avez une vue aveugle avec une portée de 10 pieds. Dans cette portée, vous pouvez effectivement voir tout ce qui ne se trouve pas derrière une couverture totale, même si vous êtes aveuglé ou dans l'obscurité. De plus, vous pouvez voir une créature invisible dans cette portée, à moins que la créature ne réussisse à se cacher de vous.
 FightingStyle/&BlindFightingTitle=Combat aveugle
-FightingStyle/&CripplingDescription=En frappant avec une attaque de mêlée, vous pouvez réduire la vitesse de vos adversaires de 10 pieds et réduire leur classe d'armure de 1 jusqu'à la fin de votre prochain tour.
+FightingStyle/&CripplingDescription=Vous réduisez la vitesse de vos adversaires de 10 pieds jusqu'à la fin de votre prochain tour sur une attaque de mêlée.
 FightingStyle/&CripplingTitle=Paralysant
 FightingStyle/&ExecutionerDescription=Vous ajoutez votre bonus de maîtrise aux dégâts infligés aux créatures aveuglées, effrayées, maîtrisées, incapables, paralysées, à terre ou étourdies.
 FightingStyle/&ExecutionerTitle=Bourreau
-FightingStyle/&HandAndAHalfDescription=Lorsque vous maniez une arme de mêlée à une main ou polyvalente et aucune autre arme ou bouclier, vous gagnez un bonus de +1 à vos jets d'attaque avec l'arme et un +1 à votre classe d'armure.
+FightingStyle/&HandAndAHalfDescription=Vous gagnez un bonus de +1 à vos jets d'attaque et un bonus de +1 à votre classe d'armure lorsque vous maniez une arme de mêlée à une main ou polyvalente et aucune autre arme ou bouclier.
 FightingStyle/&HandAndAHalfTitle=Jeu d'épée classique
 FightingStyle/&InterceptionDescription=Lorsqu'une créature que vous pouvez voir touche une cible autre que vous, à moins de 1,50 mètre de vous avec une attaque, vous pouvez utiliser votre réaction pour réduire les dégâts subis par la cible de 1d10 + votre bonus de maîtrise. Vous devez manier un bouclier ou une arme simple ou martiale pour utiliser cette réaction.
 FightingStyle/&InterceptionTitle=Interception
-FightingStyle/&LungerDescription=En utilisant une seule arme de mêlée sans l'étiquette lourde et sans main libre, la portée de cette arme augmente de 1,50 m.
+FightingStyle/&LungerDescription=La portée de votre arme de mêlée augmente de 1,50 m lorsque vous utilisez une arme sans étiquette lourde et sans autre arme ou bouclier.
 FightingStyle/&LungerTitle=Poumons
 FightingStyle/&MercilessDescription=Lorsque vous réduisez une cible à 0 PV en utilisant une attaque au corps à corps pendant votre tour, les ennemis dans un rayon de la cible abattue égal à la moitié de votre bonus de maîtrise (arrondi au supérieur) et qui peuvent voir la cible doivent effectuer un jet de Sagesse (DD 8 + votre bonus de maîtrise + votre modificateur de Force) ou ayez peur de vous jusqu'à la fin de votre prochain tour. Si l'attaque déclenchante est un coup critique, le rayon est alors égal à votre bonus de maîtrise.
 FightingStyle/&MercilessTitle=Sans merci
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=Vous gagnez la maîtrise du Bouclier,
 FightingStyle/&MonkShieldExpertTitle=Formation au Bouclier Monastique
 FightingStyle/&PolearmExpertDescription=Votre entraînement expert avec une arme d'hast vous accorde les avantages suivants :\n• Lorsque vous effectuez l'action d'attaque et attaquez avec uniquement une arme d'hast, vous pouvez utiliser une action bonus pour effectuer une attaque au corps à corps avec l'extrémité opposée de l'arme. Cette attaque utilise le même modificateur de capacité que l'attaque principale et inflige 1d4 dégâts contondants.\n• D'autres créatures provoquent une attaque d'opportunité de votre part lorsqu'elles entrent dans la portée que vous avez en brandissant une arme d'hast.
 FightingStyle/&PolearmExpertTitle=Maître d'arme d'hast
-FightingStyle/&PugilistDescription=Vos frappes à mains nues infligent 1d4 dégâts contondants supplémentaires et vous pouvez frapper avec votre main secondaire en tant qu'action bonus. Vous pouvez pousser comme une action bonus si vous avez les mains libres.
+FightingStyle/&PugilistDescription=Vos frappes à mains nues infligent 1d4 dégâts contondants supplémentaires et vous pouvez frapper avec votre main secondaire en tant qu'action bonus. Vous pouvez pousser comme une action bonus si vous n'avez pas d'autre arme ou bouclier.
 FightingStyle/&PugilistTitle=Pugiliste
 FightingStyle/&RemarkableTechniqueDescription=Vous disposez d'un entraînement martial qui vous permet d'exécuter des techniques de combat spéciales appelées manœuvres :\n• Vous apprenez une manœuvre de votre choix dans la sous-classe Battle Master. Le DD de manœuvre de ces manœuvres est de 8 + bonus de maîtrise + modificateur de Force ou de Dextérité, selon la valeur la plus élevée.\n• Vous gagnez 1 dé de supériorité. Le dé est un d6 et sa taille n'augmente pas si vous n'êtes pas un Battle Master. Ce dé sert à alimenter vos manœuvres. Il est dépensé lorsque vous l'utilisez et est récupéré lorsque vous terminez un repos court ou long.
 FightingStyle/&RemarkableTechniqueTitle=Technique supérieure
-FightingStyle/&RopeItUpDescription=Vos frappes lancées obtiennent +1 aux jets d'attaque et de dégâts, vous augmentez sa portée longue et courte de 10 pieds, et elle revient dans votre main immédiatement après avoir été utilisée pour effectuer une attaque lancée.
-FightingStyle/&RopeItUpTitle=Enfilez-le
+FightingStyle/&RopeItUpDescription=Lorsque vous effectuez une attaque à distance avec une arme de jet, augmentez sa courte portée de 10 pieds et sa longue portée de 20 pieds. De plus, l'arme revient dans votre main immédiatement après avoir été utilisée pour effectuer une attaque lancée.
+FightingStyle/&RopeItUpTitle=Maître des armes lancées
 FightingStyle/&SentinelDescription=Vous maîtrisez les techniques pour tirer parti de chaque baisse de garde d'un ennemi :\n• Lorsque vous touchez une créature avec une attaque d'opportunité, la vitesse de la créature devient 0 pour le reste du tour.\n• Les créatures provoquent des attaques d'opportunité de vous même s'ils effectuent l'action Désengagement avant de quitter votre portée.\n• Vous pouvez utiliser votre réaction pour effectuer une attaque de mêlée avec une arme contre la créature attaquante lorsqu'une créature effectue une attaque contre une cible autre que vous.
 FightingStyle/&SentinelTitle=Sentinelle
-FightingStyle/&ShieldExpertDescription=Vous vous êtes entraîné à l'utilisation d'un bouclier comme arme. Cela devient une arme de mêlée que vous maîtrisez et qui inflige 1d4 dégâts contondants. Vous gagnez un avantage lors des tentatives de poussée tout en brandissant un bouclier.
-FightingStyle/&ShieldExpertTitle=Expert en bouclier
-FightingStyle/&TorchbearerDescription=Vous maîtrisez parfaitement l'utilisation d'une torche au combat. Une fois par tour, en guise d'action bonus, vous pouvez choisir d'utiliser une source de lumière que vous avez équipée pour tenter de mettre le feu à un ennemi que vous pouvez toucher. Votre cible doit réussir un jet de sauvegarde de Dextérité (DD 8 + votre bonus de maîtrise + votre modificateur de Dextérité) ou subir 1d4 dégâts de feu par tour pendant 1 minute ou jusqu'à son extinction.
+FightingStyle/&ShieldExpertDescription=Vous pouvez utiliser votre action bonus pour frapper une créature à l'aide de votre bouclier, la transformant momentanément en une arme improvisée spéciale que vous maîtrisez. Effectuez une attaque au corps à corps avec une arme contre une créature à moins de 1,50 mètre de vous en utilisant votre modificateur de Force pour l'attaque. Si vous touchez, la créature subit 1d4 + modificateur de Force sous forme de dégâts contondants.
+FightingStyle/&ShieldExpertTitle=Frappe de bouclier
+FightingStyle/&TorchbearerDescription=En guise d'action bonus, vous pouvez choisir d'utiliser une source de lumière que vous avez équipée pour tenter de mettre le feu à un ennemi que vous pouvez toucher. Votre cible doit réussir un jet de sauvegarde de Dextérité (DD 8 + votre bonus de maîtrise + votre modificateur de Dextérité) ou subir 1d4 dégâts de feu par tour pendant 1 minute ou jusqu'à son extinction.
 FightingStyle/&TorchbearerTitle=Porteur du flambeau
 FightingStyle/&ZenArcherDescription=Votre intuition guide votre main lorsque vous utilisez un arc. Augmentez votre attribut de Sagesse de 1, jusqu'à un maximum de 20. Vous pouvez utiliser votre modificateur de Sagesse à la place de votre modificateur de Dextérité pour les jets d'attaque et de dégâts avec ces armes.
 FightingStyle/&ZenArcherTitle=Tir à l'arc sage
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Level20-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Level20-fr.txt
index 2893152cb5..473070cfa5 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Level20-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Level20-fr.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=À partir du niveau 17
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Pureté de la lumière
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=À partir du niveau 17, vous acquérez la capacité de créer des vibrations mortelles dans le corps de quelqu'un. Lorsque vous frappez une créature avec une frappe à mains nues, vous pouvez dépenser 3 points Ki pour déclencher ces vibrations imperceptibles, qui durent 24 heures. Les vibrations sont inoffensives à moins que vous n'utilisiez votre action pour y mettre fin. Lorsque vous utilisez cette action, la créature doit effectuer un jet de sauvegarde de Constitution. S'il échoue, il est réduit à 1 point de vie et devient étourdi jusqu'au début de son prochain tour. S'il réussit, il subit 10d10 dégâts nécrotiques.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Paume frémissante
+Feature/&FeatureWizardSpellMasteryDescription=Vous maîtrisez tellement certains sorts que vous pouvez les lancer à volonté. Choisissez deux sorts de sorcier de niveau 1 ou 2 qui se trouvent dans votre livre de sorts. Vous pouvez lancer ces sorts à leur niveau le plus bas sans dépenser un emplacement de sort lorsque vous les avez préparés. Si vous souhaitez lancer l'un ou l'autre sort à un niveau supérieur, vous devez dépenser un emplacement de sort comme d'habitude.
+Feature/&FeatureWizardSpellMasteryTitle=Maîtrise des sorts
 Feature/&GrantInvocationsSpellMasteryDescription=Vous maîtrisez tellement certains sorts que vous pouvez les lancer à volonté. Les deux premiers sorts de sorcier de niveau 1 et 2 que vous préparez peuvent être lancés à leur niveau le plus bas sans dépenser d'emplacement de sort. Si vous souhaitez lancer l'un ou l'autre sort à un niveau supérieur, vous devez dépenser un emplacement de sort comme d'habitude.
 Feature/&GrantInvocationsSpellMasteryTitle=Maîtrise des sorts
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Sélectionnez un sort de signature à apprendre.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Sorts de signature
 Feature/&InvocationPoolWizardSignatureSpellsDescription=Vous maîtrisez deux sorts puissants et pouvez les lancer avec peu d’effort. Choisissez deux sorts de sorcier de 3ème niveau comme sorts de signature. Vous avez toujours ces sorts préparés, ils ne comptent pas dans le nombre de sorts que vous avez préparés, et vous pouvez lancer chacun d'eux une fois au niveau 3 sans dépenser d'emplacement de sort. Lorsque vous le faites, vous ne pouvez plus le faire avant d'avoir terminé un repos court ou long.
 Feature/&InvocationPoolWizardSignatureSpellsTitle=Sorts de signature
 Feature/&MagicAffinityArchDruidDescription=Vous pouvez utiliser votre Wildshape un nombre illimité de fois. De plus, vous pouvez ignorer les composantes verbales et somatiques de vos sorts de druide, ainsi que toutes les composantes matérielles qui n'ont pas de coût et ne sont pas consommées par un sort. Vous bénéficiez de cet avantage à la fois dans votre forme normale et dans votre forme de bête grâce à Wildshape.
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=À partir du niveau
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Perfection physique
 Feature/&PowerWarlockEldritchMasterDescription=Vous pouvez puiser dans votre réserve intérieure de pouvoir mystique tout en suppliant votre patron de récupérer les emplacements de sorts dépensés. Vous pouvez passer 1 minute à demander de l'aide à votre patron pour récupérer tous vos emplacements de sorts dépensés grâce à votre fonction Pact Magic. Une fois que vous avez récupéré des emplacements de sorts avec cette fonctionnalité, vous devez terminer un long repos avant de pouvoir le faire à nouveau.
 Feature/&PowerWarlockEldritchMasterTitle=Maître surnaturel
+Feature/&PowerWizardSignatureSpellsDescription=Vous maîtrisez deux sorts puissants et pouvez les lancer avec peu d’effort. Choisissez deux sorts de sorcier de niveau 3 dans votre livre de sorts comme sorts de signature. Vous avez toujours ces sorts préparés, ils ne comptent pas dans le nombre de sorts que vous avez préparés, et vous pouvez lancer chacun d'eux une fois au niveau 3 sans dépenser d'emplacement de sort. Lorsque vous le faites, vous ne pouvez plus le faire avant d'avoir terminé un repos court ou long.
+Feature/&PowerWizardSignatureSpellsTitle=Sorts de signature
 Feature/&SenseRangerFeralSensesDescription=Vous acquérez des sens surnaturels qui vous aident à combattre des créatures que vous ne pouvez pas voir. Lorsque vous attaquez une créature que vous ne pouvez pas voir, votre incapacité à la voir n'impose pas de désavantage à vos jets d'attaque contre elle.
 Feature/&SenseRangerFeralSensesTitle=Sens sauvages
 Feedback/&AdditionalDamageBrutalAssaultFormat=Agression brutale!
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=Vous pouvez payer 1 Ki pour restaurer
 Reaction/&UsePhysicalPerfectionReactDescription=Vous pouvez payer 1 Ki pour restaurer 1 point de vie.
 Reaction/&UsePhysicalPerfectionReactTitle=Guérir
 Reaction/&UsePhysicalPerfectionTitle=Perfection physique
+RestActivity/&RestActivitySignatureSpellsDescription=Vous pouvez sélectionner vos sorts de signature une fois.
+RestActivity/&RestActivitySignatureSpellsTitle=Sorts de signature
+RestActivity/&RestActivitySpellMasteryDescription=Vous pouvez modifier votre liste de sorts de maîtrise lorsque vous terminez un repos long.
+RestActivity/&RestActivitySpellMasteryTitle=Maîtrise des sorts
 Rules/&DamagePureDescription=Des vibrations imperceptibles qui désintègrent la victime de l’intérieur.
 Rules/&DamagePureTitle=Pur
+Screen/&SignatureSpellsExtraSpellDescription=Ce sort Signature est toujours préparé et, une fois par repos long, il ne consomme pas d'emplacement de sort lorsqu'il est lancé au niveau.
+Screen/&SignatureSpellsExtraSpellTitle=Sorts de signature
+Screen/&SpellMasteryExtraSpellDescription=Ce sort de Maîtrise est toujours préparé et ne consomme pas d'emplacement de sort lorsqu'il est lancé au niveau.
+Screen/&SpellMasteryExtraSpellTitle=Maîtrise des sorts
 Tooltip/&MustHaveQuiveringPalmCondition=N'est pas marqué par Quivering Palm
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Others-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Others-fr.txt
index 7a0a292dc8..f42ec2373b 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Others-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Others-fr.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Activer/désactiver Brutal Strike
 Action/&BrutalStrikeToggleTitle=Frappe brutale
 Action/&CastPlaneMagicDescription=Lancez l'un des sorts que vous avez obtenus grâce aux exploits Plane Touched
 Action/&CastPlaneMagicTitle=Magie du plan de canal
-Action/&CastSignatureSpellsDescription=Lancez ces sorts de 3ème niveau sans dépenser d'emplacement
-Action/&CastSignatureSpellsTitle=Sorts de signature
-Action/&CastSpellMasteryDescription=Lancez vos sorts préparés de niveau 1er ou 2ème sans dépenser d'emplacement
-Action/&CastSpellMasteryTitle=Maîtrise des sorts
 Action/&CoordinatedAssaultToggleDescription=Activer/désactiver l'assaut coordonné
 Action/&CoordinatedAssaultToggleTitle=Assaut coordonné
 Action/&CunningStrikeToggleDescription=Activer/désactiver Frappe rusée
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Pouvoir
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Compétence
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Ennemi préféré
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Affinité du type de terrain
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Sort de signature
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Ascendance draconique sorcière
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Entraînement aux armes
 UI/&ForcePreferredCantripDescription=Si cette option est activée, seul le cantrip préféré peut se déclencher. Si le cantrip préféré n'est pas sélectionné, alors le premier cantrip valide se déclenchera, quelle que soit cette bascule.
diff --git a/SolastaUnfinishedBusiness/Translations/fr/Settings-fr.txt b/SolastaUnfinishedBusiness/Translations/fr/Settings-fr.txt
index 9b0f586517..5aea65b91d 100644
--- a/SolastaUnfinishedBusiness/Translations/fr/Settings-fr.txt
+++ b/SolastaUnfinishedBusiness/Translations/fr/Settings-fr.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Autoriser le lancement de sorts avec l'action suppléme
 ModUi/&AllowHornsOnAllRaces=Autoriser les cornes sur toutes les Ascendances <i><color=#F0DAA0>[les résultats peuvent être décevant selon la race, la tête et le type de cornes]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Autoriser l'affichage de plus d'informations sur l'état réel du groupe dans la fenêtre de repos <i><color=#F0DAA0>[Est masqué sur la fenêtre d'invite après les repos, et sur la fenêtre de validation après les compétences de récupération]</color></i>
 ModUi/&AllowStackedMaterialComponent=Autoriser l'empilement des composantes matérielles dans l'inventaire <i><color=#F0DAA0>[par ex. 2 x 500 po de diamant équivaut à 1 000 po de diamant]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Autoriser la sélection des cibles lors du lancement du sort <color=#D89555>Chaîne d'éclairs</color>
 ModUi/&AllowUnmarkedSorcerers=Autoriser les <color=#D89555>Ensorceleurs</color> sans marques ni tatouages d'origine
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=La touche <color=#1E81B0>ALT</color> ne met en évidence que les gadgets dans le champ de vision du groupe <i><color=#F0DAA0>[donjons personnalisés uniquement]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Autoriser <color=#D89555>Arcane Shieldstaff</color> à être harmonisé par n'importe quelle classe
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Désactiver <color=#D89555>Vis
 ModUi/&DisableUnofficialTranslations=Désactiver la prise en charge des traductions non officielles pour accélérer le mod <i><color=#F0DAA0>[sauf si je parle chinois, italien, japonais, coréen ou espagnol]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Afficher tous les sorts connus des autres classes lors de la montée de niveau</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Afficher les emplacements de pacte de l'<color=#D89555>Occultiste</color> sur la sélection de sorts plutôt que sur l'écran de personnage</i>
-ModUi/&DocsArcaneShots=DOCS : Tirs arcaniques
-ModUi/&DocsBackgrounds=DOCS : arrière-plans
-ModUi/&DocsFeats=DOCS : exploits
-ModUi/&DocsFightingStyles=DOCS : Styles de combat
-ModUi/&DocsInfusions=DOCS : Infusions
-ModUi/&DocsInvocations=DOCS : Invocations
-ModUi/&DocsManeuvers=DOCS : Manœuvres
-ModUi/&DocsMetamagic=DOCS : Métamagie
-ModUi/&DocsRaces=DOCS : Courses
-ModUi/&DocsSpells=DOCS : Sorts
-ModUi/&DocsSubclasses=DOCS : sous-classes
-ModUi/&DocsSubraces=DOCS : sous-races
+ModUi/&DocsArcaneShots=Tirs arcaniques
+ModUi/&DocsBackgrounds=Arrière-plans
+ModUi/&DocsFeats=Exploits
+ModUi/&DocsFightingStyles=Styles de combat
+ModUi/&DocsInfusions=Infusions
+ModUi/&DocsInvocations=Invocations
+ModUi/&DocsManeuvers=Manœuvres
+ModUi/&DocsMetamagic=Métamagie
+ModUi/&DocsRaces=Courses
+ModUi/&DocsSpells=Sorts
+ModUi/&DocsSubclasses=Sous-classes
+ModUi/&DocsSubraces=Sous-races
+ModUi/&DocsVersatilities=Polyvalences
 ModUi/&Donate=<b><color=#D89555>Faire un don :</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=Ne pas afficher les casques sur les vignettes de personnages<b><i><color=#C04040E0>[Nécessite un redémarrage]</color></i></b>
 ModUi/&DontEndTurnAfterReady=Ne terminez pas le tour après avoir sélectionné une action préparée <i><color=#F0DAA0>[permet d'utiliser l'action bonus ou toute action principale supplémentaire liée à Hâte ou d'autres sources]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Activer le choix de <b>Style de combat</b> du <c
 ModUi/&EnableRogueSteadyAim=Activez la <b>Visée Stable</b> du <color=#D89555>Roublard</color> au niveau de classe 3 <i><color=#F0DAA0>[l'action bonus donne un avantage lors de votre prochain jet d'attaque dans le tour en cours si vous n'avez pas encore bougé]</color></i>
 ModUi/&EnableRogueStrSaving=Activez <color=#D89555>Rogue</color> pour utiliser les modificateurs DEX ou STR sur <b>Frappe rusée/diable</b>, <b>Frappe débilitante/améliorée</b> et <b>Grêle de lames. </b>
 ModUi/&EnableSaveByLocation=Autoriser l'enregistrement par campagnes / localités
+ModUi/&EnableSignatureSpellsRelearn=Activer la préparation des sorts de signature de <color=#D89555>Assistant</color> à chaque repos long <i><color=#F0DAA0>[au lieu d'une fois au niveau 20]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Activer le tri des ressources sur l'éditeur Dungeon Maker
 ModUi/&EnableStatsOnHeroTooltip=Afficher les statistiques sur l'info-bulle du héros <i><color=#F0DAA0>[c'est-à-dire : coups critiques, échecs critiques, etc.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=• De plus, chaque héros ajoute un jet de D20 au poids de leur vote pour rajouter un peu d'aléatoire.
diff --git a/SolastaUnfinishedBusiness/Translations/it/Feats/Group-it.txt b/SolastaUnfinishedBusiness/Translations/it/Feats/Group-it.txt
index e931af1d49..215f4c8d08 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Feats/Group-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Feats/Group-it.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Combattimento: corpo a corpo
 Feat/&FeatGroupOldTacticsDescription=Aumenta la tua Forza o Destrezza di 1. Una volta per round, quando un nemico prono nel raggio della tua arma da mischia si alza, puoi effettuare un attacco di opportunità contro il bersaglio.
 Feat/&FeatGroupOldTacticsTitle=Vecchie tattiche
-Feat/&FeatGroupOrcishAggressionDescription=La tua aggressività brucia instancabilmente. Ottieni i seguenti vantaggi:\n• Aumenta la tua Forza o Costituzione di 1, fino a un massimo di 20.\n• Come azione bonus, quando impugni un'arma da mischia nella mano principale, puoi caricare alla tua velocità verso un nemico a tua scelta e attacca gratuitamente la creatura con la tua arma principale.
+Feat/&FeatGroupOrcishAggressionDescription=La tua aggressività brucia instancabilmente. Ottieni i seguenti vantaggi:\n• Aumenta la tua Forza o Costituzione di 1, fino a un massimo di 20.\n• Come azione bonus, quando impugni un'arma da mischia nella mano principale, puoi caricare alla tua velocità verso un nemico a tua scelta e attacca gratuitamente la creatura con la tua arma principale. Questa caratteristica può essere utilizzata per tempi bonus di competenza per riposo lungo.
 Feat/&FeatGroupOrcishAggressionTitle=Aggressione degli Orchi
 Feat/&FeatGroupOrcishFuryDescription=La tua furia brucia instancabile. Ottieni i seguenti vantaggi:\n• Aumenta la tua Forza o Costituzione di 1, fino a un massimo di 20.\n• Quando colpisci con un attacco effettuato con un'arma semplice o marziale, puoi tirare uno dei risultati dell'arma dadi di danno una volta aggiuntiva e aggiungilo come danno extra al tipo di danno dell'arma. Una volta utilizzata questa abilità, non puoi usarla di nuovo finché non finisci un riposo breve o lungo.\n• Immediatamente dopo aver utilizzato il tuo tratto Resistenza Implacabile, puoi usare la tua reazione per effettuare un attacco con l'arma.
 Feat/&FeatGroupOrcishFuryTitle=Furia degli Orchi
diff --git a/SolastaUnfinishedBusiness/Translations/it/Feats/MeleeCombat-it.txt b/SolastaUnfinishedBusiness/Translations/it/Feats/MeleeCombat-it.txt
index e8a47f33fe..9c08d5f79c 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Feats/MeleeCombat-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Feats/MeleeCombat-it.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=Sei esperto nell'arte di schiacciare i tuoi nemi
 Feat/&FeatCrusherConTitle=Frantumatore [Contro]
 Feat/&FeatCrusherStrDescription=Sei esperto nell'arte di schiacciare i tuoi nemici. Aumenta la tua Forza di 1, fino a un massimo di 20. Quando colpisci una creatura con un attacco che infligge danni contundenti, una volta per turno spingi il nemico di 5 piedi. Quando ottieni un colpo critico, i tiri per colpire contro quella creatura vengono effettuati con vantaggio fino all'inizio del tuo turno successivo.
 Feat/&FeatCrusherStrTitle=Frantoio [Str]
-Feat/&FeatDefensiveDuelistDescription=Quando impugni un'arma di precisione nella quale sei competente e un'altra creatura ti colpisce con un attacco in mischia, puoi usare la tua reazione per aggiungere il tuo bonus di competenza alla tua CA per quell'attacco, facendo potenzialmente sì che l'attacco ti manchi.
+Feat/&FeatDefensiveDuelistDescription=Quando impugni un'arma da mischia nella quale sei competente e un'altra creatura ti colpisce con un attacco in mischia, puoi usare la tua reazione per aggiungere il tuo bonus di competenza alla tua CA per quell'attacco, facendo potenzialmente sì che l'attacco ti manchi.
 Feat/&FeatDefensiveDuelistTitle=Duellante difensivo
 Feat/&FeatFellHandedDescription=Padroneggia l'ascia, l'ascia da battaglia, l'ascia grande, il martello da guerra e la mazza. Ottieni i seguenti vantaggi quando ne usi uno qualsiasi:\n• Bonus +1 ai tiri per colpire effettuati con l'arma.\n• Ogni volta che hai vantaggio su un tiro per colpire in mischia e colpisci, butti a terra il bersaglio se anche il più basso dei due tiri d20 colpirebbe il bersaglio.\n• Ogni volta che hai svantaggio in un tiro per colpire in mischia e fallisci, il bersaglio subisce un danno contundente pari al tuo modificatore di Forza se il più alto dei due tiri d20 colpirebbe il bersaglio .
 Feat/&FeatFellHandedTitle=Caduto le mani
diff --git a/SolastaUnfinishedBusiness/Translations/it/Feats/OtherFeats-it.txt b/SolastaUnfinishedBusiness/Translations/it/Feats/OtherFeats-it.txt
index 3046b96a4b..e8d4503232 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Feats/OtherFeats-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Feats/OtherFeats-it.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Aumenta la tua Costituzione di 1, fino a un massimo
 Feat/&FeatChefConTitle=Cuoco [Con]
 Feat/&FeatChefWisDescription=Aumenta la tua Saggezza di 1, fino a un massimo di 20.\nPuoi trascorrere 1 ora per cucinare un pasto per curare te e i tuoi compagni per 1d8 HP.\nUna volta al giorno, puoi trascorrere un'ora per cucinare un numero di dolcetti pari al tuo bonus di competenza che forniscono 5 HP temporanei quando vengono mangiati.
 Feat/&FeatChefWisTitle=Chef [Saggio]
-Feat/&FeatCriticalVirtuosoDescription=La tua soglia critica viene abbassata di 1.
 Feat/&FeatDungeonDelverDescription=Attento alle trappole nascoste e alle porte segrete che si trovano in molti dungeon, ottieni i seguenti vantaggi:\n• Hai vantaggio alle prove di Saggezza (Percezione) e Intelligenza (Indagare).\n• Hai vantaggio ai tiri salvezza effettuati per evitare o resistere alle trappole.\n• Hai resistenza ai danni inflitti dalle trappole.\n• Viaggiare a un ritmo veloce non impone la normale penalità di -5 al tuo punteggio passivo di Saggezza (Percezione).
 Feat/&FeatDungeonDelverTitle=Esploratore di dungeon
 Feat/&FeatEldritchAdeptDescription=Apprendi un'opzione di Invocazione Spettrale a tua scelta dalla classe dello stregone. Se l'invocazione ha un prerequisito, puoi sceglierla solo se sei uno stregone e solo se soddisfi il prerequisito. Ogni volta che sali di livello, puoi sostituire l'invocazione con un'altra della classe dello stregone.
diff --git a/SolastaUnfinishedBusiness/Translations/it/Feats/Races-it.txt b/SolastaUnfinishedBusiness/Translations/it/Feats/Races-it.txt
index 34ec0cf7f3..72aa3bcc63 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Feats/Races-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Feats/Races-it.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=Hai un profondo odio per un particolare tip
 Feat/&FeatGrudgeBearerWisTitle=Portatore di Rancore [Sag]
 Feat/&FeatInfernalConstitutionDescription=Il sangue immondo scorre forte dentro di te, sbloccando una resistenza simile a quella posseduta da alcuni immondi. Ottieni i seguenti benefici:\n• Aumenta la tua Costituzione di 1, fino a un massimo di 20.\n• Hai resistenza ai danni da freddo e veleno.\n• Hai vantaggio ai tiri salvezza contro l'avvelenamento.
 Feat/&FeatInfernalConstitutionTitle=Costituzione Infernale
-Feat/&FeatOrcishAggressionConDescription=La tua aggressività brucia instancabilmente. Ottieni i seguenti vantaggi:\n• Aumenta la tua Costituzione di 1, fino a un massimo di 20.\n• Come azione bonus, quando impugni un'arma da mischia nella mano principale, puoi caricare alla tua velocità verso un nemico di tua scelta e attacca gratuitamente la creatura con la tua arma principale.
+Feat/&FeatOrcishAggressionConDescription=La tua aggressività brucia instancabilmente. Ottieni i seguenti vantaggi:\n• Aumenta la tua Costituzione di 1, fino a un massimo di 20.\n• Come azione bonus, quando impugni un'arma da mischia nella mano principale, puoi caricare alla tua velocità verso un nemico di tua scelta e attacca gratuitamente la creatura con la tua arma principale. Questa caratteristica può essere utilizzata per tempi bonus di competenza per riposo lungo.
 Feat/&FeatOrcishAggressionConTitle=Aggressione degli Orchi [Contro]
-Feat/&FeatOrcishAggressionDescription=La tua aggressività brucia instancabilmente. Ottieni i seguenti vantaggi:\n• Aumenta la tua Forza di 1, fino a un massimo di 20.\n• Come azione bonus, quando impugni un'arma da mischia nella mano principale, puoi caricare alla tua velocità verso un nemico di tua scelta e attacca gratuitamente la creatura con la tua arma principale.
+Feat/&FeatOrcishAggressionDescription=La tua aggressività brucia instancabilmente. Ottieni i seguenti vantaggi:\n• Aumenta la tua Forza di 1, fino a un massimo di 20.\n• Come azione bonus, quando impugni un'arma da mischia nella mano principale, puoi caricare alla tua velocità verso un nemico di tua scelta e attacca gratuitamente la creatura con la tua arma principale. Questa caratteristica può essere utilizzata per tempi bonus di competenza per riposo lungo.
 Feat/&FeatOrcishAggressionTitle=Aggressione degli Orchi [Str]
 Feat/&FeatOrcishFuryConDescription=La tua furia brucia instancabile. Ottieni i seguenti vantaggi:\n• Aumenta la tua Costituzione di 1, fino a un massimo di 20.\n• Quando colpisci con un attacco effettuato con un'arma semplice o marziale, puoi lanciare uno dei dadi di danno dell'arma un'altra volta e aggiungerlo come danno extra al tipo di danno dell'arma. Una volta utilizzata questa abilità, non puoi usarla di nuovo finché non finisci un riposo breve o lungo.\n• Immediatamente dopo aver utilizzato il tuo tratto Resistenza Implacabile, puoi usare la tua reazione per effettuare un attacco con l'arma.
 Feat/&FeatOrcishFuryConTitle=Furia degli Orchi [Contro]
diff --git a/SolastaUnfinishedBusiness/Translations/it/Feats/RangedCombat-it.txt b/SolastaUnfinishedBusiness/Translations/it/Feats/RangedCombat-it.txt
index a9e6b905cc..14ffdae236 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Feats/RangedCombat-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Feats/RangedCombat-it.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=Hai vantaggio sul tuo pros
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Mira stabile
 Condition/&ConditionFeatSteadyAimRestrainedDescription=Non puoi muoverti fino alla fine del tuo turno.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Trattenuto da Steady Aim
-Feat/&FeatBowMasteryDescription=Il tuo addestramento da esperto con gli archi ti garantisce questi vantaggi:\n• Ottieni un bonus di +1 ai tiri per i danni effettuati con l'arco corto e l'arco lungo.\n• Quando usi l'azione Attacco con un arco corto nel tuo turno, puoi effettuare un attacco con arma a distanza come azione bonus, aggiungendo il tuo modificatore di attributo al danno.\n• Puoi usare Forza invece di Destrezza nei tiri per colpire e per i danni che effettui con un arco lungo.
+Feat/&FeatBowMasteryDescription=Quando usi l'azione Attacco con un arco nel tuo turno, puoi effettuare un attacco con un'arma a distanza come azione bonus, aggiungendo il tuo modificatore di attributo al danno.
 Feat/&FeatBowMasteryTitle=Maestria dell'arco
-Feat/&FeatCrossbowMasteryDescription=Il tuo addestramento da esperto con le balestre ti garantisce questi vantaggi:\n• Ottieni un bonus di +1 ai tiri per i danni effettuati con balestre pesanti, leggere e a mano.\n• Quando usi l'azione Attacco con una balestra leggera o a mano armata durante il tuo turno, puoi effettuare un attacco con un'arma a distanza come azione bonus, aggiungendo il tuo modificatore di attributo al danno.\n• Puoi usare Forza invece di Destrezza nei tiri per colpire e per i danni che effettui con una balestra pesante.
+Feat/&FeatCrossbowMasteryDescription=Quando usi l'azione Attacco con una balestra nel tuo turno, puoi effettuare un attacco con un'arma a distanza come azione bonus, aggiungendo il tuo modificatore di attributo al danno.
 Feat/&FeatCrossbowMasteryTitle=Maestria della balestra
 Feat/&FeatDeadeyeDescription=Hai imparato a barattare la precisione con colpi più letali:\n• Quando attacchi con un'arma a distanza, puoi scegliere di subire una penalità di -5 al tiro per colpire per infliggere +10 danni aggiuntivi.\n• Attacchi a il lungo raggio non impone svantaggio e l'attacco con arma a distanza ignora metà copertura e tre quarti di copertura.
 Feat/&FeatDeadeyeTitle=Tiratore scelto
diff --git a/SolastaUnfinishedBusiness/Translations/it/FightingStyles-it.txt b/SolastaUnfinishedBusiness/Translations/it/FightingStyles-it.txt
index a4c40bb31d..f98b4f3944 100644
--- a/SolastaUnfinishedBusiness/Translations/it/FightingStyles-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/FightingStyles-it.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=Danno paralizzante!
 Feedback/&AdditionalDamageCripplingLine={1} subisce danni paralizzanti.
 Feedback/&AdditionalDamageExecutionerFormat=Esecuzione!
 Feedback/&AdditionalDamageExecutionerLine={0} esegue {1} per +{2} danni extra!
+FightingStyle/&AstralReachDescription=La portata del tuo colpo senz'armi aumenta di 5 piedi.
+FightingStyle/&AstralReachTitle=Portata Astrale
 FightingStyle/&BlindFightingDescription=Hai vista cieca con un raggio di 3 metri. Entro tale raggio, puoi effettivamente vedere tutto ciò che non si trova dietro copertura totale, anche se sei accecato o nell'oscurità. Inoltre, puoi vedere una creatura invisibile entro tale raggio, a meno che la creatura non si nasconda con successo.
 FightingStyle/&BlindFightingTitle=Combattimento cieco
-FightingStyle/&CripplingDescription=Dopo aver colpito con un attacco in mischia, puoi ridurre la velocità dei tuoi avversari di 3 metri e ridurre la loro classe di armatura di 1 fino alla fine del tuo turno successivo.
+FightingStyle/&CripplingDescription=Riduci la velocità dei tuoi avversari di 3 metri fino alla fine del tuo turno successivo in caso di attacco in mischia.
 FightingStyle/&CripplingTitle=Paralizzante
 FightingStyle/&ExecutionerDescription=Si aggiunge il proprio bonus di competenza ai danni contro creature accecate, spaventate, intralciate, incapacitate, paralizzate, prone o stordite.
 FightingStyle/&ExecutionerTitle=Boia
-FightingStyle/&HandAndAHalfDescription=Mentre impugni un'arma da mischia a una mano o versatile e nessun'altra arma o scudo, ottieni bonus +1 ai tiri per colpire con l'arma e +1 alla tua Classe Armatura.
+FightingStyle/&HandAndAHalfDescription=Ottieni un bonus di +1 ai tuoi tiri per colpire e un bonus di +1 alla tua Classe Armatura mentre impugni un'arma da mischia a una mano o versatile e nessun'altra arma o scudo.
 FightingStyle/&HandAndAHalfTitle=Spada classica
 FightingStyle/&InterceptionDescription=Quando una creatura che puoi vedere colpisce un bersaglio, diverso da te, entro 1,5 metri da te con un attacco, puoi usare la tua reazione per ridurre il danno subito dal bersaglio di 1d10 + il tuo bonus di competenza. È necessario impugnare uno scudo o un'arma semplice o da guerra per utilizzare questa reazione.
 FightingStyle/&InterceptionTitle=Intercettazione
-FightingStyle/&LungerDescription=Mentre si impugna solo un'arma da mischia senza l'etichetta pesante e una mano secondaria gratuita, la portata di quell'arma aumenta di 1,5 m.
+FightingStyle/&LungerDescription=La portata della tua arma da mischia aumenta di 1,5 m mentre impugni un'arma senza l'etichetta pesante e nessun'altra arma o scudo.
 FightingStyle/&LungerTitle=Polmoni
 FightingStyle/&MercilessDescription=Quando riduci un bersaglio a 0 HP usando un attacco con arma da mischia nel tuo turno, i nemici entro un raggio dal bersaglio abbattuto pari alla metà del tuo bonus di competenza (arrotondato per eccesso) che possono vedere il bersaglio devono effettuare un tiro salvezza su Saggezza (CD 8 + il tuo bonus di competenza + il tuo modificatore di Forza) o avrai paura di te fino alla fine del tuo turno successivo. Se l'attacco innescante è un colpo critico, il raggio è invece pari al tuo bonus di competenza.
 FightingStyle/&MercilessTitle=Spietato
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=Ottieni competenza nello Scudo e non
 FightingStyle/&MonkShieldExpertTitle=Addestramento allo scudo monastico
 FightingStyle/&PolearmExpertDescription=Il tuo addestramento da esperto con un'arma ad asta ti garantisce questi vantaggi:\n• Quando esegui l'azione Attacco e attacchi solo con un'arma ad asta, puoi utilizzare un'azione bonus per effettuare un attacco in mischia con l'estremità opposta dell'arma. Questo attacco utilizza lo stesso modificatore di abilità dell'attacco primario e infligge 1d4 danni contundenti.\n• Altre creature provocano un attacco di opportunità da parte tua quando entrano nella portata che hai quando impugni un'arma ad asta.
 FightingStyle/&PolearmExpertTitle=Maestro dell'arma ad asta
-FightingStyle/&PugilistDescription=I tuoi colpi senz'armi infliggono 1d4 danni contundenti aggiuntivi e puoi dare un pugno con la mano secondaria come azione bonus. Puoi spingere come azione bonus se hai la mano libera.
+FightingStyle/&PugilistDescription=I tuoi colpi senz'armi infliggono 1d4 danni contundenti aggiuntivi e puoi dare un pugno con la mano secondaria come azione bonus. Puoi spingere come azione bonus se non hai altre armi o scudi.
 FightingStyle/&PugilistTitle=Pugile
 FightingStyle/&RemarkableTechniqueDescription=Possiedi un addestramento marziale che ti consente di eseguire tecniche di combattimento speciali chiamate manovre:\n• Apprendi una manovra a tua scelta dalla sottoclasse Battle Master. La CD di manovra di queste manovre è 8 + bonus di competenza + modificatore di Forza o Destrezza, qualunque sia il più alto.\n• Ottieni 1 dado Superiorità. Il dado è un d6 e non aumenta di dimensioni se non sei un Battle Master. Questo dado viene utilizzato per alimentare le tue manovre. Viene speso quando lo usi e viene recuperato quando termini un riposo breve o lungo.
 FightingStyle/&RemarkableTechniqueTitle=Tecnica superiore
-FightingStyle/&RopeItUpDescription=I tuoi colpi lanciati ottengono +1 ai tiri per colpire e per i danni, aumenti sia la portata lunga che quella corta di 10 piedi e ritorna nella tua mano immediatamente dopo essere stato usato per effettuare un attacco lanciato.
-FightingStyle/&RopeItUpTitle=Legatelo
+FightingStyle/&RopeItUpDescription=Quando effettui un attacco a distanza con un'arma da lancio, aumenta la sua gittata corta di 3 metri e quella lunga di 20 piedi. Inoltre, l'arma ritorna in mano immediatamente dopo essere stata utilizzata per effettuare un attacco da lancio.
+FightingStyle/&RopeItUpTitle=Maestro delle armi da lancio
 FightingStyle/&SentinelDescription=Hai imparato le tecniche per sfruttare ogni abbassamento della guardia del nemico:\n• Quando colpisci una creatura con un attacco di opportunità, la velocità della creatura diventa 0 per il resto del turno.\n• Le creature provocano attacchi di opportunità da anche se eseguono l'azione Disingaggio prima di lasciare la tua portata.\n• Puoi usare la tua reazione per effettuare un attacco con arma da mischia contro la creatura attaccante quando una creatura effettua un attacco contro un bersaglio diverso da te.
 FightingStyle/&SentinelTitle=Sentinella
-FightingStyle/&ShieldExpertDescription=Ti sei addestrato all'uso dello scudo come arma. Diventa un'arma da mischia nella quale sei competente e che infligge 1d4 danni contundenti. Ottieni vantaggio nei tentativi di spinta mentre impugni uno scudo.
-FightingStyle/&ShieldExpertTitle=Esperto di scudi
-FightingStyle/&TorchbearerDescription=Sei abile nell'uso di una torcia in battaglia. Una volta per turno, come azione bonus, puoi scegliere di utilizzare una fonte di luce che hai equipaggiato per tentare di dare fuoco a un nemico che puoi toccare. Il tuo bersaglio deve superare un tiro salvezza su Destrezza (CD 8 + il tuo bonus di competenza + il tuo modificatore di Destrezza) o subire 1d4 danni da fuoco per turno per 1 minuto o fino all'estinzione.
+FightingStyle/&ShieldExpertDescription=Puoi usare la tua azione bonus per colpire una creatura usando il tuo scudo, trasformandola momentaneamente in un'arma speciale improvvisata nella quale sei abile. Effettua un attacco con arma da mischia contro una creatura entro 1,5 metri da te utilizzando il tuo modificatore di Forza per l'attacco. Se colpisci, la creatura subisce 1d4 + modificatore di Forza come danni contundenti.
+FightingStyle/&ShieldExpertTitle=Colpo di scudo
+FightingStyle/&TorchbearerDescription=Come azione bonus, puoi scegliere di utilizzare una fonte di luce che hai equipaggiato per tentare di dare fuoco a un nemico che puoi toccare. Il tuo bersaglio deve superare un tiro salvezza su Destrezza (CD 8 + il tuo bonus di competenza + il tuo modificatore di Destrezza) o subire 1d4 danni da fuoco per turno per 1 minuto o fino all'estinzione.
 FightingStyle/&TorchbearerTitle=Tedoforo
 FightingStyle/&ZenArcherDescription=La tua intuizione guida la tua mano quando usi un arco. Aumenta il tuo attributo Saggezza di 1, fino a un massimo di 20. Puoi usare il tuo modificatore di Saggezza invece del modificatore di Destrezza per i tiri per colpire e per i danni con queste armi.
 FightingStyle/&ZenArcherTitle=Tiro con l'arco saggio
diff --git a/SolastaUnfinishedBusiness/Translations/it/Level20-it.txt b/SolastaUnfinishedBusiness/Translations/it/Level20-it.txt
index 21faa10a3a..96215f0ba2 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Level20-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Level20-it.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=A partire dal 17° liv
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Purezza della luce
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=A partire dal 17° livello, ottieni la capacità di creare vibrazioni letali nel corpo di qualcuno. Quando colpisci una creatura con un colpo senz'armi, puoi spendere 3 punti Ki per avviare queste vibrazioni impercettibili, che durano 24 ore. Le vibrazioni sono innocue a meno che non usi la tua azione per porvi fine. Quando usi questa azione, la creatura deve effettuare un tiro salvezza su Costituzione. Se fallisce, viene ridotto a 1 punto ferita e rimane stordito fino all'inizio del turno successivo. Se ha successo, subisce 10d10 danni necrotici.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Palma tremante
+Feature/&FeatureWizardSpellMasteryDescription=Hai raggiunto una tale padronanza su alcuni incantesimi che puoi lanciarli a piacimento. Scegli due incantesimi da mago di 1° o 2° livello presenti nel tuo libro degli incantesimi. Puoi lanciare quegli incantesimi al loro livello più basso senza spendere uno slot incantesimo quando li hai preparati. Se vuoi lanciare uno degli incantesimi a un livello più alto, devi spendere uno slot incantesimo normalmente.
+Feature/&FeatureWizardSpellMasteryTitle=Padronanza degli incantesimi
 Feature/&GrantInvocationsSpellMasteryDescription=Hai raggiunto una tale padronanza su alcuni incantesimi che puoi lanciarli a piacimento. I primi due incantesimi da mago di 1° e 2° livello che prepari possono essere lanciati al loro livello più basso senza spendere uno slot incantesimo. Se vuoi lanciare uno degli incantesimi a un livello più alto, devi spendere uno slot incantesimo normalmente.
 Feature/&GrantInvocationsSpellMasteryTitle=Padronanza degli incantesimi
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Seleziona un incantesimo distintivo da imparare.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Incantesimi caratteristici
 Feature/&InvocationPoolWizardSignatureSpellsDescription=Ottieni la padronanza di due potenti incantesimi e puoi lanciarli con poco sforzo. Scegli due incantesimi da mago di 3° livello come incantesimi distintivi. Hai sempre questi incantesimi preparati, non contano nel numero di incantesimi che hai preparato e puoi lanciarli ciascuno una volta al 3° livello senza spendere uno slot incantesimo. Quando lo fai, non puoi farlo di nuovo finché non finisci un riposo breve o lungo.
 Feature/&InvocationPoolWizardSignatureSpellsTitle=Incantesimi caratteristici
 Feature/&MagicAffinityArchDruidDescription=Puoi utilizzare il tuo Wildshape un numero illimitato di volte. Inoltre, puoi ignorare le componenti verbali e somatiche dei tuoi incantesimi da druido, così come qualsiasi componente materiale che non abbia un costo e non venga consumato da un incantesimo. Ottieni questo beneficio sia nella tua forma normale che nella tua forma bestiale da Forma Selvaggia.
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=A partire dal 17°
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Perfezione fisica
 Feature/&PowerWarlockEldritchMasterDescription=Puoi attingere alla tua riserva interiore di potere mistico mentre supplichi il tuo patrono di riguadagnare gli slot incantesimo esauriti. Puoi spendere 1 minuto supplicando il tuo patrono di chiedere aiuto per recuperare tutti gli slot incantesimo spesi dalla tua funzione Patto Magico. Una volta riacquistati gli slot incantesimo con questo privilegio, è necessario terminare un riposo lungo prima di poterlo fare di nuovo.
 Feature/&PowerWarlockEldritchMasterTitle=Maestro Eldritch
+Feature/&PowerWizardSignatureSpellsDescription=Ottieni la padronanza di due potenti incantesimi e puoi lanciarli con poco sforzo. Scegli due incantesimi da mago di 3° livello nel tuo libro degli incantesimi come incantesimi distintivi. Hai sempre questi incantesimi preparati, non contano nel numero di incantesimi che hai preparato e puoi lanciarli ciascuno una volta al 3° livello senza spendere uno slot incantesimo. Quando lo fai, non puoi farlo di nuovo finché non finisci un riposo breve o lungo.
+Feature/&PowerWizardSignatureSpellsTitle=Incantesimi distintivi
 Feature/&SenseRangerFeralSensesDescription=Ottieni sensi soprannaturali che ti aiutano a combattere le creature che non puoi vedere. Quando attacchi una creatura che non puoi vedere, la tua incapacità di vederla non impone svantaggio ai tuoi tiri per colpire contro di essa.
 Feature/&SenseRangerFeralSensesTitle=Sensi selvaggi
 Feedback/&AdditionalDamageBrutalAssaultFormat=Assalto brutale!
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=Puoi pagare 1 Ki per ripristinare 1 p
 Reaction/&UsePhysicalPerfectionReactDescription=Puoi pagare 1 Ki per ripristinare 1 punto ferita.
 Reaction/&UsePhysicalPerfectionReactTitle=Guarire
 Reaction/&UsePhysicalPerfectionTitle=Perfezione fisica
+RestActivity/&RestActivitySignatureSpellsDescription=Puoi selezionare i tuoi incantesimi distintivi una volta.
+RestActivity/&RestActivitySignatureSpellsTitle=Incantesimi distintivi
+RestActivity/&RestActivitySpellMasteryDescription=Puoi modificare la tua lista di incantesimi di maestria al termine di un riposo lungo.
+RestActivity/&RestActivitySpellMasteryTitle=Padronanza degli incantesimi
 Rules/&DamagePureDescription=Vibrazioni impercettibili che disintegrano la vittima dall'interno.
 Rules/&DamagePureTitle=Puro
+Screen/&SignatureSpellsExtraSpellDescription=Questo incantesimo distintivo è sempre preparato e, una volta per riposo lungo, non consuma uno slot incantesimo quando viene lanciato a livello.
+Screen/&SignatureSpellsExtraSpellTitle=Incantesimi distintivi
+Screen/&SpellMasteryExtraSpellDescription=Questo incantesimo di Maestria è sempre preparato e non consuma uno slot incantesimo quando viene lanciato a livello.
+Screen/&SpellMasteryExtraSpellTitle=Padronanza degli incantesimi
 Tooltip/&MustHaveQuiveringPalmCondition=Non è contrassegnato da Palmo Tremante
diff --git a/SolastaUnfinishedBusiness/Translations/it/Others-it.txt b/SolastaUnfinishedBusiness/Translations/it/Others-it.txt
index b170935fd9..e93c9c8b63 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Others-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Others-it.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Attiva/disattiva Colpo Brutale
 Action/&BrutalStrikeToggleTitle=Colpo Brutale
 Action/&CastPlaneMagicDescription=Lancia uno degli incantesimi che hai ottenuto dai talenti Plane Touched
 Action/&CastPlaneMagicTitle=Magia del piano del canale
-Action/&CastSignatureSpellsDescription=Lancia questi incantesimi di 3° livello senza spendere uno slot
-Action/&CastSignatureSpellsTitle=Incantesimi caratteristici
-Action/&CastSpellMasteryDescription=Lancia i tuoi incantesimi preparati di 1° o 2° livello senza spendere uno slot
-Action/&CastSpellMasteryTitle=Padronanza degli incantesimi
 Action/&CoordinatedAssaultToggleDescription=Attiva/disattiva l'Assalto Coordinato
 Action/&CoordinatedAssaultToggleTitle=Assalto coordinato
 Action/&CunningStrikeToggleDescription=Attiva/disattiva Colpo astuto
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Energia
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Competenza
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Nemico preferito
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Affinità del tipo di terreno
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Incantesimo distintivo
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Ascendenza draconica stregonesca
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Addestramento alle armi
 UI/&ForcePreferredCantripDescription=Se questa opzione è attiva, solo il trucchetto preferito può attivarsi. Se il trucchetto preferito non è selezionato, verrà attivato il primo trucchetto valido, indipendentemente da questa opzione.
diff --git a/SolastaUnfinishedBusiness/Translations/it/Settings-it.txt b/SolastaUnfinishedBusiness/Translations/it/Settings-it.txt
index 93f0862bd7..e54d155bca 100644
--- a/SolastaUnfinishedBusiness/Translations/it/Settings-it.txt
+++ b/SolastaUnfinishedBusiness/Translations/it/Settings-it.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Consenti di lanciare incantesimi con azione extra dall'
 ModUi/&AllowHornsOnAllRaces=Consenti le corna a tutte le razze <i><color=#F0DAA0>[i risultati potrebbero sembrare terribili a seconda della razza, della testa e delle corna]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Consenti più stato reale sul pannello di riposo <i><color=#F0DAA0>[nascondi le azioni dopo il riposo sul pannello prima e le funzionalità di recupero sul pannello dopo]</color></i>
 ModUi/&AllowStackedMaterialComponent=Consenti componente materiale impilato <i><color=#F0DAA0>[ad es. 2 diamanti da 500 gp equivalgono a un diamante da 1000 gp]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Consenti la selezione del bersaglio quando lanci l'incantesimo <color=#D89555>Catena di Fulmini</color>
 ModUi/&AllowUnmarkedSorcerers=Consenti <color=#D89555>Stregone</color> senza segni di origine e tatuaggi
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=Il tasto <color=#1E81B0>ALT</color> evidenzia solo i gadget nel campo visivo del gruppo <i><color=#F0DAA0>[solo dungeon personalizzati]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Consenti a <color=#D89555>Bastone Scudo Arcano</color> di essere sintonizzato da qualsiasi classe
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Disabilita <color=#D89555>Oscu
 ModUi/&DisableUnofficialTranslations=Disabilita il supporto delle traduzioni non ufficiali per velocizzare la mod <i><color=#F0DAA0>[a meno che non parli cinese, italiano, giapponese, coreano o spagnolo]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Mostra tutti gli incantesimi conosciuti di altre classi durante l'aumento di livello</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Mostra slot patto <color=#D89555>Stregone</color> sulla selezione degli incantesimi invece che sul pannello del personaggio</i>
-ModUi/&DocsArcaneShots=DOCUMENTI: Colpi Arcani
-ModUi/&DocsBackgrounds=DOCUMENTI: Sfondi
-ModUi/&DocsFeats=DOCUMENTI: Talenti
-ModUi/&DocsFightingStyles=DOCUMENTI: Stili di combattimento
-ModUi/&DocsInfusions=DOCUMENTI: Infusi
-ModUi/&DocsInvocations=DOCUMENTI: Invocazioni
-ModUi/&DocsManeuvers=DOCUMENTI: Manovre
-ModUi/&DocsMetamagic=DOCUMENTI: Metamagia
-ModUi/&DocsRaces=DOCUMENTI: Razze
-ModUi/&DocsSpells=DOCUMENTI: Incantesimi
-ModUi/&DocsSubclasses=DOCUMENTI: Sottoclassi
-ModUi/&DocsSubraces=DOCUMENTI: Sottorazze
+ModUi/&DocsArcaneShots=Colpi Arcani
+ModUi/&DocsBackgrounds=Sfondi
+ModUi/&DocsFeats=Talenti
+ModUi/&DocsFightingStyles=Stili di combattimento
+ModUi/&DocsInfusions=Infusi
+ModUi/&DocsInvocations=Invocazioni
+ModUi/&DocsManeuvers=Manovre
+ModUi/&DocsMetamagic=Metamagia
+ModUi/&DocsRaces=Razze
+ModUi/&DocsSpells=Incantesimi
+ModUi/&DocsSubclasses=Sottoclassi
+ModUi/&DocsSubraces=Sottorazze
+ModUi/&DocsVersatilities=Versatilità
 ModUi/&Donate=<b><color=#D89555>Dona:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=Non visualizzare i caschi sui caratteri grafici <b><i><color=#C04040E0>[Richiede il riavvio]</color></i></b>
 ModUi/&DontEndTurnAfterReady=Non terminare il turno dopo aver utilizzato l'azione pronta <i><color=#F0DAA0>[consente di utilizzare l'azione bonus o qualsiasi azione principale extra da Fretta o altre fonti]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Abilita la scelta dello <color=#D89555>Ladro</co
 ModUi/&EnableRogueSteadyAim=Abilita <color=#D89555>Ladro</color> <b>Mira costante</b> al livello di classe 3 <i><color=#F0DAA0>[l'azione bonus dà vantaggio al tuo prossimo tiro per colpire nel turno corrente se non mi sono ancora trasferito]</color></i>
 ModUi/&EnableRogueStrSaving=Abilita <color=#D89555>Ladro</color> per utilizzare i modificatori DEX o FOR su <b>Colpo astuto/diabolico</b>, <b>Colpo debilitante/migliorato</b> e <b>Pianta di lame </b>
 ModUi/&EnableSaveByLocation=Abilita il salvataggio per campagne/località
+ModUi/&EnableSignatureSpellsRelearn=Abilita gli incantesimi distintivi <color=#D89555>Mago</color> da preparare ogni riposo lungo <i><color=#F0DAA0>[invece di una volta al livello 20]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Abilita l'ordinamento delle risorse nell'editor di Dungeon Maker
 ModUi/&EnableStatsOnHeroTooltip=Mostra le statistiche sul tooltip dell'eroe <i><color=#F0DAA0>[ad esempio: colpi critici, fallimenti critici, ecc.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=• Inoltre ogni eroe aggiunge un tiro di D20 al peso per un po' di casualità
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Feats/Group-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Feats/Group-ja.txt
index 85d8d1049b..1087bb2ab9 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Feats/Group-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Feats/Group-ja.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=戦闘: 近接戦闘
 Feat/&FeatGroupOldTacticsDescription=あなたの強さまたは器用さを 1 増加させます。ラウンドごとに 1 回、近接武器の射程内にある伏せの敵が立ち上がると、そのターゲットに対して機会攻撃を行うことができます。
 Feat/&FeatGroupOldTacticsTitle=古い戦術
-Feat/&FeatGroupOrcishAggressionDescription=あなたの攻撃性は絶え間なく燃え上がります。次の利点が得られます。\n• 体力または体質が 1 増加し、最大 20 まで増加します。\n• ボーナス アクションとして、メイン ハンドで近接武器を使用すると、自分の速度までチャージできます選択した敵に向かって、メイン武器でクリーチャーを自由に攻撃します。
+Feat/&FeatGroupOrcishAggressionDescription=あなたの攻撃性は絶え間なく燃え上がります。次の利点が得られます。\n• 体力または体質が 1 増加し、最大 20 まで増加します。\n• ボーナス アクションとして、メイン ハンドで近接武器を使用すると、自分の速度までチャージできます選択した敵に向かって、メイン武器でクリーチャーを自由に攻撃します。この機能は、長い休憩ごとに熟練度ボーナスの回数を使用できます。
 Feat/&FeatGroupOrcishAggressionTitle=オークの攻撃性
 Feat/&FeatGroupOrcishFuryDescription=あなたの怒りは尽きることなく燃え続けます。あなたは以下の恩恵を得ます:\n• 筋力または体質が 1 増加します (最大 20 まで)。\n• 単純武器または軍用武器による攻撃が命中したとき、武器のダメージ ダイスを 1 つ追加でロールし、そのダメージを武器のダメージ タイプに追加ダメージとして加えることができます。この能力を一度使用すると、小休憩または大休憩を終了するまで再び使用することはできません。\n• 容赦ない忍耐特性を使用した直後、反応を使用して 1 回の武器攻撃を行うことができます。
 Feat/&FeatGroupOrcishFuryTitle=オークの怒り
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Feats/MeleeCombat-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Feats/MeleeCombat-ja.txt
index bce3a456c2..f979df94a0 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Feats/MeleeCombat-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Feats/MeleeCombat-ja.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=あなたは敵を粉砕する技術を訓練さ
 Feat/&FeatCrusherConTitle=クラッシャー [Con]
 Feat/&FeatCrusherStrDescription=あなたは敵を粉砕する技術を訓練されています。体力が 1 増加し、最大 20 になります。殴打ダメージを与える攻撃をクリーチャーに当てると、1 ターンに 1 回、敵を 5 フィート押し込みます。あなたがクリティカルヒットを獲得したとき、そのクリーチャーに対する攻撃ロールは次のターンの開始時まで有利に行われます。
 Feat/&FeatCrusherStrTitle=クラッシャー[Str]
-Feat/&FeatDefensiveDuelistDescription=あなたが熟練したフィネス武器を使用しているときに、別のクリーチャーが近接攻撃であなたを攻撃したとき、あなたはその反応を利用してその攻撃のACに熟練度ボーナスを追加することができ、潜在的に攻撃を見逃す可能性があります。
+Feat/&FeatDefensiveDuelistDescription=あなたが熟練した近接武器を使用しているときに、別のクリーチャーが近接攻撃であなたを攻撃したとき、あなたはその反応を利用してその攻撃のACに熟練度ボーナスを追加することができ、潜在的に攻撃を見逃す可能性があります。
 Feat/&FeatDefensiveDuelistTitle=守備型デュエリスト
 Feat/&FeatFellHandedDescription=あなたはハンドアックス、バトルアックス、グレートアックス、ウォーハンマー、モールをマスターします。これらのいずれかを使用すると、次の利点が得られます。\n• その武器で行う攻撃ロールに +1 ボーナス。\n• 近接攻撃ロールで有利な状態でヒットすると、次の場合にターゲットを伏せさせます。 2 つの d20 ロールのうち低い方のロールもターゲットに命中します。\n• 近接攻撃ロールで不利な立場にありミスした場合、2 つの d20 ロールのうち高い方がターゲットに命中した場合、ターゲットはあなたの筋力修正値に等しい殴打ダメージを受けます。 。
 Feat/&FeatFellHandedTitle=フェルハンド
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Feats/OtherFeats-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Feats/OtherFeats-ja.txt
index 834792be00..d935129b3e 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Feats/OtherFeats-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Feats/OtherFeats-ja.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=体質を 1 増やして、最大 20 まで増加
 Feat/&FeatChefConTitle=シェフ【あり】
 Feat/&FeatChefWisDescription=知恵を 1 増やして、最大 20 まで増やします。\n1 時間かけて料理を作ると、自分と仲間の HP を 1d8 回復できます。\n1 日に 1 回、1 時間かけて料理を作ることができます熟練度ボーナスに等しいおやつを食べたときに一時的に 5 の HP を提供します。
 Feat/&FeatChefWisTitle=シェフ[ウィス]
-Feat/&FeatCriticalVirtuosoDescription=クリティカルの閾値が 1 下がります。
 Feat/&FeatDungeonDelverDescription=多くのダンジョンにある隠された罠や秘密の扉に注意を払うと、次の利点が得られます:\n• 知恵 (知覚) と知力 (調査) 判定で有利になります。\n• セービング スローで有利になります。罠を避けるか抵抗します。\n• 罠によって与えられるダメージに対する耐性があります。\n• 速いペースで移動しても、受動的な知恵（知覚）スコアに通常の -5 ペナルティが課されません。
 Feat/&FeatDungeonDelverTitle=ダンジョンデルバー
 Feat/&FeatEldritchAdeptDescription=ウォーロック クラスから、選択した Eldritch Invocation オプションを 1 つ学習します。その呼び出しに前提条件がある場合、その呼び出しを選択できるのは、ウォーロックであり、前提条件を満たしている場合のみです。レベルが上がるたびに、その呼び出しをウォーロック クラスの別の呼び出しに置き換えることができます。
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Feats/Races-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Feats/Races-ja.txt
index c08a76bd6b..391d83c9ba 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Feats/Races-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Feats/Races-ja.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=あなたは特定の種類の生き物に
 Feat/&FeatGrudgeBearerWisTitle=恨みを抱く者【Wis】
 Feat/&FeatInfernalConstitutionDescription=悪魔の血があなたの中に強く流れており、一部の悪魔が持つのと同じような回復力を解き放ちます。次の利点が得られます。\n・体質が 1 増加し、最大 20 になります。\n・冷気と毒ダメージに対する耐性が得られます。\n・毒状態に対するセーヴィング スローで有利になります。
 Feat/&FeatInfernalConstitutionTitle=地獄の憲法
-Feat/&FeatOrcishAggressionConDescription=あなたの攻撃性は絶え間なく燃え上がります。次の利点が得られます。\n• 体質が 1 増加し、最大 20 まで増加します。\n• ボーナス アクションとして、メインハンドで近接武器を使用すると、自分の速度までチャージできます。選択した敵を選択し、メイン武器でクリーチャーを自由に攻撃します。
+Feat/&FeatOrcishAggressionConDescription=あなたの攻撃性は絶え間なく燃え上がります。次の利点が得られます。\n• 体質が 1 増加し、最大 20 まで増加します。\n• ボーナス アクションとして、メインハンドで近接武器を使用すると、自分の速度までチャージできます。選択した敵を選択し、メイン武器でクリーチャーを自由に攻撃します。この機能は、長い休憩ごとに熟練度ボーナスの回数を使用できます。
 Feat/&FeatOrcishAggressionConTitle=オークの攻撃性 [短所]
-Feat/&FeatOrcishAggressionDescription=あなたの攻撃性は絶え間なく燃え上がります。次の利点が得られます。\n• 筋力が 1 増加し、最大 20 まで増加します。\n• ボーナス アクションとして、メイン ハンドで近接武器を使用すると、自分の速度までチャージできます。選択した敵を選択し、メイン武器でクリーチャーを自由に攻撃します。
+Feat/&FeatOrcishAggressionDescription=あなたの攻撃性は絶え間なく燃え上がります。次の利点が得られます。\n• 筋力が 1 増加し、最大 20 まで増加します。\n• ボーナス アクションとして、メイン ハンドで近接武器を使用すると、自分の速度までチャージできます。選択した敵を選択し、メイン武器でクリーチャーを自由に攻撃します。この機能は、長い休憩ごとに熟練度ボーナスの回数を使用できます。
 Feat/&FeatOrcishAggressionTitle=オークの攻撃性[Str]
 Feat/&FeatOrcishFuryConDescription=あなたの怒りは絶え間なく燃え上がります。次の利点が得られます。\n• 体質が 1 増加し、最大 20 まで増加します。\n• 単純な武器または格闘武器による攻撃が当たると、武器のダメージ ダイスを 1 つ振ることができます。さらに時間を追加し、武器のダメージタイプに追加ダメージとして追加します。この能力を一度使用すると、短いまたは長い休憩が終了するまで再度使用することはできません。\n• 執拗な耐久特性を使用した直後、反応を利用して 1 つの武器攻撃を行うことができます。
 Feat/&FeatOrcishFuryConTitle=オークの怒り [短所]
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Feats/RangedCombat-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Feats/RangedCombat-ja.txt
index 69b230c309..baa65d3794 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Feats/RangedCombat-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Feats/RangedCombat-ja.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=次の攻撃ロールで
 Condition/&ConditionFeatSteadyAimAdvantageTitle=着実な狙い
 Condition/&ConditionFeatSteadyAimRestrainedDescription=ターン終了まで移動できません。
 Condition/&ConditionFeatSteadyAimRestrainedTitle=ステディエイムによる拘束
-Feat/&FeatBowMasteryDescription=弓の専門的な訓練を受けると、次のようなメリットが得られます。\n• 短弓と長弓で行うダメージ ロールに +1 ボーナスを獲得します。\n• 自分のターンに短弓で攻撃アクションを使用すると、次のことができます。ボーナス アクションとして遠距離武器攻撃 1 回を追加し、属性修正値をダメージに追加します。\n• 長弓で行う攻撃ロールとダメージ ロールには、器用さの代わりに筋力を使用できます。
+Feat/&FeatBowMasteryDescription=自分のターンに弓で攻撃アクションを使用すると、ボーナス アクションとして遠距離武器攻撃を 1 回行うことができ、ダメージに属性修正値が追加されます。
 Feat/&FeatBowMasteryTitle=弓マスタリー
-Feat/&FeatCrossbowMasteryDescription=クロスボウの熟練したトレーニングにより、次のようなメリットが得られます:\n• 重クロスボウ、軽クロスボウ、およびハンドクロスボウを使用して行うダメージロールに +1 ボーナスを獲得します。\n• ライトクロスボウまたはハンドクロスボウを使用して攻撃アクションを使用したとき。自分のターンでは、ボーナス アクションとして遠隔武器攻撃を 1 回行うことができ、属性修正値がダメージに追加されます。\n• 重石弓で行う攻撃ロールとダメージ ロールには、器用さの代わりに筋力を使用できます。
+Feat/&FeatCrossbowMasteryDescription=自分のターンにクロスボウで攻撃アクションを使用すると、ボーナス アクションとして遠距離武器攻撃を 1 回行うことができ、ダメージに属性修正値が追加されます。
 Feat/&FeatCrossbowMasteryTitle=クロスボウマスタリー
 Feat/&FeatDeadeyeDescription=あなたは精度を犠牲にしてより致命的なショットを放つことを学びました:\n• 遠距離武器で攻撃するとき、追加の +10 ダメージを与えるために、攻撃ロールに -5 ペナルティを受けることを選択できます。\n• での攻撃長距離は不利を課すことはなく、遠距離武器による攻撃は半分の遮蔽と 4 分の 3 の遮蔽を無視します。
 Feat/&FeatDeadeyeTitle=狙撃兵
diff --git a/SolastaUnfinishedBusiness/Translations/ja/FightingStyles-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/FightingStyles-ja.txt
index 20aefdc755..b6914da5ba 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/FightingStyles-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/FightingStyles-ja.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=致命的なダメージ!
 Feedback/&AdditionalDamageCripplingLine={1}は壊滅的なダメージを受けます。
 Feedback/&AdditionalDamageExecutionerFormat=実行！
 Feedback/&AdditionalDamageExecutionerLine={0} は {1} を実行して +{2} の追加ダメージを与えます!
+FightingStyle/&AstralReachDescription=素手攻撃のリーチが 5 フィート増加します。
+FightingStyle/&AstralReachTitle=アストラルリーチ
 FightingStyle/&BlindFightingDescription=10 フィートの範囲で盲視が可能です。その範囲内では、たとえ目が見えなくなっていても、暗闇にいても、完全に遮蔽されていないものはすべて実質的に見ることができます。さらに、その生物があなたからうまく隠れない限り、その範囲内に目に見えない生物が見える可能性があります。
 FightingStyle/&BlindFightingTitle=ブラインドファイティング
-FightingStyle/&CripplingDescription=近接攻撃が当たると、次のターンの終わりまで敵の速度を 10 フィート低下させ、アーマー クラスを 1 減らすことができます。
+FightingStyle/&CripplingDescription=近接攻撃がヒットすると、次のターンが終了するまで敵の速度が 10 フィート減少します。
 FightingStyle/&CripplingTitle=壊滅的
-FightingStyle/&ExecutionerDescription=目が見えなくなったり、怯えたり、拘束されたり、無力化されたり、麻痺したり、うつ伏せになったり、気絶したりしているクリーチャーに対するダメージに熟練度ボーナスを追加します。
+FightingStyle/&ExecutionerDescription=目が見えなくなった、怯えている、拘束されている、無力化されている、麻痺している、うつ伏せになっている、または気絶しているクリーチャーに対するダメージに熟練度ボーナスを追加します。
 FightingStyle/&ExecutionerTitle=死刑執行人
-FightingStyle/&HandAndAHalfDescription=近接片手武器または万能武器を使用し、他の武器や盾を使用しない場合、その武器による攻撃ロールに +1 ボーナスを獲得し、アーマー クラスに +1 を獲得します。
+FightingStyle/&HandAndAHalfDescription=近接片手武器または汎用武器を使用し、他の武器や盾を使用しない場合、攻撃ロールに +1 ボーナスを獲得し、アーマー クラスに +1 ボーナスを獲得します。
 FightingStyle/&HandAndAHalfTitle=古典剣術
 FightingStyle/&InterceptionDescription=あなたが見ることができるクリーチャーがあなた以外の、あなたから5フィート以内にいるターゲットに攻撃を命中させたとき、あなたはその反応を利用してターゲットが受けるダメージを1d10 + 熟練度ボーナスだけ減らすことができます。この反応を使用するには、盾、または単純な武器または格闘用の武器を使用する必要があります。
 FightingStyle/&InterceptionTitle=傍受
-FightingStyle/&LungerDescription=ヘビータグとフリーオフハンドなしで近接武器を 1 つだけ使用している場合、その武器の射程は 5 フィート増加します。
+FightingStyle/&LungerDescription=ヘビータグを付けずに武器を使用し、他の武器やシールドを使用しない場合、近接武器のリーチが 5 フィート増加します。
 FightingStyle/&LungerTitle=肺
 FightingStyle/&MercilessDescription=自分のターンに近接武器攻撃を使用してターゲットの HP を 0 に減らすと、ダウンしたターゲットの半径内であなたの熟練度ボーナスの半分 (切り上げ) に等しいターゲットを視認できる敵は知恵セーブを行わなければなりません (難易度 8 +)熟練度ボーナス + 筋力修正値)、または次のターンの終わりまであなたを怖がるようになります。トリガーとなる攻撃がクリティカル ヒットの場合、半径は熟練度ボーナスと同じになります。
 FightingStyle/&MercilessTitle=無慈悲な
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=あなたはシールドの熟練度
 FightingStyle/&MonkShieldExpertTitle=修道院の盾の訓練
 FightingStyle/&PolearmExpertDescription=ポールアームを使った熟練のトレーニングにより、次のようなメリットが得られます:\n• 攻撃アクションを実行してポールアーム武器のみで攻撃する場合、ボーナス アクションを使用して武器の反対側で近接攻撃を行うことができます。この攻撃は主攻撃と同じ能力修正を使用し、1d4 の殴打ダメージを与えます。\n• 他のクリーチャーは、長柄武器を使用してあなたが到達できる範囲に入ると、あなたからの機会攻撃を引き起こします。
 FightingStyle/&PolearmExpertTitle=ポールアームマスター
-FightingStyle/&PugilistDescription=素手での打撃は追加の 1d4 の殴打ダメージを与え、ボーナス アクションとしてオフハンドでパンチすることもできます。手が空いている場合は、ボーナスアクションとして押し込むことができます。
+FightingStyle/&PugilistDescription=素手での打撃は追加の 1d4 の殴打ダメージを与え、ボーナス アクションとしてオフハンドでパンチすることもできます。他に武器や盾がない場合は、ボーナスアクションとして突き飛ばすことができます。
 FightingStyle/&PugilistTitle=拳闘士
 FightingStyle/&RemarkableTechniqueDescription=あなたは、マニューバと呼ばれる特別な戦闘テクニックを実行できる武術訓練を受けています:\n• バトル マスター サブクラスから、選択した 1 つのマニューバを学びます。これらの操縦の操縦難易度は、8 + 熟練度ボーナス + 筋力または器用さ修正値のいずれか高い方です。\n• 優位性ダイスを 1 つ獲得します。ダイスはd6で、バトルマスターでないと大きくなりません。このダイスは作戦の燃料として使用されます。使用すると消費され、短いまたは長い休憩が終了すると回復します。
 FightingStyle/&RemarkableTechniqueTitle=優れた技術
-FightingStyle/&RopeItUpDescription=あなたの投げた打撃は攻撃とダメージロールに+1され、長距離と短距離の両方で10フィート増加し、投げた攻撃を行うために使用されるとすぐに手札に戻ります。
-FightingStyle/&RopeItUpTitle=ロープを張る
+FightingStyle/&RopeItUpDescription=投擲武器で遠距離攻撃を行う場合、短距離は 10 フィート、長距離は 20 フィート増加します。また、投擲攻撃を行った後はすぐに武器が手元に戻ります。
+FightingStyle/&RopeItUpTitle=投擲武器マスター
 FightingStyle/&SentinelDescription=あなたは敵のガードのあらゆる隙を突くテクニックを習得しました。\n・クリーチャーに機会攻撃を当てると、そのターンの残りの間、クリーチャーのスピードは0になります。\n・クリーチャーはからの機会攻撃を引き起こします。相手があなたのリーチを離れる前に解除アクションを行ったとしても、あなたはあなたを攻撃します。\n• クリーチャーがあなた以外のターゲットに対して攻撃を行ったときに、あなたの反応を利用して、攻撃しているクリーチャーに対して近接武器で攻撃することができます。
 FightingStyle/&SentinelTitle=センチネル
-FightingStyle/&ShieldExpertDescription=あなたは盾を武器として使う訓練をしました。それはあなたが熟達した近接武器となり、1d4 の打撃ダメージを与えます。あなたは盾を装備している間、突き飛ばしの試みに有利を得ます。
-FightingStyle/&ShieldExpertTitle=シールドエキスパート
-FightingStyle/&TorchbearerDescription=あなたは戦闘での松明の使い方に熟練しています。ターンごとに 1 回、ボーナス アクションとして、装備している光源を使用して、触れることができる敵に火をつけることを選択できます。あなたのターゲットは、器用さセーヴィング・スロー（難易度 8 + 熟練度ボーナス + 器用さ修正値）に成功するか、1 分間または消滅するまでターンごとに 1d4 の火炎ダメージを受けなければなりません。
+FightingStyle/&ShieldExpertDescription=ボーナス アクションを使用して、シールドを使用してクリーチャーを打ち負かし、それを一時的に熟練した特別な即席武器に変えることができます。攻撃の強さ修正値を使用して、5 フィート以内のクリーチャーに対して近接武器攻撃を行います。あなたが命中した場合、そのクリーチャーは殴打ダメージとして 1d4 + 筋力修正を受けます。
+FightingStyle/&ShieldExpertTitle=シールドバッシュ
+FightingStyle/&TorchbearerDescription=ボーナスアクションとして、装備している光源を使用して、触れることができる敵に火をつけようとすることを選択できます。あなたのターゲットは、器用さセーヴィング・スロー（難易度 8 + 熟練度ボーナス + 器用さ修正値）に成功するか、1 分間または消滅するまでターンごとに 1d4 の火炎ダメージを受けなければなりません。
 FightingStyle/&TorchbearerTitle=聖火ランナー
 FightingStyle/&ZenArcherDescription=弓を使うときは、直感があなたの手を導きます。あなたの知恵属性を 1 増加し、最大 20 になります。これらの武器での攻撃ロールとダメージ ロールには、敏捷性修正値の代わりに知恵修正値を使用できます。
 FightingStyle/&ZenArcherTitle=ワイズアーチェリー
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Level20-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Level20-ja.txt
index 6442b9a5bd..ef99a0aadd 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Level20-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Level20-ja.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=17 レベルからは
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=光の純度
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=17 レベルから、誰かの体に致死的な振動を設定する能力を獲得します。クリーチャーに素手攻撃を当てると、3 Ki ポイントを消費して、これらの知覚できない振動が開始され、それが 24 時間続きます。あなたが自分の行動で振動を止めない限り、振動は無害です。このアクションを使用するとき、クリーチャーは憲法セーヴィング・スローを行わなければなりません。失敗した場合、ヒットポイントは 1 に減少し、次のターンの開始時まで気絶状態になります。成功すると10d10の壊死ダメージを受ける。
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=震える手のひら
+Feature/&FeatureWizardSpellMasteryDescription=あなたは特定の呪文を自在に唱えることができるほどの習熟を達成しました。呪文書にある第 1 レベルまたは第 2 レベルのウィザード呪文を 2 つ選択します。それらの呪文を準備しておくと、呪文スロットを消費せずに、最も低いレベルでそれらの呪文を唱えることができます。どちらかの呪文をより高いレベルで唱えたい場合は、通常どおり呪文スロットを消費する必要があります。
+Feature/&FeatureWizardSpellMasteryTitle=スペルマスタリー
 Feature/&GrantInvocationsSpellMasteryDescription=あなたは特定の呪文を自在に唱えることができるほどの習熟を達成しました。あなたが準備する最初の 2 つの第 1 レベルと第 2 レベルのウィザード呪文は、呪文スロットを消費せずに最も低いレベルで唱えることができます。どちらかの呪文をより高いレベルで唱えたい場合は、通常どおり呪文スロットを消費する必要があります。
 Feature/&GrantInvocationsSpellMasteryTitle=スペルマスタリー
-Feature/&InvocationPoolSignatureSpellsLearnDescription=学習するシグネチャー スペルを選択します。
-Feature/&InvocationPoolSignatureSpellsLearnTitle=シグネチャースペル
 Feature/&InvocationPoolWizardSignatureSpellsDescription=あなたは 2 つの強力な呪文を習得し、ほとんど努力せずにそれらを唱えることができます。あなたのシグネチャー呪文として、第 3 レベルのウィザード呪文を 2 つ選択します。これらの呪文は常に準備しており、準備した呪文の数にはカウントされません。また、呪文スロットを消費することなく、第 3 レベルで各呪文を 1 回ずつ唱えることができます。これを行うと、短いまたは長い休憩が終了するまで、再度行うことはできません。
 Feature/&InvocationPoolWizardSignatureSpellsTitle=シグネチャースペル
 Feature/&MagicAffinityArchDruidDescription=Wildshape は無制限に使用できます。さらに、ドルイド呪文の言語的および身体的構成要素、およびコストがなく呪文によって消費されない物質的構成要素は無視できます。通常の姿とワイルドシェイプによる獣の姿の両方でこの恩恵が得られます。
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=17 レベルから
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=肉体的な完璧さ
 Feature/&PowerWarlockEldritchMasterDescription=消費した呪文スロットを取り戻すために守護者に懇願しながら、内なる神秘の力を引き出すことができます。 1 分間、守護者に助けを求めて懇願することで、契約魔法機能で消費したすべての呪文スロットを取り戻すことができます。 この機能で呪文スロットを取り戻したら、再びそうする前に長い休憩を終える必要があります。
 Feature/&PowerWarlockEldritchMasterTitle=異界のマスター
+Feature/&PowerWizardSignatureSpellsDescription=あなたは 2 つの強力な呪文を習得し、ほとんど努力せずにそれらを唱えることができます。魔法の書にある第 3 レベルのウィザードの呪文を 2 つ、シグネチャー呪文として選択します。これらの呪文は常に準備しており、準備した呪文の数にはカウントされません。また、呪文スロットを消費することなく、第 3 レベルで各呪文を 1 回ずつ唱えることができます。これを行うと、短いまたは長い休憩が終了するまで、再度行うことはできません。
+Feature/&PowerWizardSignatureSpellsTitle=シグネチャースペル
 Feature/&SenseRangerFeralSensesDescription=あなたは、目に見えない生き物と戦うのに役立つ超自然的な感覚を獲得します。あなたが目に見えないクリーチャーを攻撃するとき、それが見えないからといって、それに対するあなたの攻撃ロールに不利な点が課されることはありません。
 Feature/&SenseRangerFeralSensesTitle=野生の感覚
 Feedback/&AdditionalDamageBrutalAssaultFormat=残忍な襲撃！
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=1 Ki を支払うと 1 ヒット ポ
 Reaction/&UsePhysicalPerfectionReactDescription=1 Ki を支払うと 1 ヒット ポイントを回復できます。
 Reaction/&UsePhysicalPerfectionReactTitle=癒す
 Reaction/&UsePhysicalPerfectionTitle=肉体的な完璧さ
+RestActivity/&RestActivitySignatureSpellsDescription=シグネチャー呪文は 1 回選択できます。
+RestActivity/&RestActivitySignatureSpellsTitle=シグネチャースペル
+RestActivity/&RestActivitySpellMasteryDescription=長い休息が終わったら、マスタリー呪文のリストを変更できます。
+RestActivity/&RestActivitySpellMasteryTitle=スペルマスタリー
 Rules/&DamagePureDescription=被害者を内側から崩壊させる、知覚できない振動。
 Rules/&DamagePureTitle=純粋な
+Screen/&SignatureSpellsExtraSpellDescription=このシグネチャー呪文は常に準備されており、長い休息ごとに 1 回、レベルでキャストするときに呪文スロットを消費しません。
+Screen/&SignatureSpellsExtraSpellTitle=シグネチャースペル
+Screen/&SpellMasteryExtraSpellDescription=このマスタリー呪文は常に準備されており、レベルでキャストするときに呪文スロットを消費しません。
+Screen/&SpellMasteryExtraSpellTitle=スペルマスタリー
 Tooltip/&MustHaveQuiveringPalmCondition=震える手のひらの痕跡はありません
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Others-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Others-ja.txt
index 43c37ae914..1250b3614e 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Others-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Others-ja.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=ブルータルストライクの有効化
 Action/&BrutalStrikeToggleTitle=ブルータル・ストライク
 Action/&CastPlaneMagicDescription=Plane Touched の特技で得た呪文の 1 つを唱える
 Action/&CastPlaneMagicTitle=チャンネルプレーンマジック
-Action/&CastSignatureSpellsDescription=スロットを消費せずにこれらの第 3 レベルの呪文を唱える
-Action/&CastSignatureSpellsTitle=シグネチャースペル
-Action/&CastSpellMasteryDescription=スロットを消費せずに、第 1 レベルまたは第 2 レベルの準備された呪文を唱える
-Action/&CastSpellMasteryTitle=スペルマスタリー
 Action/&CoordinatedAssaultToggleDescription=連携攻撃の有効化/無効化
 Action/&CoordinatedAssaultToggleTitle=連携した攻撃
 Action/&CunningStrikeToggleDescription=Cunning Strikeの有効化/無効化
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=力
 UI/&CustomFeatureSelectionTooltipTypeProficiency=熟練度
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=好ましい敵
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=地形タイプの親和性
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=シグネチャースペル
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=魔術的な竜の祖先
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=武器訓練
 UI/&ForcePreferredCantripDescription=このトグルがオンの場合、優先キャントリップのみがトリガーされます。優先キャントリップが選択されていない場合は、このトグルに関係なく、最初の有効なキャントリップがトリガーされます。
diff --git a/SolastaUnfinishedBusiness/Translations/ja/Settings-ja.txt b/SolastaUnfinishedBusiness/Translations/ja/Settings-ja.txt
index 851dd0430a..8e615d9b70 100644
--- a/SolastaUnfinishedBusiness/Translations/ja/Settings-ja.txt
+++ b/SolastaUnfinishedBusiness/Translations/ja/Settings-ja.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=追加のアクションを持つ呪文をヘイスト
 ModUi/&AllowHornsOnAllRaces=すべての種族で角を許可<i><color=#F0DAA0>[種族、頭、角によってはひどい結果になる可能性があります]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=残りのパネルでより実際の状態を許可します<i><color=#F0DAA0>[前のパネルでは休憩後のアクションを非表示にし、後のパネルでは回復機能を非表示にします]</color></i>
 ModUi/&AllowStackedMaterialComponent=スタックされたマテリアル コンポーネントを許可します<i><color=#F0DAA0>[例: 2x500gp ダイヤモンドは 1000gp ダイヤモンドに相当します]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=<color=#D89555>チェインライトニング</color>呪文を唱えるときにターゲットの選択を許可する
 ModUi/&AllowUnmarkedSorcerers=起源のマークやタトゥーのない<color=#D89555>魔術師</color>を許可する
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=<color=#1E81B0>ALT</color> キーはパーティの視野内のガジェットのみを強調表示します<i><color=#F0DAA0>[カスタムダンジョンのみ]</color></i>
 ModUi/&ArcaneShieldstaffOptions=<color=#D89555>アルケイン・シールドスタッフ</color>をどのクラスでも調整できるようにする
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=プレイ可能なすべての
 ModUi/&DisableUnofficialTranslations=非公式翻訳サポートを無効にして MOD <i><color=#F0DAA0>[中国語、イタリア語、日本語、韓国語、またはスペイン語を話せない場合]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ レベルアップ中に他のクラスの既知の呪文をすべて表示</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ キャラクターパネルの代わりに呪文選択時に<color=#D89555>ウォーロック</color>の協定スロットを表示する</i>
-ModUi/&DocsArcaneShots=DOCS: アーケインショット
-ModUi/&DocsBackgrounds=DOCS: 背景
-ModUi/&DocsFeats=DOCS: 偉業
-ModUi/&DocsFightingStyles=DOCS: 戦闘スタイル
-ModUi/&DocsInfusions=DOCS: 輸液
-ModUi/&DocsInvocations=DOCS: 呼び出し
-ModUi/&DocsManeuvers=DOCS: 作戦
-ModUi/&DocsMetamagic=DOCS: メタマジック
-ModUi/&DocsRaces=DOCS: レース
-ModUi/&DocsSpells=DOCS: 呪文
-ModUi/&DocsSubclasses=DOCS: サブクラス
-ModUi/&DocsSubraces=DOCS: 亜人種
+ModUi/&DocsArcaneShots=アーケインショット
+ModUi/&DocsBackgrounds=背景
+ModUi/&DocsFeats=偉業
+ModUi/&DocsFightingStyles=戦闘スタイル
+ModUi/&DocsInfusions=輸液
+ModUi/&DocsInvocations=呼び出し
+ModUi/&DocsManeuvers=作戦
+ModUi/&DocsMetamagic=メタマジック
+ModUi/&DocsRaces=レース
+ModUi/&DocsSpells=呪文
+ModUi/&DocsSubclasses=サブクラス
+ModUi/&DocsSubraces=亜人種
+ModUi/&DocsVersatilities=多用途性
 ModUi/&Donate=<b><color=#D89555>寄付:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=グラフィック キャラクターにヘルメットを表示しない<b><i><color=#C04040E0>[再起動が必要]</color></i></b>
 ModUi/&DontEndTurnAfterReady=準備完了アクションを使用した後にターンを終了しない<i><color=#F0DAA0>[ボーナス アクション、またはヘイストやその他のソースからの追加のメイン アクションを使用できます]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=レベル 2 で<color=#D89555>ローグ</color>
 ModUi/&EnableRogueSteadyAim=クラスレベル3で<color=#D89555>ローグ</color>の<b>ステディエイム</b>を有効にする<i><color=#F0DAA0>[ボーナスアクションにより、現在のターンの次の攻撃ロールでアドバンテージが得られます。まだ移動していません]</color></i>
 ModUi/&EnableRogueStrSaving=<color=#D89555>ローグ</color>が<b>狡猾/悪魔の一撃</b>、<b>衰弱/改善された一撃</b>、<b>刃の雹でDEXまたはSTR修正を使用できるようにします</b>
 ModUi/&EnableSaveByLocation=キャンペーン/場所ごとの保存を有効にする
+ModUi/&EnableSignatureSpellsRelearn=<color=#D89555>ウィザード</color>の特徴的な呪文を<i><color=#F0DAA0>[レベル20で1回ではなく]長い休憩ごとに準備できるようにする</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Dungeon Maker エディターでアセットのソートを有効にする
 ModUi/&EnableStatsOnHeroTooltip=ヒーローのツールチップに統計情報を表示します <i><color=#F0DAA0>[例: クリティカル ヒット、クリティカル失敗など]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=。また、各ヒーローは少しランダム性を持たせるためにウェイトに D20 ロールを追加します。
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Feats/Group-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Feats/Group-ko.txt
index 438e272cea..48287e624a 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Feats/Group-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Feats/Group-ko.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=전투: 근접
 Feat/&FeatGroupOldTacticsDescription=힘이나 민첩 점수를 1씩 높이세요. 라운드당 한 번, 근접 무기 범위 내에 있는 엎드린 적이 일어설 때 목표에 대해 기회 공격을 할 수 있습니다.
 Feat/&FeatGroupOldTacticsTitle=오래된 전술
-Feat/&FeatGroupOrcishAggressionDescription=당신의 공격성은 지칠 줄 모르고 타오르고 있습니다. 다음과 같은 이점이 있습니다.\n• 힘이나 체력이 1씩 증가하여 최대 20까지 증가합니다.\n• 보너스 동작으로 주 손에 근접 무기를 휘두를 때 속도에 맞춰 충전할 수 있습니다. 원하는 적을 향해 주무기로 자유롭게 공격하세요.
+Feat/&FeatGroupOrcishAggressionDescription=당신의 공격성은 지칠 줄 모르고 타오르고 있습니다. 다음과 같은 이점이 있습니다.\n• 힘이나 체력이 1씩 증가하여 최대 20까지 증가합니다.\n• 보너스 동작으로 주 손에 근접 무기를 휘두르면 속도에 맞춰 충전할 수 있습니다. 원하는 적을 향해 주무기로 자유롭게 공격하세요. 이 기능은 긴 휴식마다 숙련도 보너스 횟수를 사용할 수 있습니다.
 Feat/&FeatGroupOrcishAggressionTitle=오크의 공격성
 Feat/&FeatGroupOrcishFuryDescription=당신의 분노는 끊임없이 타오르고 있습니다. 다음과 같은 이점이 있습니다.\n• 힘이나 체력이 1씩 증가하여 최대 20까지 증가합니다.\n• 단순 또는 군용 무기로 공격을 가할 때 무기의 다음 중 하나를 굴릴 수 있습니다. 피해 주사위를 한 번 더 추가하고 이를 무기 피해 유형의 추가 피해로 추가합니다. 이 능력을 사용하면 짧거나 긴 휴식을 마칠 때까지 다시 사용할 수 없습니다.\n• 냉혹한 인내 특성을 사용한 직후 반응을 사용하여 한 번의 무기 공격을 할 수 있습니다.
 Feat/&FeatGroupOrcishFuryTitle=오크의 분노
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Feats/MeleeCombat-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Feats/MeleeCombat-ko.txt
index b96c8eb096..ba51ef8b9c 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Feats/MeleeCombat-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Feats/MeleeCombat-ko.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=당신은 적을 분쇄하는 기술을 익히
 Feat/&FeatCrusherConTitle=크러셔 [콘]
 Feat/&FeatCrusherStrDescription=당신은 적을 분쇄하는 기술을 익히고 있습니다. 힘을 1 증가시켜 최대 20까지 증가시킵니다. 곤봉 피해를 주는 공격으로 생물을 공격하면 턴당 한 번 적을 5피트만큼 밀어냅니다. 당신이 치명타를 기록하면 해당 생물에 대한 공격 굴림은 다음 턴이 시작될 때까지 유리하게 이루어집니다.
 Feat/&FeatCrusherStrTitle=크러셔 [Str]
-Feat/&FeatDefensiveDuelistDescription=당신이 능숙한 기교 무기를 휘두르고 있을 때 다른 생물이 근접 공격으로 당신을 공격할 때, 당신은 반응을 사용하여 해당 공격에 대한 AC에 숙련도 보너스를 추가할 수 있으며 잠재적으로 공격이 당신을 놓칠 수 있습니다.
+Feat/&FeatDefensiveDuelistDescription=당신이 능숙한 근접 무기를 휘두르고 있을 때 다른 생물이 근접 공격으로 당신을 공격할 때, 당신은 당신의 반응을 사용하여 해당 공격에 대한 AC에 숙련도 보너스를 추가할 수 있으며 잠재적으로 공격이 당신을 놓칠 수 있습니다.
 Feat/&FeatDefensiveDuelistTitle=방어형 결투사
 Feat/&FeatFellHandedDescription=당신은 손도끼, 전투도끼, 거대도끼, 워해머, 망치를 마스터합니다. 이들 중 하나를 사용하면 다음과 같은 이점을 얻을 수 있습니다.\n• 무기로 하는 공격 굴림에 +1 보너스.\n• 근접 공격 굴림에서 이점을 얻고 명중할 때마다 다음과 같은 경우 대상을 쓰러뜨립니다. 두 개의 d20 굴림 중 낮은 쪽도 대상에 맞을 것입니다.\n• 근접 공격 굴림에서 불이익을 받고 빗나갈 때마다 두 개의 d20 굴림 중 더 높은 쪽이 대상을 명중할 경우 대상은 힘 수정치와 동일한 강타 피해를 입습니다. .
 Feat/&FeatFellHandedTitle=쓰러진 손
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Feats/OtherFeats-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Feats/OtherFeats-ko.txt
index 58850420ea..2ff751dbf4 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Feats/OtherFeats-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Feats/OtherFeats-ko.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=체력을 1 올려 최대 20까지 높입니다.\n1
 Feat/&FeatChefConTitle=셰프 [함께]
 Feat/&FeatChefWisDescription=지혜가 1 증가하여 최대 20까지 증가합니다.\n1시간 동안 식사를 요리하여 자신과 동료의 체력을 1d8만큼 치유할 수 있습니다.\n하루에 한 번, 한 시간 동안 요리를 할 수 있습니다. 먹으면 일시적으로 5 HP를 제공하는 숙련도 보너스와 동일한 간식입니다.
 Feat/&FeatChefWisTitle=셰프 [위스]
-Feat/&FeatCriticalVirtuosoDescription=중요 임계값이 1만큼 낮아졌습니다.
 Feat/&FeatDungeonDelverDescription=많은 던전에서 발견되는 숨겨진 함정과 비밀 문을 경계하면 다음과 같은 이점을 얻을 수 있습니다.\n• 지혜(지각) 및 지능(조사) 판정에 이점이 있습니다.\n• 다음의 내성 굴림에 이점이 있습니다. 함정을 피하거나 저항하십시오.\n• 함정으로 인한 피해에 대한 저항력이 있습니다.\n• 빠른 속도로 이동해도 패시브 지혜(지각) 점수에 일반 -5 페널티가 부과되지 않습니다.
 Feat/&FeatDungeonDelverTitle=던전탐험가
 Feat/&FeatEldritchAdeptDescription=흑마법사 클래스에서 원하는 Eldritch Invocation 옵션 하나를 배웁니다. 호출에 전제 조건이 있는 경우, 당신이 흑마법사이고 전제 조건을 충족하는 경우에만 해당 호출을 선택할 수 있습니다. 레벨이 오를 때마다 호출을 흑마법사 클래스의 다른 호출로 대체할 수 있습니다.
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Feats/Races-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Feats/Races-ko.txt
index abec1fac62..d7bf0c2153 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Feats/Races-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Feats/Races-ko.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=당신은 특정 종류의 생물에 대해
 Feat/&FeatGrudgeBearerWisTitle=원한을 품은 자 [위스]
 Feat/&FeatInfernalConstitutionDescription=당신 안에는 사악한 피가 강하게 흐르고, 일부 악마가 소유한 것과 유사한 회복력을 발휘합니다. 다음과 같은 이점이 있습니다.\n• 건강 점수가 1 증가하여 최대 20이 됩니다.\n• 냉기 및 독 피해에 대한 저항력이 있습니다.\n• 중독에 대한 내성 굴림에 이점이 있습니다.
 Feat/&FeatInfernalConstitutionTitle=지옥의 헌법
-Feat/&FeatOrcishAggressionConDescription=당신의 공격성은 지칠 줄 모르고 타오르고 있습니다. 다음과 같은 이점을 얻을 수 있습니다.\n• 체력을 1 증가시켜 최대 20까지 증가시킵니다.\n• 보너스 액션으로 근접 무기를 주손으로 휘두를 때 속도에 맞춰 충전할 수 있습니다. 당신이 선택한 적을 선택하고 주 무기로 생물을 자유롭게 공격하십시오.
+Feat/&FeatOrcishAggressionConDescription=당신의 공격성은 지칠 줄 모르고 타오르고 있습니다. 다음과 같은 이점을 얻을 수 있습니다.\n• 체력을 1 증가시켜 최대 20까지 증가시킵니다.\n• 보너스 액션으로 근접 무기를 주손으로 휘두를 때 속도에 맞춰 충전할 수 있습니다. 당신이 선택한 적을 선택하고 주 무기로 생물을 자유롭게 공격하십시오. 이 기능은 긴 휴식마다 숙련도 보너스 횟수를 사용할 수 있습니다.
 Feat/&FeatOrcishAggressionConTitle=오크 공격성 [반대]
-Feat/&FeatOrcishAggressionDescription=당신의 공격성은 지칠 줄 모르고 타오르고 있습니다. 다음과 같은 이점이 있습니다.\n• 힘이 1 증가하여 최대 20까지 증가합니다.\n• 보너스 동작으로 주 손에 근접 무기를 휘두를 때 속도에 맞춰 최대 속도로 충전할 수 있습니다. 당신이 선택한 적을 선택하고 주 무기로 생물을 자유롭게 공격하십시오.
+Feat/&FeatOrcishAggressionDescription=당신의 공격성은 지칠 줄 모르고 타오르고 있습니다. 다음과 같은 이점이 있습니다.\n• 힘이 1 증가하여 최대 20까지 증가합니다.\n• 보너스 액션으로 주 손에 근접 무기를 휘두를 때 속도에 맞춰 최대 속도로 충전할 수 있습니다. 당신이 선택한 적을 선택하고 주 무기로 생물을 자유롭게 공격하십시오. 이 기능은 긴 휴식마다 숙련도 보너스 횟수를 사용할 수 있습니다.
 Feat/&FeatOrcishAggressionTitle=오크 공격성 [Str]
 Feat/&FeatOrcishFuryConDescription=당신의 분노는 끊임없이 타오르고 있습니다. 다음과 같은 이점을 얻습니다.\n• 체력이 1 증가하여 최대 20까지 증가합니다.\n• 단순 또는 군용 무기로 공격을 가하면 해당 무기의 피해 주사위 중 하나를 굴릴 수 있습니다. 추가 시간을 부여하고 이를 무기 피해 유형의 추가 피해로 추가합니다. 이 능력을 사용하면 짧거나 긴 휴식을 마칠 때까지 다시 사용할 수 없습니다.\n• 냉혹한 인내 특성을 사용한 직후 반응을 사용하여 한 번의 무기 공격을 할 수 있습니다.
 Feat/&FeatOrcishFuryConTitle=오크 퓨리 [콘]
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Feats/RangedCombat-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Feats/RangedCombat-ko.txt
index 48eb6bfb45..bcc6f7837d 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Feats/RangedCombat-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Feats/RangedCombat-ko.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=당신은 다음 공격 
 Condition/&ConditionFeatSteadyAimAdvantageTitle=꾸준한 목표
 Condition/&ConditionFeatSteadyAimRestrainedDescription=자신의 턴이 끝날 때까지 이동할 수 없습니다.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=꾸준한 조준으로 제지됨
-Feat/&FeatBowMasteryDescription=전문적인 활 훈련을 통해 다음과 같은 이점을 얻을 수 있습니다.\n• 단궁과 장궁의 피해 판정에 +1 보너스를 얻습니다.\n• 자신의 차례에 단궁과 함께 공격 행동을 사용하면 다음과 같은 결과를 얻을 수 있습니다. 원거리 무기 공격 한 번을 보너스 액션으로 하여 데미지에 속성 수정치를 추가합니다.\n• 장궁으로 하는 공격 및 데미지 굴림에 민첩 대신 힘을 사용할 수 있습니다.
+Feat/&FeatBowMasteryDescription=자신의 차례에 활을 사용하여 공격 행동을 사용하면 보너스 행동으로 원거리 무기 공격을 한 번 할 수 있으며 피해에 속성 수정치를 추가할 수 있습니다.
 Feat/&FeatBowMasteryTitle=활 마스터리
-Feat/&FeatCrossbowMasteryDescription=석궁에 대한 전문적인 훈련을 통해 다음과 같은 이점을 얻을 수 있습니다.\n• 무거운 석궁, 가벼운 석궁, 손 석궁으로 하는 피해 굴림에 +1 보너스를 얻습니다.\n• 가벼운 석궁이나 손 석궁을 켠 상태에서 공격 행동을 사용할 때 자신의 차례에는 보너스 행동으로 원거리 무기 공격을 한 번 할 수 있으며 피해에 속성 수정자를 추가할 수 있습니다.\n• 무거운 석궁으로 하는 공격 및 피해 굴림에 민첩 대신 힘을 사용할 수 있습니다.
+Feat/&FeatCrossbowMasteryDescription=당신의 차례에 석궁으로 공격 행동을 사용할 때, 당신은 보너스 행동으로 원거리 무기 공격을 한 번 할 수 있으며 피해에 속성 수정치를 추가할 수 있습니다.
 Feat/&FeatCrossbowMasteryTitle=석궁 마스터리
 Feat/&FeatDeadeyeDescription=더 치명적인 사격을 위해 정확도를 교환하는 방법을 배웠습니다.\n• 원거리 무기로 공격할 때 추가로 +10 피해를 입히기 위해 명중률에 -5 페널티를 받는 것을 선택할 수 있습니다.\n• 공격 시 장거리는 불이익을 주지 않으며 원거리 무기 공격은 절반 엄폐와 3/4 엄폐를 무시합니다.
 Feat/&FeatDeadeyeTitle=명사수
diff --git a/SolastaUnfinishedBusiness/Translations/ko/FightingStyles-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/FightingStyles-ko.txt
index b9456fbc44..45f9c9f708 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/FightingStyles-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/FightingStyles-ko.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=치명적인 손상!
 Feedback/&AdditionalDamageCripplingLine={1}이 심각한 피해를 입었습니다.
 Feedback/&AdditionalDamageExecutionerFormat=실행!
 Feedback/&AdditionalDamageExecutionerLine={0}는 +{2}의 추가 피해를 위해 {1}을 실행합니다!
+FightingStyle/&AstralReachDescription=비무장 타격 범위가 5피트 증가합니다.
+FightingStyle/&AstralReachTitle=아스트랄 리치
 FightingStyle/&BlindFightingDescription=당신은 10피트 범위의 맹인 시야를 가지고 있습니다. 그 범위 내에서는 눈이 멀거나 어둠 속에 있더라도 전체 덮개 뒤에 있지 않은 모든 것을 효과적으로 볼 수 있습니다. 더욱이, 그 생물이 당신에게서 성공적으로 숨지 않는 한, 당신은 그 범위 안에 있는 보이지 않는 생물을 볼 수 있습니다.
 FightingStyle/&BlindFightingTitle=맹목적인 싸움
-FightingStyle/&CripplingDescription=근접 공격을 가하면 상대방의 속도를 10피트만큼 감소시키고 다음 턴이 끝날 때까지 상대방의 방어구 등급을 1만큼 줄일 수 있습니다.
+FightingStyle/&CripplingDescription=근접 공격 공격으로 다음 턴이 끝날 때까지 상대방의 속도를 10피트만큼 줄입니다.
 FightingStyle/&CripplingTitle=마비
 FightingStyle/&ExecutionerDescription=당신은 눈이 멀거나, 겁에 질리거나, 제지되거나, 무력화되거나, 마비되거나, 쓰러지거나 기절한 생물에 대한 피해에 숙련도 보너스를 추가합니다.
 FightingStyle/&ExecutionerTitle=실행자
-FightingStyle/&HandAndAHalfDescription=근접 한손 또는 다용도 무기를 휘두르고 다른 무기나 방패를 사용하지 않는 동안 해당 무기의 공격 굴림에 +1 보너스를 받고 방어구 등급에 +1을 얻습니다.
+FightingStyle/&HandAndAHalfDescription=당신은 근접 한손 또는 다용도 무기를 휘두르며 다른 무기나 방패를 사용하지 않는 동안 공격 굴림에 +1 보너스를 받고 방어구 클래스에 +1 보너스를 받습니다.
 FightingStyle/&HandAndAHalfTitle=고전 검술
 FightingStyle/&InterceptionDescription=당신이 볼 수 있는 생물이 공격으로 당신이 아닌 당신으로부터 5피트 이내에 있는 목표를 공격할 때, 당신은 반응을 사용하여 목표가 받는 피해를 1d10 + 당신의 숙련 보너스만큼 줄일 수 있습니다. 이 반응을 사용하려면 방패나 단순 무기 또는 군용 무기를 휘두르어야 합니다.
 FightingStyle/&InterceptionTitle=차단
-FightingStyle/&LungerDescription=무거운 꼬리표와 자유로운 보조 손 없이 단 하나의 근접 무기만 휘두르는 동안 해당 무기의 사거리는 5피트 증가합니다.
+FightingStyle/&LungerDescription=무거운 태그가 없고 다른 무기나 방패가 없는 무기를 휘두르는 동안 근접 무기의 도달 범위가 5피트 증가합니다.
 FightingStyle/&LungerTitle=폐
 FightingStyle/&MercilessDescription=당신의 차례에 근접 무기 공격을 사용하여 목표를 0 HP로 줄이면, 목표를 볼 수 있는 숙련도 보너스(반올림)의 절반에 해당하는 쓰러진 목표 반경 내의 적들은 지혜 내성(DC 8 + 숙련 보너스 + 힘 수정치) 또는 다음 턴이 끝날 때까지 당신을 두려워하게 됩니다. 유발 공격이 치명타인 경우 반경은 대신 숙련도 보너스와 같습니다.
 FightingStyle/&MercilessTitle=무자비한
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=당신은 방패 숙련도를 얻으
 FightingStyle/&MonkShieldExpertTitle=수도원 방패 훈련
 FightingStyle/&PolearmExpertDescription=폴암을 이용한 전문 훈련을 통해 다음과 같은 이점을 얻을 수 있습니다.\n• 공격 액션을 취하고 폴암 무기로만 공격할 때 보너스 액션을 사용하여 무기의 반대쪽 끝으로 근접 공격을 할 수 있습니다. 이 공격은 기본 공격과 동일한 능력 수정자를 사용하고 1d4의 타격 피해를 줍니다.\n• 다른 생물이 장창 무기를 휘두르며 도달 범위에 들어오면 기회 공격을 유발합니다.
 FightingStyle/&PolearmExpertTitle=폴암 마스터
-FightingStyle/&PugilistDescription=비무장 공격은 추가로 1d4의 타격 피해를 입히고 보너스 행동으로 오프핸드로 펀치를 날릴 수 있습니다. 프리핸드가 있다면 보너스 액션으로 쇼브를 할 수 있습니다.
+FightingStyle/&PugilistDescription=비무장 공격은 추가로 1d4의 타격 피해를 입히고, 보너스 행동으로 오프핸드로 펀치를 날릴 수 있습니다. 다른 무기나 방패가 없다면 보너스 액션으로 밀쳐낼 수 있습니다.
 FightingStyle/&PugilistTitle=권투 선수
 FightingStyle/&RemarkableTechniqueDescription=기동이라고 하는 특별한 전투 기술을 수행할 수 있는 무술 훈련이 있습니다.\n• 배틀마스터 하위 클래스에서 원하는 기동 하나를 배웁니다. 이러한 기동의 기동 DC는 8 + 숙련도 보너스 + 힘 또는 민첩 수정치 중 더 높은 값입니다.\n• 우월성 주사위 1개를 얻습니다. 주사위는 d6이며 배틀마스터가 아닌 경우 크기가 증가하지 않습니다. 이 주사위는 당신의 기동에 연료를 공급하는 데 사용됩니다. 사용하면 소모되며, 짧거나 긴 휴식을 마치면 회복됩니다.
 FightingStyle/&RemarkableTechniqueTitle=우수한 기술
-FightingStyle/&RopeItUpDescription=던진 공격은 공격 및 피해 굴림에 +1을 얻고, 장거리 및 단거리 모두 10피트 증가하며, 던진 공격을 하는 데 사용된 직후 손으로 돌아옵니다.
-FightingStyle/&RopeItUpTitle=로프 잇 업
+FightingStyle/&RopeItUpDescription=투척 무기로 원거리 공격을 할 때, 짧은 범위는 10피트, 긴 범위는 20피트 증가합니다. 또한, 투척 공격에 사용된 무기는 즉시 손으로 돌아옵니다.
+FightingStyle/&RopeItUpTitle=투척무기 마스터
 FightingStyle/&SentinelDescription=적의 가드에 있는 모든 드롭을 활용할 수 있는 기술을 익혔습니다.\n• 기회 공격으로 생물을 공격하면 해당 턴의 나머지 기간 동안 생물의 속도가 0이 됩니다.\n• 생물은 다음과 같은 기회 공격을 유발합니다. 그들이 당신의 손이 닿는 곳을 떠나기 전에 분리 행동을 취하더라도 당신은 당신입니다.\n• 생물이 당신이 아닌 대상을 공격할 때 당신의 반응을 사용하여 공격하는 생물에 대한 근접 무기 공격을 가할 수 있습니다.
 FightingStyle/&SentinelTitle=보초
-FightingStyle/&ShieldExpertDescription=당신은 방패를 무기로 사용하는 방법을 훈련받았습니다. 1d4의 타격 피해를 입히는 숙련된 근접 무기가 됩니다. 방패를 휘두르는 동안 밀치기 시도에 이점을 얻습니다.
-FightingStyle/&ShieldExpertTitle=쉴드 전문가
-FightingStyle/&TorchbearerDescription=당신은 전투에서 횃불을 사용하는 데 능숙합니다. 턴당 한 번, 보너스 액션으로 당신은 당신이 접촉할 수 있는 적을 불태우기 위해 장착한 광원을 사용하도록 선택할 수 있습니다. 당신의 목표는 민첩 내성 굴림(DC 8 + 숙련 보너스 + 민첩 수정치)에 성공하거나 1분 동안 또는 꺼질 때까지 턴당 1d4 화염 피해를 입어야 합니다.
+FightingStyle/&ShieldExpertDescription=보너스 액션을 사용하여 방패를 사용하여 생물을 강타하여 순간적으로 능숙한 특별한 즉석 무기로 바꿀 수 있습니다. 공격에 힘 수정치를 사용하여 5피트 이내에 있는 생물에 대해 근접 무기 공격을 가하십시오. 명중하면 생물은 1d4 + 힘 수정치를 강타 피해로 입습니다.
+FightingStyle/&ShieldExpertTitle=방패 강타
+FightingStyle/&TorchbearerDescription=보너스 액션으로, 당신은 당신이 접촉할 수 있는 적을 불태우기 위해 장착한 광원을 사용하도록 선택할 수 있습니다. 당신의 목표는 민첩 내성 굴림(DC 8 + 숙련 보너스 + 민첩 수정치)에 성공하거나 1분 동안 또는 꺼질 때까지 턴당 1d4 화염 피해를 입어야 합니다.
 FightingStyle/&TorchbearerTitle=선구자
 FightingStyle/&ZenArcherDescription=활을 사용할 때 직관이 손을 안내합니다. 지혜 속성을 1씩 최대 20까지 높이십시오. 이 무기의 공격 및 피해 굴림에 민첩 수정치 대신 지혜 수정치를 사용할 수 있습니다.
 FightingStyle/&ZenArcherTitle=현명한 양궁
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Level20-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Level20-ko.txt
index ed4aaf1a8c..f240aeaf8c 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Level20-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Level20-ko.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=17레벨부터 다음
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=빛의 순수성
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=17레벨부터 당신은 누군가의 몸에 치명적인 진동을 설정하는 능력을 얻습니다. 비무장 공격으로 생명체를 공격할 때 Ki 포인트 3개를 소비하여 24시간 동안 지속되는 감지할 수 없는 진동을 시작할 수 있습니다. 진동을 끝내기 위해 행동을 사용하지 않는 한 진동은 무해합니다. 당신이 이 행동을 사용할 때, 생물은 건강 내성 굴림을 해야 합니다. 실패하면 체력이 1로 감소하고 다음 턴이 시작될 때까지 기절합니다. 성공하면 10d10의 괴사 피해를 입습니다.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=떨리는 손바닥
+Feature/&FeatureWizardSpellMasteryDescription=당신은 특정 주문을 마음대로 시전할 수 있을 정도로 숙달되었습니다. 주문서에 있는 1레벨 또는 2레벨 마법사 주문 두 개를 선택하세요. 해당 주문을 준비하면 주문 슬롯을 소모하지 않고도 가장 낮은 레벨에서 해당 주문을 시전할 수 있습니다. 더 높은 레벨에서 두 주문 중 하나를 시전하려면 평소와 같이 주문 슬롯을 소비해야 합니다.
+Feature/&FeatureWizardSpellMasteryTitle=주문 숙달
 Feature/&GrantInvocationsSpellMasteryDescription=당신은 특정 주문을 마음대로 시전할 수 있을 정도로 숙달되었습니다. 준비한 처음 두 개의 1레벨 및 2레벨 마법사 주문은 주문 슬롯을 확장하지 않고도 가장 낮은 레벨에서 시전할 수 있습니다. 더 높은 레벨에서 두 주문 중 하나를 시전하려면 평소와 같이 주문 슬롯을 소비해야 합니다.
 Feature/&GrantInvocationsSpellMasteryTitle=주문 마스터리
-Feature/&InvocationPoolSignatureSpellsLearnDescription=배우고 싶은 시그니처 주문을 선택하세요.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=시그니처 주문
 Feature/&InvocationPoolWizardSignatureSpellsDescription=당신은 두 가지 강력한 주문에 대한 숙달을 얻고 약간의 노력만으로도 시전할 수 있습니다. 3레벨 마법사 주문 두 개를 대표 주문으로 선택하세요. 당신은 항상 이 주문을 준비하고 있으며, 당신이 준비한 주문 수에 포함되지 않으며, 3레벨에서 주문 슬롯을 소비하지 않고 각 주문을 한 번씩 시전할 수 있습니다. 그렇게 하면 짧거나 긴 휴식을 마칠 때까지 다시 그렇게 할 수 없습니다.
 Feature/&InvocationPoolWizardSignatureSpellsTitle=시그니처 주문
 Feature/&MagicAffinityArchDruidDescription=Wildshape를 무제한으로 사용할 수 있습니다. 또한, 드루이드 주문의 언어적, 신체적 구성 요소는 물론 비용이 부족하고 주문에 의해 소모되지 않는 물질적 구성 요소도 무시할 수 있습니다. Wildshape의 일반 형태와 짐승 형태 모두에서 이러한 이점을 얻을 수 있습니다.
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=17레벨부터 다
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=육체적 완벽함
 Feature/&PowerWarlockEldritchMasterDescription=당신은 후원자에게 소모된 주문 슬롯을 되찾도록 간청하면서 내면의 신비한 힘을 끌어낼 수 있습니다. Pact Magic 기능에서 소모된 모든 주문 슬롯을 되찾기 위해 1분 동안 후원자에게 도움을 청할 수 있습니다. 이 기능으로 주문 슬롯을 다시 확보한 후에는 다시 그렇게 하기 전에 긴 휴식을 마쳐야 합니다.
 Feature/&PowerWarlockEldritchMasterTitle=엘드리치 마스터
+Feature/&PowerWizardSignatureSpellsDescription=당신은 두 가지 강력한 주문에 대한 숙달을 얻고 약간의 노력만으로도 시전할 수 있습니다. 주문서에서 두 개의 3레벨 마법사 주문을 서명 주문으로 선택하세요. 당신은 항상 이 주문을 준비하고 있으며, 당신이 준비한 주문 수에 포함되지 않으며, 3레벨에서 주문 슬롯을 소비하지 않고 각 주문을 한 번씩 시전할 수 있습니다. 그렇게 하면 짧거나 긴 휴식을 마칠 때까지 다시 그렇게 할 수 없습니다.
+Feature/&PowerWizardSignatureSpellsTitle=시그니처 주문
 Feature/&SenseRangerFeralSensesDescription=당신은 볼 수 없는 생물과 싸우는 데 도움이 되는 초자연적인 감각을 얻습니다. 당신이 볼 수 없는 생물을 공격할 때, 당신이 그것을 볼 수 없다는 것이 그 생물에 대한 공격 굴림에 불이익을 가하지 않습니다.
 Feature/&SenseRangerFeralSensesTitle=야생 감각
 Feedback/&AdditionalDamageBrutalAssaultFormat=잔인한 공격!
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=1Ki를 지불하면 1HP를 회복할
 Reaction/&UsePhysicalPerfectionReactDescription=1Ki를 지불하면 1HP를 회복할 수 있습니다.
 Reaction/&UsePhysicalPerfectionReactTitle=치유하다
 Reaction/&UsePhysicalPerfectionTitle=육체적 완벽함
+RestActivity/&RestActivitySignatureSpellsDescription=시그니처 주문은 한 번만 선택할 수 있습니다.
+RestActivity/&RestActivitySignatureSpellsTitle=시그니처 주문
+RestActivity/&RestActivitySpellMasteryDescription=긴 휴식을 마친 후 마스터리 주문 목록을 변경할 수 있습니다.
+RestActivity/&RestActivitySpellMasteryTitle=주문 숙달
 Rules/&DamagePureDescription=피해자를 내부에서 분해하는 감지할 수 없는 진동.
 Rules/&DamagePureTitle=순수한
+Screen/&SignatureSpellsExtraSpellDescription=이 시그니처 주문은 항상 준비되어 있으며 긴 휴식마다 한 번씩 레벨에서 시전할 때 주문 슬롯을 소모하지 않습니다.
+Screen/&SignatureSpellsExtraSpellTitle=시그니처 주문
+Screen/&SpellMasteryExtraSpellDescription=이 마스터리 주문은 항상 준비되어 있으며 레벨에서 시전할 때 주문 슬롯을 소모하지 않습니다.
+Screen/&SpellMasteryExtraSpellTitle=주문 숙달
 Tooltip/&MustHaveQuiveringPalmCondition=떨리는 손바닥으로 표시되지 않음
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Others-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Others-ko.txt
index 8908de3f61..c4ad64a478 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Others-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Others-ko.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=잔혹한 일격 활성화/비활성화
 Action/&BrutalStrikeToggleTitle=잔인한 일격
 Action/&CastPlaneMagicDescription=Plane Touched feats에서 얻은 주문 중 하나를 시전하세요.
 Action/&CastPlaneMagicTitle=채널 평면 매직
-Action/&CastSignatureSpellsDescription=슬롯을 소비하지 않고 이 3레벨 주문을 시전하세요
-Action/&CastSignatureSpellsTitle=시그니처 주문
-Action/&CastSpellMasteryDescription=슬롯을 소비하지 않고 1레벨 또는 2레벨 준비된 주문을 시전하세요.
-Action/&CastSpellMasteryTitle=주문 마스터리
 Action/&CoordinatedAssaultToggleDescription=협력 공격 활성화/비활성화
 Action/&CoordinatedAssaultToggleTitle=협력 공격
 Action/&CunningStrikeToggleDescription=커닝 스트라이크 활성화/비활성화
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=힘
 UI/&CustomFeatureSelectionTooltipTypeProficiency=진보
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=선호하는 적
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=지형 유형 선호도
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=시그니처 스펠
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=마법의 용족 조상
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=무기 훈련
 UI/&ForcePreferredCantripDescription=이것이 ON으로 전환되면 기본 캔트립만 트리거될 수 있습니다. 기본 캔트립을 선택하지 않은 경우 이 토글에 관계없이 첫 번째 유효한 캔트립이 트리거됩니다.
diff --git a/SolastaUnfinishedBusiness/Translations/ko/Settings-ko.txt b/SolastaUnfinishedBusiness/Translations/ko/Settings-ko.txt
index 6dd76850fc..113e55da31 100644
--- a/SolastaUnfinishedBusiness/Translations/ko/Settings-ko.txt
+++ b/SolastaUnfinishedBusiness/Translations/ko/Settings-ko.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=가속화 주문의 효과로 얻은 행동으로 주
 ModUi/&AllowHornsOnAllRaces=모든 종족이 뿔을 만들 수 있게 허용 <i><color=#F0DAA0>[경우에 따라 끔찍한 몰골이 만들어질 수도 있음]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=휴식 패널에서 더 많은 행동 허용 <i><color=#F0DAA0>[이전 패널에서는 휴식 행동 후 패널이 숨겨졌지만 회복 특성을 더 사용할 수 있게 합니다]</color></i>
 ModUi/&AllowStackedMaterialComponent=재료 요소 중첩 허용 <i><color=#F0DAA0>[예: 2x500gp 다이아몬드는 1000gp 다이아몬드와 동일]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=<color=#D89555>연쇄 번개</color> 주문 시전 시 대상을 선택할 수 있게 허용
 ModUi/&AllowUnmarkedSorcerers=기원 및 문신이 없는 <color=#D89555>소서러</color> 허용
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=<color=#1E81B0>ALT</color> 키는 파티 시야에 있는 물체만 강조 표시합니다 <i><color=#F0DAA0>[사용자 지정 던전만 해당]</color></i>
 ModUi/&ArcaneShieldstaffOptions=모든 직업이 <color=#D89555>비전 보호 스태프</color>를 조율할 수 있도록 허용
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=플레이 가능한 모든 종
 ModUi/&DisableUnofficialTranslations=비공식 번역 지원을 비활성화하여 모드 속도 향상 <i><color=#F0DAA0>[한국어, 일본어, 중국어, 이탈리아어, 스페인어 사용자가 아닐 경우 체크]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ 레벨업 중 다른 직업의 모든 알려진 주문 표시</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ 캐릭터 패널 대신 주문 선택 시 <color=#D89555>워락</color> 계약 슬롯을 표시</i>
-ModUi/&DocsArcaneShots=DOCS: 신비한 사격
-ModUi/&DocsBackgrounds=문서: 배경
-ModUi/&DocsFeats=문서: 업적
-ModUi/&DocsFightingStyles=문서: 격투 스타일
-ModUi/&DocsInfusions=문서: 주입
-ModUi/&DocsInvocations=문서: 호출
-ModUi/&DocsManeuvers=문서: 기동
-ModUi/&DocsMetamagic=문서: 메타매직
-ModUi/&DocsRaces=문서: 경주
-ModUi/&DocsSpells=문서: 주문
-ModUi/&DocsSubclasses=DOCS: 서브클래스
-ModUi/&DocsSubraces=문서: 하위 경주
+ModUi/&DocsArcaneShots=신비한 사격
+ModUi/&DocsBackgrounds=배경
+ModUi/&DocsFeats=업적
+ModUi/&DocsFightingStyles=격투 스타일
+ModUi/&DocsInfusions=주입
+ModUi/&DocsInvocations=호출
+ModUi/&DocsManeuvers=기동
+ModUi/&DocsMetamagic=메타매직
+ModUi/&DocsRaces=경주
+ModUi/&DocsSpells=주문
+ModUi/&DocsSubclasses=서브클래스
+ModUi/&DocsSubraces=하위 경주
+ModUi/&DocsVersatilities=다양성
 ModUi/&Donate=<b><color=#D89555>후원하기:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=캐릭터 모델링에 머리 방어구 표시 안 함 <b><i><color=#C04040E0>[재시작 필요]</color></i></b>
 ModUi/&DontEndTurnAfterReady=준비 액션을 사용한 후 턴을 종료하지 않음 <i><color=#F0DAA0>[추가 행동 또는 이동이나 다른 출처의 기타 행동을 사용할 수 있습니다]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=레벨 2에서 <color=#D89555>도적</color> <b>
 ModUi/&EnableRogueSteadyAim=클래스 레벨 3에서 <color=#D89555>도적</color> <b>고정 조준</b>을 활성화하세요. <i><color=#F0DAA0>[다음 경우에 보너스 행동은 현재 턴의 다음 공격 굴림에 이점을 줍니다. 아직 움직이지 않았습니다]</color></i>
 ModUi/&EnableRogueStrSaving=<color=#D89555>도적</color>을 활성화하여 <b>교활한/악마의 일격</b>, <b>약화/개선된 일격</b> 및 <b>칼날비에 DEX 또는 STR 수정자를 사용하세요. </b>
 ModUi/&EnableSaveByLocation=캠페인/위치별 저장 활성화
+ModUi/&EnableSignatureSpellsRelearn=긴 휴식마다 준비되도록 <color=#D89555>마법사</color> 시그니처 주문을 활성화하세요. <i><color=#F0DAA0>[레벨 20에 한 번이 아닌]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=던전 만들기 편집기에서 에셋 정렬 활성화
 ModUi/&EnableStatsOnHeroTooltip=영웅의 툴팁에 통계 표시 <i><color=#F0DAA0>[예: 치명타, 치명타 실패 등]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=• 또한 각 영웅은 약간의 무작위성을 위해 D20 롤을 가중치에 추가합니다.
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Group-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Group-pt-BR.txt
index 0da2dbf485..aedc70ab03 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Group-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Group-pt-BR.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Combate: corpo a corpo
 Feat/&FeatGroupOldTacticsDescription=Aumente sua Força ou Destreza em 1. Uma vez por rodada, quando um inimigo caído dentro do alcance de sua arma corpo-a-corpo se levantar, você poderá realizar um ataque de oportunidade contra o alvo.
 Feat/&FeatGroupOldTacticsTitle=Táticas Antigas
-Feat/&FeatGroupOrcishAggressionDescription=Sua agressão queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Força ou Constituição em 1, até um máximo de 20.\n• Como ação bônus, ao empunhar uma arma corpo a corpo na mão principal, você pode investir até seu deslocamento. em direção a um inimigo de sua escolha e ataque livremente a criatura com sua arma principal.
+Feat/&FeatGroupOrcishAggressionDescription=Sua agressão queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Força ou Constituição em 1, até um máximo de 20.\n• Como ação bônus, ao empunhar uma arma corpo a corpo na mão principal, você pode investir até seu deslocamento. em direção a um inimigo de sua escolha e ataque livremente a criatura com sua arma principal. Este recurso pode ser usado vezes bônus de proficiência por descanso longo.
 Feat/&FeatGroupOrcishAggressionTitle=Agressão Orc
 Feat/&FeatGroupOrcishFuryDescription=Sua fúria queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Força ou Constituição em 1, até um máximo de 20.\n• Ao acertar um ataque feito com uma arma simples ou marcial, você pode rolar um dos atributos da arma. dados de dano uma vez adicional e adicione-o como dano extra ao tipo de dano da arma. Depois de usar essa habilidade, você não poderá usá-la novamente até terminar um descanso curto ou longo.\n• Imediatamente após usar sua característica Resistência Implacável, você pode usar sua reação para fazer um ataque com arma.
 Feat/&FeatGroupOrcishFuryTitle=Fúria Orc
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/MeleeCombat-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/MeleeCombat-pt-BR.txt
index 103c6de988..1cd4feb249 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/MeleeCombat-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/MeleeCombat-pt-BR.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=Você tem prática na arte de esmagar seus inimi
 Feat/&FeatCrusherConTitle=Triturador [Con]
 Feat/&FeatCrusherStrDescription=Você tem prática na arte de esmagar seus inimigos. Aumente sua Força em 1, até um máximo de 20. Quando você atinge uma criatura com um ataque que causa dano de concussão, uma vez por turno você empurra o inimigo em 1,5 metro. Quando você obtém um acerto crítico, as jogadas de ataque contra aquela criatura são feitas com vantagem até o início do seu próximo turno.
 Feat/&FeatCrusherStrTitle=Triturador [Str]
-Feat/&FeatDefensiveDuelistDescription=Quando você estiver empunhando uma arma de destreza com a qual você é proficiente e outra criatura atingir você com um ataque corpo a corpo, você pode usar sua reação para adicionar seu bônus de proficiência à sua CA para esse ataque, potencialmente fazendo com que o ataque erre você.
+Feat/&FeatDefensiveDuelistDescription=Quando você estiver empunhando uma arma corpo a corpo com a qual você é proficiente e outra criatura atingir você com um ataque corpo a corpo, você pode usar sua reação para adicionar seu bônus de proficiência à sua CA para esse ataque, potencialmente fazendo com que o ataque erre você.
 Feat/&FeatDefensiveDuelistTitle=Duelista Defensivo
 Feat/&FeatFellHandedDescription=Você domina o machado de mão, o machado de batalha, o machado grande, o martelo de guerra e o maul. Você ganha os seguintes benefícios ao usar qualquer um deles:\n• Um bônus de +1 nas jogadas de ataque que você faz com a arma.\n• Sempre que você tiver vantagem em uma jogada de ataque corpo a corpo e acertar, você derruba o alvo se a menor das duas jogadas de d20 também atingiria o alvo.\n• Sempre que você tiver desvantagem em uma jogada de ataque corpo a corpo e errar, o alvo sofrerá dano de concussão igual ao seu modificador de Força se a maior das duas jogadas de d20 atingir o alvo. .
 Feat/&FeatFellHandedTitle=Caiu com a mão
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/OtherFeats-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/OtherFeats-pt-BR.txt
index f2f9f76fe2..c1c87e0705 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/OtherFeats-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/OtherFeats-pt-BR.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Aumente sua Constituição em 1, até um máximo de
 Feat/&FeatChefConTitle=Chef [Com]
 Feat/&FeatChefWisDescription=Aumente sua Sabedoria em 1, até um máximo de 20.\nVocê pode gastar 1 hora para preparar uma refeição para curar você e seus companheiros em 1d8 HP.\nUma vez por dia, você pode gastar uma hora para cozinhar um número. de guloseimas iguais ao seu bônus de proficiência que fornecem 5 HP temporários quando comidas.
 Feat/&FeatChefWisTitle=Chef [Sab]
-Feat/&FeatCriticalVirtuosoDescription=Seu limite crítico é reduzido em 1.
 Feat/&FeatDungeonDelverDescription=Alerta às armadilhas escondidas e portas secretas encontradas em muitas masmorras, você ganha os seguintes benefícios:\n• Você tem vantagem em testes de Sabedoria (Percepção) e Inteligência (Investigação).\n• Você tem vantagem em testes de resistência feitos para evite ou resista a armadilhas.\n• Você tem resistência ao dano causado por armadilhas.\n• Viajar em ritmo acelerado não impõe a penalidade normal de -5 em seu valor de Sabedoria passiva (Percepção).
 Feat/&FeatDungeonDelverTitle=Explorador de Masmorras
 Feat/&FeatEldritchAdeptDescription=Você aprende uma opção de Invocação Eldritch de sua escolha na classe Warlock. Se a invocação tiver um pré-requisito, você só poderá escolher essa invocação se for um bruxo e somente se atender ao pré-requisito. Sempre que você ganha um nível, você pode substituir a invocação por outra da classe bruxo.
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Races-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Races-pt-BR.txt
index e6cd4225a4..5261f31210 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Races-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/Races-pt-BR.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=Você tem um ódio profundo por um tipo esp
 Feat/&FeatGrudgeBearerWisTitle=Portador de Rancor [Sab]
 Feat/&FeatInfernalConstitutionDescription=O sangue diabólico corre forte em você, desbloqueando uma resiliência semelhante à possuída por alguns demônios. Você ganha os seguintes benefícios:\n• Aumenta sua Constituição em 1, até um máximo de 20.\n• Você tem resistência a danos de frio e veneno.\n• Você tem vantagem em testes de resistência contra envenenamento.
 Feat/&FeatInfernalConstitutionTitle=Constituição Infernal
-Feat/&FeatOrcishAggressionConDescription=Sua agressão queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Constituição em 1, até um máximo de 20.\n• Como ação bônus, ao empunhar uma arma corpo a corpo na mão principal, você pode investir até seu deslocamento em direção a um inimigo de sua escolha e ataque livremente a criatura com sua arma principal.
+Feat/&FeatOrcishAggressionConDescription=Sua agressão queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Constituição em 1, até um máximo de 20.\n• Como ação bônus, ao empunhar uma arma corpo a corpo na mão principal, você pode investir até seu deslocamento em direção a um inimigo de sua escolha e ataque livremente a criatura com sua arma principal. Este recurso pode ser usado vezes bônus de proficiência por descanso longo.
 Feat/&FeatOrcishAggressionConTitle=Agressão Orc [Con]
-Feat/&FeatOrcishAggressionDescription=Sua agressão queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Força em 1, até um máximo de 20.\n• Como ação bônus, ao empunhar uma arma corpo a corpo na mão principal, você pode investir até seu deslocamento em direção a um inimigo de sua escolha e ataque livremente a criatura com sua arma principal.
+Feat/&FeatOrcishAggressionDescription=Sua agressão queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Força em 1, até um máximo de 20.\n• Como ação bônus, ao empunhar uma arma corpo a corpo na mão principal, você pode investir até seu deslocamento em direção a um inimigo de sua escolha e ataque livremente a criatura com sua arma principal. Este recurso pode ser usado vezes bônus de proficiência por descanso longo.
 Feat/&FeatOrcishAggressionTitle=Agressão Orc [Str]
 Feat/&FeatOrcishFuryConDescription=Sua fúria queima incansavelmente. Você ganha os seguintes benefícios:\n• Aumenta sua Constituição em 1, até um máximo de 20.\n• Ao acertar um ataque feito com uma arma simples ou marcial, você pode rolar um dos dados de dano da arma uma vez adicional e adicione-o como dano extra ao tipo de dano da arma. Depois de usar essa habilidade, você não poderá usá-la novamente até terminar um descanso curto ou longo.\n• Imediatamente após usar sua característica Resistência Implacável, você pode usar sua reação para fazer um ataque com arma.
 Feat/&FeatOrcishFuryConTitle=Fúria Orc [Con]
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/RangedCombat-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/RangedCombat-pt-BR.txt
index 0771c46f18..e2ffb22a04 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/RangedCombat-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Feats/RangedCombat-pt-BR.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=Você tem vantagem em sua
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Mira firme
 Condition/&ConditionFeatSteadyAimRestrainedDescription=Você não pode se mover até o final do seu turno.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Contido por Steady Aim
-Feat/&FeatBowMasteryDescription=Seu treinamento especializado com arcos concede estes benefícios:\n• Você ganha um bônus de +1 nas jogadas de dano feitas com arco curto e arco longo.\n• Ao usar a ação de Ataque com arco curto em seu turno, você pode fazer um ataque com arma de longo alcance como uma ação bônus, adicionando seu modificador de atributo ao dano.\n• Você pode usar Força em vez de Destreza em jogadas de ataque e dano feitas com um arco longo.
+Feat/&FeatBowMasteryDescription=Quando você usa a ação de Ataque com arco em seu turno, você pode realizar um ataque com arma de longo alcance como uma ação bônus, adicionando seu modificador de atributo ao dano.
 Feat/&FeatBowMasteryTitle=Maestria do arco
-Feat/&FeatCrossbowMasteryDescription=Seu treinamento especializado com bestas concede a você estes benefícios:\n• Você ganha um bônus de +1 nas jogadas de dano feitas com bestas pesadas, leves e de mão.\n• Quando você usa a ação de Ataque com uma besta leve ou de mão. no seu turno, você pode fazer um ataque com arma de longo alcance como uma ação bônus, adicionando seu modificador de atributo ao dano.\n• Você pode usar Força em vez de Destreza em jogadas de ataque e dano feitas com uma besta pesada.
+Feat/&FeatCrossbowMasteryDescription=Quando você usa a ação de Ataque com uma besta em seu turno, você pode fazer um ataque com arma de longo alcance como uma ação bônus, adicionando seu modificador de atributo ao dano.
 Feat/&FeatCrossbowMasteryTitle=Maestria com Besta
 Feat/&FeatDeadeyeDescription=Você aprendeu a trocar precisão para acertar tiros mais mortíferos:\n• Ao atacar com uma arma de longo alcance, você pode optar por receber uma penalidade de -5 em sua jogada de ataque para causar +10 de dano adicional.\n• Ataques em o longo alcance não impõe desvantagem e o ataque com arma de longo alcance ignora meia cobertura e três quartos da cobertura.
 Feat/&FeatDeadeyeTitle=Atirador afiado
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/FightingStyles-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/FightingStyles-pt-BR.txt
index e3951acc5a..750cf2a115 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/FightingStyles-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/FightingStyles-pt-BR.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=Dano Incapacitante!
 Feedback/&AdditionalDamageCripplingLine={1} sofre dano incapacitante.
 Feedback/&AdditionalDamageExecutionerFormat=Execução!
 Feedback/&AdditionalDamageExecutionerLine={0} executa {1} causando +{2} de dano extra!
+FightingStyle/&AstralReachDescription=O alcance do seu Ataque Desarmado aumenta em 1,5 m.
+FightingStyle/&AstralReachTitle=Alcance Astral
 FightingStyle/&BlindFightingDescription=Você tem visão cega com um alcance de 3 metros. Dentro desse alcance, você pode efetivamente ver qualquer coisa que não esteja atrás de uma cobertura total, mesmo se estiver cego ou na escuridão. Além disso, você pode ver uma criatura invisível dentro desse alcance, a menos que a criatura se esconda de você com sucesso.
 FightingStyle/&BlindFightingTitle=Luta cega
-FightingStyle/&CripplingDescription=Ao acertar um ataque corpo a corpo, você pode reduzir a velocidade de seus oponentes em 3 metros e reduzir sua classe de armadura em 1 até o final do seu próximo turno.
+FightingStyle/&CripplingDescription=Você reduz a velocidade de seus oponentes em 3 metros até o final do seu próximo turno em um ataque corpo a corpo.
 FightingStyle/&CripplingTitle=Aleijante
-FightingStyle/&ExecutionerDescription=Você adiciona seu bônus de proficiência ao dano contra criaturas que estão cegas, assustadas, contidas, incapacitadas, paralisadas, caídas ou atordoadas.
+FightingStyle/&ExecutionerDescription=Você adiciona seu bônus de proficiência ao dano contra criaturas cegas, assustadas, contidas, incapacitadas, paralisadas, caídas ou atordoadas.
 FightingStyle/&ExecutionerTitle=Carrasco
-FightingStyle/&HandAndAHalfDescription=Enquanto empunhar uma arma corpo-a-corpo de uma mão ou versátil e nenhuma outra arma ou escudo, você ganha +1 de bônus em suas jogadas de ataque com a arma e +1 em sua Classe de Armadura.
+FightingStyle/&HandAndAHalfDescription=Você ganha +1 de bônus em suas jogadas de ataque e +1 de bônus em sua Classe de Armadura enquanto empunha uma arma corpo a corpo de uma mão ou versátil e nenhuma outra arma ou escudo.
 FightingStyle/&HandAndAHalfTitle=Esgrima Clássica
 FightingStyle/&InterceptionDescription=Quando uma criatura que você pode ver atinge um alvo, que não seja você, a até 1,5 metro de você com um ataque, você pode usar sua reação para reduzir o dano que o alvo sofre em 1d10 + seu bônus de proficiência. Você deve empunhar um escudo ou uma arma simples ou marcial para usar esta reação.
 FightingStyle/&InterceptionTitle=Interceptação
-FightingStyle/&LungerDescription=Ao empunhar apenas uma arma corpo a corpo sem a etiqueta pesada e com a mão livre, o alcance dessa arma aumenta em 1,5 m.
+FightingStyle/&LungerDescription=O alcance da sua arma corpo a corpo aumenta em 1,5 m enquanto empunha uma arma sem a etiqueta pesada e nenhuma outra arma ou escudo.
 FightingStyle/&LungerTitle=Pulmões
 FightingStyle/&MercilessDescription=Quando você reduz um alvo a 0 HP usando um ataque com arma corpo a corpo em seu turno, os inimigos dentro de um raio do alvo abatido igual à metade do seu bônus de proficiência (arredondado para cima) que puderem ver o alvo devem fazer um salvamento de Sabedoria (CD 8 + seu bônus de proficiência + seu modificador de Força) ou ficará com medo de você até o final do seu próximo turno. Se o ataque desencadeador for um acerto crítico, o raio será igual ao seu bônus de proficiência.
 FightingStyle/&MercilessTitle=Impiedoso
@@ -24,17 +26,17 @@ FightingStyle/&MonkShieldExpertDescription=Você ganha proficiência em Escudo e
 FightingStyle/&MonkShieldExpertTitle=Treinamento de Escudo Monástico
 FightingStyle/&PolearmExpertDescription=Seu treinamento especializado com uma arma de haste concede a você estes benefícios:\n• Quando você realiza a ação Atacar e ataca apenas com uma arma de haste, você pode usar uma ação bônus para fazer um ataque corpo a corpo com a extremidade oposta da arma. Este ataque usa o mesmo modificador de habilidade do ataque primário e causa 1d4 de dano de concussão.\n• Outras criaturas provocam um ataque de oportunidade seu quando entram no alcance que você tem ao empunhar uma arma de haste.
 FightingStyle/&PolearmExpertTitle=Mestre da Arma de Pólo
-FightingStyle/&PugilistDescription=Seus ataques desarmados causam 1d4 de dano de concussão adicional e você pode socar com a mão improvisada como uma ação bônus. Você pode empurrar como uma ação bônus se tiver mão livre.
+FightingStyle/&PugilistDescription=Seus ataques desarmados causam 1d4 de dano de concussão adicional e você pode socar com a mão improvisada como uma ação bônus. Você pode empurrar como uma ação bônus se não tiver outra arma ou escudo.
 FightingStyle/&PugilistTitle=Pugilista
 FightingStyle/&RemarkableTechniqueDescription=Você possui treinamento marcial que lhe permite executar técnicas de combate especiais chamadas manobras:\n• Você aprende uma manobra de sua escolha na subclasse Battle Master. A CD de manobra dessas manobras é 8 + bônus de proficiência + modificador de Força ou Destreza, o que for maior.\n• Você ganha 1 Dado de Superioridade. O dado é um d6 e não aumenta de tamanho se você não for um Mestre de Batalha. Este dado é usado para alimentar suas manobras. Ele é gasto quando você o usa e é recuperado quando você termina um descanso curto ou longo.
 FightingStyle/&RemarkableTechniqueTitle=Técnica Superior
-FightingStyle/&RopeItUpDescription=Seus ataques de arremesso recebem +1 nas jogadas de ataque e dano, você aumenta seu alcance longo e curto em 3 metros e ele retorna para sua mão imediatamente após ser usado para fazer um ataque de arremesso.
-FightingStyle/&RopeItUpTitle=Amarre
+FightingStyle/&RopeItUpDescription=Quando você estiver fazendo um ataque à distância com uma arma de arremesso, aumente seu alcance curto em 3 metros e seu alcance longo em 6 metros. Além disso, a arma retorna para sua mão imediatamente após ser usada para realizar um ataque de arremesso.
+FightingStyle/&RopeItUpTitle=Mestre de armas de arremesso
 FightingStyle/&SentinelDescription=Você dominou técnicas para aproveitar cada queda na guarda do inimigo:\n• Quando você atinge uma criatura com um ataque de oportunidade, a velocidade da criatura se torna 0 pelo resto do turno.\n• As criaturas provocam ataques de oportunidade de você, mesmo que ele execute a ação Desengajar antes de sair do seu alcance.\n• Você pode usar sua reação para fazer um ataque corpo a corpo com arma contra a criatura atacante quando uma criatura fizer um ataque contra um alvo que não seja você.
 FightingStyle/&SentinelTitle=Sentinela
-FightingStyle/&ShieldExpertDescription=Você treinou no uso de um escudo como arma. Torna-se uma arma corpo a corpo com a qual você é proficiente e que causa 1d4 de dano de concussão. Você ganha vantagem em tentativas de empurrão enquanto empunha um escudo.
-FightingStyle/&ShieldExpertTitle=Especialista em escudo
-FightingStyle/&TorchbearerDescription=Você é hábil no uso de uma tocha em batalha. Uma vez por turno, como uma ação bônus, você pode optar por usar uma fonte de luz que você tenha equipado para tentar colocar fogo em um inimigo que você possa tocar. Seu alvo deve ser bem sucedido em um teste de resistência de Destreza (CD 8 + seu bônus de proficiência + seu modificador de Destreza) ou sofrerá 1d4 de dano de fogo por turno por 1 minuto ou até ser extinto.
+FightingStyle/&ShieldExpertDescription=Você pode usar sua ação bônus para atacar uma criatura usando seu escudo, transformando-a momentaneamente em uma arma improvisada especial com a qual você é proficiente. Faça um ataque corpo a corpo com arma contra uma criatura a até 1,5 metro de você usando seu modificador de Força para o ataque. Se acertar, a criatura sofre 1d4 + modificador de Força como dano de concussão.
+FightingStyle/&ShieldExpertTitle=Golpe de Escudo
+FightingStyle/&TorchbearerDescription=Como uma ação bônus, você pode optar por usar uma fonte de luz que você equipou para tentar colocar fogo em um inimigo que você possa tocar. Seu alvo deve ser bem sucedido em um teste de resistência de Destreza (CD 8 + seu bônus de proficiência + seu modificador de Destreza) ou sofrerá 1d4 de dano de fogo por turno por 1 minuto ou até ser extinto.
 FightingStyle/&TorchbearerTitle=Portador da Tocha
 FightingStyle/&ZenArcherDescription=Sua intuição guia sua mão ao usar um arco. Aumente seu atributo de Sabedoria em 1, até um máximo de 20. Você pode usar seu modificador de Sabedoria em vez de seu modificador de Destreza para as jogadas de ataque e dano com essas armas.
 FightingStyle/&ZenArcherTitle=Tiro com Arco Sábio
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Level20-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Level20-pt-BR.txt
index 59dfb09344..f6c8a44def 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Level20-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Level20-pt-BR.txt
@@ -74,10 +74,10 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=A partir do 17º níve
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Pureza da Luz
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=A partir do 17º nível, você ganha a habilidade de criar vibrações letais no corpo de alguém. Ao atingir uma criatura com um ataque desarmado, você pode gastar 3 pontos de Ki para iniciar essas vibrações imperceptíveis, que duram 24 horas. As vibrações são inofensivas, a menos que você use sua ação para acabar com elas. Quando você usa esta ação, a criatura deve fazer um teste de resistência de Constituição. Se falhar, ele será reduzido a 1 ponto de vida e ficará atordoado até o início do próximo turno. Se tiver sucesso, sofre 10d10 de dano necrótico.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Palma trêmula
+Feature/&FeatureWizardSpellMasteryDescription=Você alcançou tal domínio sobre certos feitiços que pode lançá-los à vontade. Escolha duas magias de mago de 1º ou 2º nível que estejam em seu grimório. Você pode lançar essas magias em seu nível mais baixo sem gastar um espaço de magia quando elas estiverem preparadas. Se você quiser lançar qualquer magia em um nível superior, você deve gastar um espaço de magia normalmente.
+Feature/&FeatureWizardSpellMasteryTitle=Domínio de Feitiço
 Feature/&GrantInvocationsSpellMasteryDescription=Você alcançou tal domínio sobre certos feitiços que pode lançá-los à vontade. As duas primeiras magias de mago de 1º e 2º nível que você preparar podem ser conjuradas em seu nível mais baixo sem gastar um espaço de magia. Se você quiser lançar qualquer magia em um nível superior, você deve gastar um espaço de magia normalmente.
 Feature/&GrantInvocationsSpellMasteryTitle=Domínio de Feitiço
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Selecione um feitiço exclusivo para aprender.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Feitiços de Assinatura
 Feature/&InvocationPoolWizardSignatureSpellsDescription=Você ganha domínio sobre dois feitiços poderosos e pode lançá-los com pouco esforço. Escolha duas magias de mago de 3º nível como suas magias características. Você sempre tem essas magias preparadas, elas não contam no número de magias que você preparou e você pode lançar cada uma delas uma vez no 3º nível sem gastar um espaço de magia. Ao fazer isso, você não poderá fazê-lo novamente até terminar um descanso curto ou longo.
 Feature/&InvocationPoolWizardSignatureSpellsTitle=Feitiços de Assinatura
 Feature/&MagicAffinityArchDruidDescription=Você pode usar seu Wildshape um número ilimitado de vezes. Além disso, você pode ignorar os componentes verbais e somáticos de suas magias de druida, bem como quaisquer componentes materiais que não tenham custo e não sejam consumidos por uma magia. Você ganha esse benefício tanto na sua forma normal quanto na forma de besta do Wildshape.
@@ -142,6 +142,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=A partir do 17º n
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Perfeição Física
 Feature/&PowerWarlockEldritchMasterDescription=Você pode recorrer à sua reserva interna de poder místico enquanto implora ao seu patrono para recuperar espaços de magia gastos. Você pode gastar 1 minuto implorando ao seu patrono por ajuda para recuperar todos os seus espaços de magia gastos do recurso Magia do Pacto. Depois de recuperar espaços de magia com esse recurso, você deverá terminar um descanso longo antes de poder fazê-lo novamente.
 Feature/&PowerWarlockEldritchMasterTitle=Mestre Eldritch
+Feature/&PowerWizardSignatureSpellsDescription=Você ganha domínio sobre dois feitiços poderosos e pode lançá-los com pouco esforço. Escolha duas magias de mago de 3º nível em seu grimório como suas magias características. Você sempre tem essas magias preparadas, elas não contam no número de magias que você preparou e você pode lançar cada uma delas uma vez no 3º nível sem gastar um espaço de magia. Ao fazer isso, você não poderá fazê-lo novamente até terminar um descanso curto ou longo.
+Feature/&PowerWizardSignatureSpellsTitle=Feitiços de Assinatura
 Feature/&SenseRangerFeralSensesDescription=Você ganha sentidos sobrenaturais que o ajudam a lutar contra criaturas que você não pode ver. Quando você ataca uma criatura que você não pode ver, sua incapacidade de vê-la não impõe desvantagem em suas jogadas de ataque contra ela.
 Feature/&SenseRangerFeralSensesTitle=Sentidos Ferais
 Feedback/&AdditionalDamageBrutalAssaultFormat=Assalto brutal!
@@ -158,6 +160,14 @@ Reaction/&UsePhysicalPerfectionDescription=Você pode pagar 1 Ki para restaurar
 Reaction/&UsePhysicalPerfectionReactDescription=Você pode pagar 1 Ki para restaurar 1 ponto de vida.
 Reaction/&UsePhysicalPerfectionReactTitle=Curar
 Reaction/&UsePhysicalPerfectionTitle=Perfeição Física
+RestActivity/&RestActivitySignatureSpellsDescription=Você pode selecionar seus feitiços exclusivos uma vez.
+RestActivity/&RestActivitySignatureSpellsTitle=Feitiços de Assinatura
+RestActivity/&RestActivitySpellMasteryDescription=Você pode alterar sua lista de feitiços de maestria ao terminar um descanso longo.
+RestActivity/&RestActivitySpellMasteryTitle=Domínio de Feitiço
 Rules/&DamagePureDescription=Vibrações imperceptíveis que desintegram a vítima por dentro.
 Rules/&DamagePureTitle=Puro
+Screen/&SignatureSpellsExtraSpellDescription=Este feitiço característico é sempre preparado e, uma vez por descanso longo, não consome um espaço de feitiço quando lançado no nível.
+Screen/&SignatureSpellsExtraSpellTitle=Feitiços de Assinatura
+Screen/&SpellMasteryExtraSpellDescription=Este feitiço de Maestria está sempre preparado e não consome um espaço de feitiço quando lançado em nível.
+Screen/&SpellMasteryExtraSpellTitle=Domínio de Feitiço
 Tooltip/&MustHaveQuiveringPalmCondition=Não é marcado por Quivering Palm
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Others-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Others-pt-BR.txt
index 09bcac3a20..597cf5de2f 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Others-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Others-pt-BR.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Ativar/desativar Ataque Brutal
 Action/&BrutalStrikeToggleTitle=Golpe Brutal
 Action/&CastPlaneMagicDescription=Lance um dos feitiços que você obteve com os talentos Plane Touched
 Action/&CastPlaneMagicTitle=Magia do Plano do Canal
-Action/&CastSignatureSpellsDescription=Lance esses feitiços de 3º nível sem gastar um espaço
-Action/&CastSignatureSpellsTitle=Feitiços de Assinatura
-Action/&CastSpellMasteryDescription=Lance suas magias preparadas de 1º ou 2º nível sem gastar um espaço
-Action/&CastSpellMasteryTitle=Domínio de Feitiço
 Action/&CoordinatedAssaultToggleDescription=Ativar/desativar Ataque Coordenado
 Action/&CoordinatedAssaultToggleTitle=Ataque Coordenado
 Action/&CunningStrikeToggleDescription=Ativar/desativar Golpe Astuto
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Poder
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Competência
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Inimigo Preferido
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Afinidade de tipo de terreno
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Feitiço de Assinatura
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Ancestral Dracônico Feiticeiro
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Treinamento com armas
 UI/&ForcePreferredCantripDescription=Se esta opção estiver ativada, somente o truque preferido poderá ser acionado. Se o truque preferido não estiver selecionado, o primeiro truque válido será acionado, independentemente desta alternância.
diff --git a/SolastaUnfinishedBusiness/Translations/pt-BR/Settings-pt-BR.txt b/SolastaUnfinishedBusiness/Translations/pt-BR/Settings-pt-BR.txt
index e05a4915d0..f7ba6156d6 100644
--- a/SolastaUnfinishedBusiness/Translations/pt-BR/Settings-pt-BR.txt
+++ b/SolastaUnfinishedBusiness/Translations/pt-BR/Settings-pt-BR.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Permitir lançar feitiços com ação extra de ser Acel
 ModUi/&AllowHornsOnAllRaces=Permitir buzinas em todas as corridas <i><color=#F0DAA0>[os resultados podem parecer terríveis dependendo da raça, cabeça e buzina]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Permite mais estado real no painel de repouso <i><color=#F0DAA0>[ocultar ações após repouso no painel anterior e recursos de recuperação no painel posterior]</color></i>
 ModUi/&AllowStackedMaterialComponent=Permitir componente de material empilhado <i><color=#F0DAA0>[ex. 2x500gp de diamante é equivalente a 1000gp de diamante]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Permita a seleção do alvo ao lançar o feitiço <color=#D89555>Chain Lightning</color>
 ModUi/&AllowUnmarkedSorcerers=Permitir <color=#D89555>Sorcerer</color> sem marcas de origem e tatuagens
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=A tecla <color=#1E81B0>ALT</color> apenas destaca gadgets no campo de visão do grupo <i><color=#F0DAA0>[somente masmorras personalizadas]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Permite que o <color=#D89555>Arcane Shieldstaff</color> seja sintonizado por qualquer classe
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Desative <color=#D89555>Superi
 ModUi/&DisableUnofficialTranslations=Desative o suporte a traduções não oficiais para acelerar o mod <i><color=#F0DAA0>[a menos que eu fale chinês, italiano, japonês, coreano ou espanhol]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Exibe todos os feitiços conhecidos de outras classes durante o aumento de nível</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Exibir espaços de pacto <color=#D89555>Warlock</color> na seleção de feitiço em vez do painel de personagem</i>
-ModUi/&DocsArcaneShots=DOCS: Tiros Arcanos
-ModUi/&DocsBackgrounds=DOCUMENTOS: Planos de fundo
-ModUi/&DocsFeats=DOCS: Talentos
-ModUi/&DocsFightingStyles=DOCS: Estilos de luta
-ModUi/&DocsInfusions=DOCS: Infusões
-ModUi/&DocsInvocations=DOCS: invocações
-ModUi/&DocsManeuvers=DOCS: Manobras
-ModUi/&DocsMetamagic=DOCS: Metamágica
-ModUi/&DocsRaces=DOCS: Corridas
-ModUi/&DocsSpells=DOCS: Feitiços
-ModUi/&DocsSubclasses=DOCS: Subclasses
-ModUi/&DocsSubraces=DOCS: Subraças
+ModUi/&DocsArcaneShots=Tiros Arcanos
+ModUi/&DocsBackgrounds=Planos de fundo
+ModUi/&DocsFeats=Talentos
+ModUi/&DocsFightingStyles=Estilos de luta
+ModUi/&DocsInfusions=Infusões
+ModUi/&DocsInvocations=Invocações
+ModUi/&DocsManeuvers=Manobras
+ModUi/&DocsMetamagic=Metamágica
+ModUi/&DocsRaces=Corridas
+ModUi/&DocsSpells=Feitiços
+ModUi/&DocsSubclasses=Subclasses
+ModUi/&DocsSubraces=Subraças
+ModUi/&DocsVersatilities=Versatilidades
 ModUi/&Donate=<b><color=#D89555>Doar:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=Não exiba capacetes em personagens gráficos <b><i><color=#C04040E0>[Requer reinicialização]</color></i></b>
 ModUi/&DontEndTurnAfterReady=Não termine o turno após usar a ação pronta <i><color=#F0DAA0>[permite usar Bonus Action ou qualquer ação Principal extra de Haste ou outras fontes]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Habilite a escolha de <color=#D89555>Rogue</colo
 ModUi/&EnableRogueSteadyAim=Habilite <color=#D89555>Rogue</color> <b>Steady Aim</b> no nível de classe 3 <i><color=#F0DAA0>[a ação bônus dá vantagem em sua próxima jogada de ataque no turno atual se você ainda não me mudei]</color></i>
 ModUi/&EnableRogueStrSaving=Habilite <color=#D89555>Rogue</color> para usar modificadores de DES ou FOR em <b>Ataque Astuto/Devil</b>, <b>Ataque Debilitante/Aprimorado</b> e <b>Hail of Blades </b>
 ModUi/&EnableSaveByLocation=Ativar salvar por campanhas / locais
+ModUi/&EnableSignatureSpellsRelearn=Habilite que os feitiços característicos do <color=#D89555>Assistente</color> sejam preparados a cada descanso longo <i><color=#F0DAA0>[em vez de uma vez no nível 20]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Ativar classificação de recursos no editor do Dungeon Maker
 ModUi/&EnableStatsOnHeroTooltip=Exibir estatísticas na dica de ferramenta do herói <i><color=#F0DAA0>[ou seja: acertos críticos, falhas críticas, etc.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=• Além disso, cada herói adiciona um teste D20 ao peso para um pouco de aleatoriedade
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Feats/Group-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Feats/Group-ru.txt
index 3fb21cf4c0..577063ca62 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Feats/Group-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Feats/Group-ru.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=Бой: Ближний
 Feat/&FeatGroupOldTacticsDescription=Увеличьте значение вашей Силы или Ловкости на 1. Один раз в ход, когда сбитый с ног противник в пределах досягаемости вашего рукопашного оружия встаёт, вы можете совершить атаку по возможности против этой цели.
 Feat/&FeatGroupOldTacticsTitle=Старая тактика
-Feat/&FeatGroupOrcishAggressionDescription=Ваша агрессия пылает неустанно. Вы получаете следующие преимущества:\n• Увеличьте значение Силы или Телосложения на 1 при максимуме 20.\n• Если вы держите рукопашное оружие в основной руке, бонусным действием вы можете броситься на расстояние вплоть до полного значения своей скорости к выбранному вами противнику и атаковать его оружием в вашей основной руке.
+Feat/&FeatGroupOrcishAggressionDescription=Ваша агрессия пылает неустанно. Вы получаете следующие преимущества:\n• Увеличьте значение Силы или Телосложения на 1 при максимуме 20.\n• Если вы держите рукопашное оружие в основной руке, бонусным действием вы можете броситься на расстояние вплоть до полного значения своей скорости к выбранному вами противнику и атаковать его оружием в вашей основной руке. Вы можете использовать эту способность количество раз, равное вашему бонусу мастерства, затем вы должны закончить продолжительный отдых, чтобы воспользоваться ей вновь.
 Feat/&FeatGroupOrcishAggressionTitle=Орочья агрессия
 Feat/&FeatGroupOrcishFuryDescription=Ваша ярость неутомимо горит внутри вас. Вы получаете следующие преимущества:\n• Увеличьте значение вашей Силы или Телосложения на 1 при максимуме 20.\n• Когда вы попадаете атакой простым или воинским оружием, вы можете кинуть одну кость оружия ещё раз и добавить результат в качестве дополнительного урона того же типа, что и у оружия. Использовав это преимущество, вы не можете использовать его вновь, пока не закончите короткий или продолжительный отдых.\n• Сразу же после использования особенности «Непоколебимая стойкость» вы можете реакцией совершить одну атаку оружием.
 Feat/&FeatGroupOrcishFuryTitle=Орочье буйство
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Feats/MeleeCombat-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Feats/MeleeCombat-ru.txt
index e166de9d40..5f3211008f 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Feats/MeleeCombat-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Feats/MeleeCombat-ru.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=Вы практиковались в искус
 Feat/&FeatCrusherConTitle=Крушитель [ТЕЛ]
 Feat/&FeatCrusherStrDescription=Вы практиковались в искусстве сокрушения врагов. Увеличьте значение вашей Силы на 1 при максимуме 20. Один раз в ход, когда вы попадаете по существу атакой, которая наносит дробящий урон, вы можете переместить цель на 5 футов. Когда вы совершаете критический удар, который наносит дробящий урон существу, броски атаки по этому существу совершаются с преимуществом до начала вашего следующего хода.
 Feat/&FeatCrusherStrTitle=Крушитель [СИЛ]
-Feat/&FeatDefensiveDuelistDescription=Если вы используете оружие со свойством «фехтовальное», которым владеете, и другое существо попадает по вам рукопашной атакой, вы можете реакцией добавить бонус мастерства к КД для этой атаки, что потенциально может привести к промаху.
+Feat/&FeatDefensiveDuelistDescription=Если вы используете оружие ближнего боя, которым владеете, и другое существо попадает по вам рукопашной атакой, вы можете реакцией добавить бонус мастерства к КД для этой атаки, что потенциально может привести к промаху.
 Feat/&FeatDefensiveDuelistTitle=Оборонительный дуэлянт
 Feat/&FeatFellHandedDescription=Вы мастер в использовании топорика, боевого топора, двуручной секиры, боевого молота и двуручного молота. Вы получаете следующие преимущества, когда используете одно из этих оружий:\n• Бонус +1 к броскам атаки этим оружием.\n• Когда вы совершаете атаку ближнего боя с преимуществом и попадаете, вы сбиваете цель с ног, если меньший из бросков атаки также обеспечил бы попадание.\n• Когда вы совершаете атаку ближнего боя с помехой и промахиваетесь, цель получает дробящий урон, равный вашему модификатору Силы, если больший из бросков атаки обеспечил бы попадание.
 Feat/&FeatFellHandedTitle=Разящая рука
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Feats/OtherFeats-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Feats/OtherFeats-ru.txt
index c49ab7a9b5..1b9ebca4e9 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Feats/OtherFeats-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Feats/OtherFeats-ru.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=Увеличьте значение вашего Т
 Feat/&FeatChefConTitle=Шеф-повар [ТЕЛ]
 Feat/&FeatChefWisDescription=Увеличьте значение вашего Мудрости на 1 при максимуме 20.\nВы можете потратить 1 час на приготовление еды, которая исцелит вас и ваших спутников на 1d8 хитов.\nРаз в день вы можете потратить час на приготовление лакомств в количестве, равном вашему бонусу мастерства, которые при употреблении в пищу дают 5 временных хитов.
 Feat/&FeatChefWisTitle=Шеф-повар [МДР]
-Feat/&FeatCriticalVirtuosoDescription=Ваш порог критического попадания снижен на 1.
 Feat/&FeatDungeonDelverDescription=Научившись искать скрытые ловушки и потайные двери в подземельях, вы получаете следующие преимущества:\n• Вы совершаете с преимуществом проверки Мудрости (Восприятие) и Интеллекта (Расследование).\n• Вы совершаете с преимуществом спасброски для избегания ловушек и сопротивления их эффектам.\n• Вы получаете сопротивление урону от ловушек.\n• Перемещение в быстром темпе не налагает обычный штраф -5 к пассивной проверке Мудрости (Восприятие).
 Feat/&FeatDungeonDelverTitle=Исследователь подземелий
 Feat/&FeatEldritchAdeptDescription=Вы узнаёте одно из таинственных воззваний из класса колдуна по вашему выбору. Если у воззвания имеется требование любого вида, то вы можете выбрать это воззвание, только если вы колдун, который соответствует этому требованию. Каждый раз, когда вы получаете уровень, вы можете заменить воззвание другим из класса чернокнижника.
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Feats/Races-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Feats/Races-ru.txt
index 9fe44d47ab..acde06ed7c 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Feats/Races-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Feats/Races-ru.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=Вы испытываете глубоку
 Feat/&FeatGrudgeBearerWisTitle=Затаивший обиду [МДР]
 Feat/&FeatInfernalConstitutionDescription=Кровь исчадий сильна в вас и даёт вам сопротивления, которыми обладают некоторые исчадия. Вы получаете следующие преимущества:\n• Увеличьте значение вашего Телосложения на 1 при максимуме 20.\n• Вы получаете сопротивление урону холодом и ядом.\n• Вы получаете преимущество на спасброски против эффектов, делающих вас отравленным.
 Feat/&FeatInfernalConstitutionTitle=Инфернальное телосложение
-Feat/&FeatOrcishAggressionConDescription=Ваша агрессия пылает неустанно. Вы получаете следующие преимущества:\n• Увеличьте значение Телосложения на 1 при максимуме 20.\n• Если вы держите рукопашное оружие в основной руке, бонусным действием вы можете броситься на расстояние вплоть до полного значения своей скорости к выбранному вами противнику и атаковать его оружием в вашей основной руке.
+Feat/&FeatOrcishAggressionConDescription=Ваша агрессия пылает неустанно. Вы получаете следующие преимущества:\n• Увеличьте значение Телосложения на 1 при максимуме 20.\n• Если вы держите рукопашное оружие в основной руке, бонусным действием вы можете броситься на расстояние вплоть до полного значения своей скорости к выбранному вами противнику и атаковать его оружием в вашей основной руке. Вы можете использовать эту способность количество раз, равное вашему бонусу мастерства, затем вы должны закончить продолжительный отдых, чтобы воспользоваться ей вновь.
 Feat/&FeatOrcishAggressionConTitle=Орочья агрессия [ТЕЛ]
-Feat/&FeatOrcishAggressionDescription=Ваша агрессия пылает неустанно. Вы получаете следующие преимущества:\n• Увеличьте значение Силы на 1 при максимуме 20.\n• Если вы держите рукопашное оружие в основной руке, бонусным действием вы можете броситься на расстояние вплоть до полного значения своей скорости к выбранному вами противнику и атаковать его оружием в вашей основной руке.
+Feat/&FeatOrcishAggressionDescription=Ваша агрессия пылает неустанно. Вы получаете следующие преимущества:\n• Увеличьте значение Силы на 1 при максимуме 20.\n• Если вы держите рукопашное оружие в основной руке, бонусным действием вы можете броситься на расстояние вплоть до полного значения своей скорости к выбранному вами противнику и атаковать его оружием в вашей основной руке. Вы можете использовать эту способность количество раз, равное вашему бонусу мастерства, затем вы должны закончить продолжительный отдых, чтобы воспользоваться ей вновь.
 Feat/&FeatOrcishAggressionTitle=Орочья агрессия [СИЛ]
 Feat/&FeatOrcishFuryConDescription=Ваша ярость неутомимо горит внутри вас. Вы получаете следующие преимущества:\n• Увеличьте значение вашего Телосложения на 1 при максимуме 20.\n• Когда вы попадаете атакой простым или воинским оружием, вы можете кинуть одну кость оружия ещё раз и добавить результат в качестве дополнительного урона того же типа, что и у оружия. Использовав это преимущество, вы не можете использовать его вновь, пока не закончите короткий или продолжительный отдых.\n• Сразу же после использования особенности «Непоколебимая стойкость» вы можете реакцией совершить одну атаку оружием.
 Feat/&FeatOrcishFuryConTitle=Орочье буйство [ТЕЛ]
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Feats/RangedCombat-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Feats/RangedCombat-ru.txt
index 1b63d9b545..578b8467db 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Feats/RangedCombat-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Feats/RangedCombat-ru.txt
@@ -2,9 +2,9 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=Вы обладаете п
 Condition/&ConditionFeatSteadyAimAdvantageTitle=Точное прицеливание
 Condition/&ConditionFeatSteadyAimRestrainedDescription=Вы не можете двигаться до конца своего хода.
 Condition/&ConditionFeatSteadyAimRestrainedTitle=Ограничен Точным прицеливанием
-Feat/&FeatBowMasteryDescription=Ваше мастерство владения луком даёт вам следующие преимущества:\n• Вы получаете бонус +1 к броскам урона при атаке коротким и длинным луками.\n• Когда вы атакуете, используя короткий лук в свой ход, вы можете произвести одну дальнобойную атаку бонусным действием, добавляя свой модификатор характеристики к урону.\n• Вы можете использовать Силу вместо Ловкости при бросках атаки и урона, используя длинный лук.
+Feat/&FeatBowMasteryDescription=Когда вы атакуете, используя лук в свой ход, вы можете произвести одну дальнобойную атаку бонусным действием, добавляя свой модификатор характеристики к урону.
 Feat/&FeatBowMasteryTitle=Мастер обращения с луками
-Feat/&FeatCrossbowMasteryDescription=Ваше мастерство обращения с арбалетами даёт вам следующие преимущества:\n• Вы получаете бонус +1 к броскам урона при атаке тяжёлым, легким и ручным арбалетом.\n• Когда вы атакуете в свой ход лёгким или ручным арбалетом, вы можете совершить одну атаку оружием дальнего боя бонусным действием, добавляя свой модификатор характеристики к урону.\n• Вы можете использовать Силу вместо Ловкости при бросках атаки и урона, используя тяжёлый арбалет.
+Feat/&FeatCrossbowMasteryDescription=Когда вы атакуете, используя арбалет в свой ход, вы можете совершить одну атаку оружием дальнего боя бонусным действием, добавляя свой модификатор характеристики к урону.
 Feat/&FeatCrossbowMasteryTitle=Мастер обращения с арбалетами
 Feat/&FeatDeadeyeDescription=Вы научились жертвовать точностью в угоду усиления выстрела:\n• Атакуя дальнобойным оружием, вы можете принять штраф -5 к броску атаки, чтобы нанести дополнительные 10 урона.\n• Атаки в пределах максимальной дистанции не вызывают помехи, а также игнорируют укрытия на половину и на три четверти.
 Feat/&FeatDeadeyeTitle=Меткий стрелок
diff --git a/SolastaUnfinishedBusiness/Translations/ru/FightingStyles-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/FightingStyles-ru.txt
index d5f11e326c..57ee4d09f8 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/FightingStyles-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/FightingStyles-ru.txt
@@ -6,17 +6,19 @@ Feedback/&AdditionalDamageCripplingFormat=Калечащий урон!
 Feedback/&AdditionalDamageCripplingLine={1} получает сокрушительный урон.
 Feedback/&AdditionalDamageExecutionerFormat=Казнь!
 Feedback/&AdditionalDamageExecutionerLine={0} казнит {1}, нанося +{2} дополнительного урона!
+FightingStyle/&AstralReachDescription=Дальность вашего безоружного удара увеличивается на 5 футов.
+FightingStyle/&AstralReachTitle=Астральная досягаемость
 FightingStyle/&BlindFightingDescription=Вы получаете слепое зрение в пределах 10 футов. В пределах этой дистанции вы можете видеть всё, что не находится за полным укрытием, даже если вы ослеплены или находитесь в темноте. Более того, вы можете увидеть невидимое существо в пределах этой дистанции, если только оно не преуспело в попытке спрятаться от вас.
 FightingStyle/&BlindFightingTitle=Сражение вслепую
-FightingStyle/&CripplingDescription=При попадании атакой ближнего боя по противнику вы можете до конца вашего следующего хода уменьшить его скорость передвижения на 10 футов, а КД снизить на 1.
+FightingStyle/&CripplingDescription=Вы уменьшаете скорость передвижения противника на 10 футов, если попадаете по нему атакой ближнего боя.
 FightingStyle/&CripplingTitle=Калечащий
-FightingStyle/&ExecutionerDescription=Вы добавляете свой бонус мастерства к урону против существ, которые ослеплены, напуганы, обездвижены, недееспособны, парализованы, сбиты с ног или ошеломлены.
+FightingStyle/&ExecutionerDescription=Вы добавляете свой бонус мастерства к урону против ослеплённых, напуганных, обездвиженных, недееспособных, парализованных, сбитых с ног или ошеломлённых существ.
 FightingStyle/&ExecutionerTitle=Палач
-FightingStyle/&HandAndAHalfDescription=Если вы используете только одно одноручное или универсальное оружие ближнего боя и не используете щит, вы получаете бонус +1 к броскам атаки с этим оружием и +1 к классу доспеха.
+FightingStyle/&HandAndAHalfDescription=Вы получаете бонус +1 к броскам атаки, а также бонус + 1 к классу доспеха, пока используете только одно одноручное или универсальное оружие ближнего боя и не используете щит.
 FightingStyle/&HandAndAHalfTitle=Классическая пикировка
 FightingStyle/&InterceptionDescription=Когда существо, которое вы можете видеть, попадает атакой по цели, отличной от вас, в пределах 5 футов, вы можете использовать свою реакцию, чтобы уменьшить урон, получаемый целью, на 1d10 + ваш бонус мастерства. Чтобы использовать эту реакцию, вы должны держать в руках щит либо простое или воинское оружие.
 FightingStyle/&InterceptionTitle=Перехват
-FightingStyle/&LungerDescription=При использовании только одного оружия ближнего боя без свойства Тяжёлое (вторая рука должна быть свободна) досягаемость этого оружия увеличивается на 5 футов.
+FightingStyle/&LungerDescription=Досягаемость вашего рукопашного оружия увеличивается на 5 футов при использовании оружия ближнего боя без свойства Тяжёлое (вторая рука должна быть свободна).
 FightingStyle/&LungerTitle=Выпад
 FightingStyle/&MercilessDescription=Когда вы опускаете хиты цели до 0, используя рукопашную атаку оружием в свой ход, противники в радиусе, равном половине вашего бонуса мастерства (с округлением вверх), которые могут видеть цель, должны пройти спасбросок Мудрости (Сл равна 8 + ваш бонус мастерства + ваш модификатор Силы), иначе будут напуганы до конца вашего следующего хода. Если попадание было критическим, радиус действия увеличивается до вашего полного бонуса мастерства.
 FightingStyle/&MercilessTitle=Безжалостный
@@ -28,13 +30,13 @@ FightingStyle/&PugilistDescription=Ваши безоружные удары на
 FightingStyle/&PugilistTitle=Боксёр
 FightingStyle/&RemarkableTechniqueDescription=Вы прошли военную подготовку, позволяющую совершать особые боевые приёмы:\n• Вы изучаете один приём по вашему выбору из списка приёмов архетипа Мастера боевых искусств. Сл спасброска приёма равна 8 + ваш бонус мастерства + ваш модификатор Силы или Ловкости, в зависимости от того, что выше.\n• Вы получаете 1 кость превосходства. Тип кости - d6, и она не растёт, если вы не Мастер боевых искусств. Эта кость используется для совершения ваших приёмов. Она тратится, когда вы их используете, и восстанавливается после короткого или продолжительного отдыха.
 FightingStyle/&RemarkableTechniqueTitle=Превосходная техника
-FightingStyle/&RopeItUpDescription=Ваши дальнобойные атаки метательным оружием получают +1 к броскам атаки и урона, вы увеличиваете нормальную и максимальную дистанцию броска на 10 футов, оружие также возвращается в вашу руку сразу же после того, как было использовано для совершения дальнобойной атаки.
-FightingStyle/&RopeItUpTitle=Привязанная верёвка
+FightingStyle/&RopeItUpDescription=Когда вы совершаете дальнобойную атаку метательным оружием, его нормальную дистанция броска увеличивается на 10 футов, а максимальная - на 20 футов. Оружие также возвращается в вашу руку сразу же после того, как было использовано для совершения дальнобойной атаки.
+FightingStyle/&RopeItUpTitle=Мастер метательного оружия
 FightingStyle/&SentinelDescription=Вы овладели техникой, позволяющей пользоваться всеми брешами в обороне противника:\n• Если вы попадаете по существу провоцированной атакой, скорость этого существа падает до 0 до конца текущего хода.\n• Существа перед выходом из вашей досягаемости провоцируют от вас атаки, даже если совершают действие Отход.\n• Вы можете реакцией совершить рукопашную атаку оружием против существа, атакующего цель, отличную от вас.
 FightingStyle/&SentinelTitle=Страж
-FightingStyle/&ShieldExpertDescription=Вы научились использовать щит в качестве оружия. Он становится оружием ближнего боя, которым вы владеете и которое наносит дробящий урон 1d4. Вы получаете преимущество при совершении действия Толчок, пока используете щит.
-FightingStyle/&ShieldExpertTitle=Эксперт по щитам
-FightingStyle/&TorchbearerDescription=Вы умеете пользоваться факелом в бою. Один раз за ход в качестве бонусного действия вы можете использовать источник света, которым вы экипированы, чтобы попытаться поджечь противника на расстоянии касания. Ваша цель должна преуспеть в спасброске Ловкости (Сл равна 8 + ваш бонус мастерства + ваш модификатор Ловкости), или начнёт получать урон огнём 1d4 за ход в течение 1 минуты или до тех пор, пока не будет потушена.
+FightingStyle/&ShieldExpertDescription=Бонусным действием вы можете ударить существо своим щитом, используя его в качестве импровизированного оружия, которым вы владеете. Совершите рукопашную атаку по существу в пределах 5 футов от вас, используя ваш модификатор Силы. Если вы попадаете, существо получает 1d4 + ваш модификатор Силы дробящего урона.
+FightingStyle/&ShieldExpertTitle=Удар щитом
+FightingStyle/&TorchbearerDescription=Бонусным действием вы можете использовать источник света, который вы держите, чтобы попытаться поджечь противника касанием. Ваша цель должна преуспеть в спасброске Ловкости (Сл равна 8 + ваш бонус мастерства + ваш модификатор Ловкости), или начнёт получать урон огнём 1d4 за ход в течение 1 минуты или до тех пор, пока не будет потушена.
 FightingStyle/&TorchbearerTitle=Факелоносец
 FightingStyle/&ZenArcherDescription=При использовании лука ваша интуиция направляет ваши руки. Увеличьте значение Мудрости на 1 при максимуме 20. Вы можете использовать модификатор Мудрости вместо модификатора Ловкости при бросках атаки и урона с этим оружием.
 FightingStyle/&ZenArcherTitle=Мудрая стрельба из лука
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Level20-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Level20-ru.txt
index c7b866049c..690641baf5 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Level20-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Level20-ru.txt
@@ -74,12 +74,8 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=Начиная с 17-
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=Чистота света
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=Начиная с 17-го уровня, вы получаете возможность создавать смертельные колебания в чужом теле. Если вы попадёте по существу безоружным ударом, вы можете потратить 3 очка ци, чтобы создать неуловимые колебания в его теле, которые длятся в течение 24 часов. Колебания безвредны, пока вы не остановите их действием. Когда вы используете это действие, существо должно совершить спасбросок Телосложения. В случае успеха цель получает урон некротической энергией 10к10, а в случае провала её хиты опускаются до 1, и она становится оглушённой до начала своего следующего хода.
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=Дрожащая ладонь
-Feature/&GrantInvocationsSpellMasteryDescription=Вы достигаете такого мастерства в отношении некоторых заклинаний, что можете накладывать их неограниченное количество раз. Первые два заклинания волшебника 1-го и 2-го уровня, которые вы подготовили, вы можете накладывать без увеличения их уровня, не тратя ячейки заклинаний. Если вы хотите увеличить уровень этих заклинаний, вы должны потратить ячейку заклинаний как обычно.
-Feature/&GrantInvocationsSpellMasteryTitle=Мастерство заклинателя
-Feature/&InvocationPoolSignatureSpellsLearnDescription=Выберите фирменное заклинание для изучения.
-Feature/&InvocationPoolSignatureSpellsLearnTitle=Фирменное заклинание
-Feature/&InvocationPoolWizardSignatureSpellsDescription=Вы получаете власть над двумя мощными заклинаниями и можете накладывать их без усилий. Выберите два заклинания волшебника 3-го уровня из своей книги заклинаний в качестве фирменных заклинаний. Для вас эти заклинания всегда считаются подготовленными, они не учитываются в количестве подготовленных заклинаний, и вы можете наложить каждое из этих заклинаний 3-го уровня, не тратя ячейку заклинаний. Когда вы так поступаете, вы не можете наложить их повторно таким же образом, пока не закончите короткий или продолжительный отдых.
-Feature/&InvocationPoolWizardSignatureSpellsTitle=Фирменное заклинание
+Feature/&FeatureWizardSpellMasteryDescription=Вы достигаете такого мастерства в отношении некоторых заклинаний, что можете накладывать их неограниченное количество раз. Выберите одно заклинание волшебника 1-го уровня и одно заклинание волшебника 2-го уровня, которые есть в вашей книге заклинаний. Вы можете накладывать эти заклинания без увеличения их уровня, не тратя ячейки заклинаний, при условии, что вы их подготовили. Если вы хотите увеличить уровень этих заклинаний, вы должны потратить ячейку заклинаний как обычно.
+Feature/&FeatureWizardSpellMasteryTitle=Мастерство заклинателя
 Feature/&MagicAffinityArchDruidDescription=Количество применений умения «Дикий облик» не ограничено. Кроме того, вы можете игнорировать соматический и вербальный компоненты заклинаний друида, а также материальные компоненты без указанной стоимости и не расходуемые заклинанием. Это действует как в нормальном облике, так и в облике Зверя.
 Feature/&MagicAffinityArchDruidTitle=Архидруид
 Feature/&MagicAffinitySorcererChildRiftMagicMasteryDescription=Начиная с 18-го уровня, каждый раз, когда вы бросаете d20, чтобы восстановить ячейку заклинания, используя умение Магия Разлома, вы теперь можете восстановить ячейку любого уровня при выпадении 18, 19 или 20.
@@ -142,6 +138,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=Начиная с 1
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=Физическое совершенство
 Feature/&PowerWarlockEldritchMasterDescription=Вы можете обратиться к внутреннему резерву мистической силы, умоляя при этом покровителя восстановить потраченные ячейки заклинаний. Вам надо потратить 1 минуту, умоляя покровителя, чтобы восстановить все использованные ячейки заклинаний, дарованные умением «Магия договора». Вы должны закончить продолжительный отдых, чтобы применить это умение вновь.
 Feature/&PowerWarlockEldritchMasterTitle=Таинственный мастер
+Feature/&PowerWizardSignatureSpellsDescription=Вы получаете власть над двумя мощными заклинаниями и можете накладывать их без усилий. Выберите два заклинания волшебника 3-го уровня из своей книги заклинаний в качестве фирменных заклинаний. Для вас эти заклинания всегда считаются подготовленными, они не учитываются в количестве подготовленных заклинаний, и вы можете наложить каждое из этих заклинаний 3-го уровня, не тратя ячейку заклинаний. Когда вы так поступаете, вы не можете наложить их повторно таким же образом, пока не закончите короткий или продолжительный отдых.
+Feature/&PowerWizardSignatureSpellsTitle=Фирменное заклинание
 Feature/&SenseRangerFeralSensesDescription=Вы получаете сверхъестественные чувства, которые помогут вам сражаться с существами, которых вы не можете увидеть. Когда вы атакуете существо, которое не видите, ваша неспособность видеть не накладывает помеху броскам атаки по нему.
 Feature/&SenseRangerFeralSensesTitle=Дикие чувства
 Feedback/&AdditionalDamageBrutalAssaultFormat=Жестокий натиск!
@@ -158,6 +156,14 @@ Reaction/&UsePhysicalPerfectionDescription=Вы можете потратить
 Reaction/&UsePhysicalPerfectionReactDescription=Вы можете потратить 1 очко ци, чтобы восстановить 1 хит.
 Reaction/&UsePhysicalPerfectionReactTitle=Лечение
 Reaction/&UsePhysicalPerfectionTitle=Физическое совершенство
+RestActivity/&RestActivitySignatureSpellsDescription=Вы можете выбрать свои фирменные заклинания один раз.
+RestActivity/&RestActivitySignatureSpellsTitle=Фирменное заклинание
+RestActivity/&RestActivitySpellMasteryDescription=Вы можете изменить список мастерских заклинаний, когда закончите продолжительных отдых.
+RestActivity/&RestActivitySpellMasteryTitle=Мастерство заклинателя
 Rules/&DamagePureDescription=Неуловимые вибрации, которые разрушают жертву изнутри.
 Rules/&DamagePureTitle=Чистота
+Screen/&SignatureSpellsExtraSpellDescription=Это фирменное заклинание всегда подготовлено и один раз до продолжительного отдыха не требует затрат ячеек заклинаний при накладывании на самом низком уровне.
+Screen/&SignatureSpellsExtraSpellTitle=Фирменное заклинание
+Screen/&SpellMasteryExtraSpellDescription=Это мастерское заклинание всегда подготовлено и не требует затрат ячеек заклинаний при накладывании на самом низком уровне.
+Screen/&SpellMasteryExtraSpellTitle=Мастерство заклинателя
 Tooltip/&MustHaveQuiveringPalmCondition=Не отмечен Дрожащей ладонью
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Others-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Others-ru.txt
index 7b2092b5db..d25dbb53fb 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Others-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Others-ru.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=Активировать/деактиви
 Action/&BrutalStrikeToggleTitle=Жестокий удар
 Action/&CastPlaneMagicDescription=Произнесите заклинание, полученное от одно из черт "Затронутый тем или иным Планом"
 Action/&CastPlaneMagicTitle=Направить планарную магию
-Action/&CastSignatureSpellsDescription=Произнесите эти заклинания 3-го уровня без затрат ячеек заклинаний
-Action/&CastSignatureSpellsTitle=Фирменное заклинание
-Action/&CastSpellMasteryDescription=Произнесите ваши подготовленные заклинания 1-го и 2-го уровня без затрат ячеек заклинаний
-Action/&CastSpellMasteryTitle=Мастерство заклинателя
 Action/&CoordinatedAssaultToggleDescription=Активировать/деактивировать Скоординированное нападение
 Action/&CoordinatedAssaultToggleTitle=Скоординированное нападение
 Action/&CunningStrikeToggleDescription=Активировать/деактивировать Хитрый удар
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=Сила
 UI/&CustomFeatureSelectionTooltipTypeProficiency=Владение
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=Предпочтительный противник
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=Родство с типом местности
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=Фирменное заклинание
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=Драконье наследие чародея
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=Тренировка обращению с оружием
 UI/&ForcePreferredCantripDescription=Если эта опция включена, сработает только предпочтительный заговор. Если предпочтительный заговор не выбран, то сработает первый подходящий, вне зависимости от настройки.
diff --git a/SolastaUnfinishedBusiness/Translations/ru/Settings-ru.txt b/SolastaUnfinishedBusiness/Translations/ru/Settings-ru.txt
index f77b829128..31dc98ad65 100644
--- a/SolastaUnfinishedBusiness/Translations/ru/Settings-ru.txt
+++ b/SolastaUnfinishedBusiness/Translations/ru/Settings-ru.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=Позволять накладывать заклин
 ModUi/&AllowHornsOnAllRaces=Разрешить всем расам носить рога <i><color=#F0DAA0>[результат может быть ужасным, в зависимости от расы, головы и рогов]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=Разрешить более реальные состояния на панели отдыха <i><color=#F0DAA0>[скрыть действия после отдыха на панели ДО и восстанавливаемые способности на панели ПОСЛЕ]</color></i>
 ModUi/&AllowStackedMaterialComponent=Позволить стакаться материальным компонентам <i><color=#F0DAA0>[например, 2 бриллианта стоимостью 500 ЗМ равны одному стоимостью 1000 ЗМ]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=Позволить выбирать цели при накладывании заклинания <color=#D89555>Цепной молнии</color>
 ModUi/&AllowUnmarkedSorcerers=Разрешить <color=#D89555>Чародеев</color> без родовых отметин и татуировок
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=Клавиша <color=#1E81B0>ALT</color> подсвечивает только предметы в зоне видимости группы <i><color=#F0DAA0>[только для кастомных подземелий]</color></i>
 ModUi/&ArcaneShieldstaffOptions=Позволить настраиваться любому классу на <color=#D89555>Магический защитный посох</color>
@@ -73,18 +72,19 @@ ModUi/&DisableSenseSuperiorDarkVisionFromAllRaces=Отключить <color=#D89
 ModUi/&DisableUnofficialTranslations=Отключить поддержку неофициальных переводов для ускорения загрузки мода <i><color=#F0DAA0>[если вы не знаете китайского, итальянского, японского, корейского или испанского языков]</color></i>
 ModUi/&DisplayAllKnownSpellsDuringLevelUp=<i>+ Отображать все известные заклинания от других классов во время повышения уровня</i>
 ModUi/&DisplayPactSlotsOnSpellSelectionPanel=<i>+ Отображать ячейки заклинаний <color=#D89555>Колдуна</color> на панели выбора заклинаний вместо панели персонажа</i>
-ModUi/&DocsArcaneShots=ДОКУМЕНТЫ: Магические выстрелы
-ModUi/&DocsBackgrounds=ДОКУМЕНТЫ: Предыстории
-ModUi/&DocsFeats=ДОКУМЕНТЫ: Черты
-ModUi/&DocsFightingStyles=ДОКУМЕНТЫ: Боевые стили
-ModUi/&DocsInfusions=ДОКУМЕНТЫ: Инфузии
-ModUi/&DocsInvocations=ДОКУМЕНТЫ: Воззвания
-ModUi/&DocsManeuvers=ДОКУМЕНТЫ: Приёмы
-ModUi/&DocsMetamagic=ДОКУМЕНТЫ: Метамагия
-ModUi/&DocsRaces=ДОКУМЕНТЫ: Расы
-ModUi/&DocsSpells=ДОКУМЕНТЫ: Заклинания
-ModUi/&DocsSubclasses=ДОКУМЕНТЫ: Архетипы
-ModUi/&DocsSubraces=ДОКУМЕНТЫ: Разновидности
+ModUi/&DocsArcaneShots=Магические выстрелы
+ModUi/&DocsBackgrounds=Предыстории
+ModUi/&DocsFeats=Черты
+ModUi/&DocsFightingStyles=Боевые стили
+ModUi/&DocsInfusions=Инфузии
+ModUi/&DocsInvocations=Воззвания
+ModUi/&DocsManeuvers=Приёмы
+ModUi/&DocsMetamagic=Метамагия
+ModUi/&DocsRaces=Расы
+ModUi/&DocsSpells=Заклинания
+ModUi/&DocsSubclasses=Архетипы
+ModUi/&DocsSubraces=Разновидности
+ModUi/&DocsVersatilities=Универсальность
 ModUi/&Donate=<b><color=#D89555>Задонатить:</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=Скрывать шлемы на персонажах <b><i><color=#C04040E0>[Необходим перезапуск]</color></i></b>
 ModUi/&DontEndTurnAfterReady=Не заканчивать ход после использования действия <color=#D89555>Подготовка</color> <i><color=#F0DAA0>[позволяет использовать Бонусное действие или любые дополнительные основные действия от Ускорения или других источников]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=Включить <color=#D89555>Плутам</co
 ModUi/&EnableRogueSteadyAim=Включить <color=#D89555>Плутам</color> <b>Точное прицеливание</b> на уровне 3 <i><color=#F0DAA0>[бонусным действием даёт преимущество на следующий бросок атаки в текущем ходу, если вы ещё не перемещались]</color></i>
 ModUi/&EnableRogueStrSaving=Включить <color=#D89555>Плутам</color> использование модификаторов ЛОВ или СИЛ для <b>Хитрого/Коварного удара</b>, <b>Ослабляющего/Улучшенного ослабляющего удара</b> и <b>Града клинков</b>
 ModUi/&EnableSaveByLocation=Включить сохранения по кампаниям/локациям
+ModUi/&EnableSignatureSpellsRelearn=Включить <color=#D89555>Волшебникам</color> подготовку фирменных заклинаний после каждого продолжительного отдыха <i><color=#F0DAA0>[вместо того, чтобы выбирать их один раз на 20-м уровне]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=Включить сортировку ассетов в редакторе Создателя Подземелий
 ModUi/&EnableStatsOnHeroTooltip=Отображать статистику на всплывающей подсказке о герое <i><color=#F0DAA0>[например: критические удары, критические промахи и т.д.]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=<i>+ Также каждый герой добавляет к весомости результат броска D20 для привнесения элемента случайности <color=#F0DAA0>[весомость выбора = голоса * модификатор Харизмы героя + бросок D20]</color></i>
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Group-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Group-zh-CN.txt
index 5b6cc6df02..40f08d2d19 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Group-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Group-zh-CN.txt
@@ -84,7 +84,7 @@ Feat/&FeatGroupMeleeCombatDescription={0}
 Feat/&FeatGroupMeleeCombatTitle=战斗：近战
 Feat/&FeatGroupOldTacticsDescription=你的力量或敏捷捷 +1，上限为 20。每轮一次，当你的近战武器触及范围内的俯卧敌人站起来时，你可以对目标进行借机攻击。
 Feat/&FeatGroupOldTacticsTitle=故技重施
-Feat/&FeatGroupOrcishAggressionDescription=你的攻击性不知疲倦地燃烧。你将获得以下好处：\n• 你的力量或体质 +1，上限为 20。\n• 作为附赠动作，当在主手中挥舞近战武器时，你可以以你的速度冲向你选择的敌人并用你的主要武器自由攻击该生物。
+Feat/&FeatGroupOrcishAggressionDescription=你的攻击性不知疲倦地燃烧。你将获得以下好处：\n• 你的力量或体质 +1，上限为 20。\n• 作为附赠动作，当在主手中挥舞近战武器时，你可以用你的速度朝着你选择的敌人冲锋并用你的主要武器自由攻击该生物。此特性可以在每次长休时使用熟练加值次数。
 Feat/&FeatGroupOrcishAggressionTitle=兽人侵袭
 Feat/&FeatGroupOrcishFuryDescription=你的怒火不知疲倦地燃烧。你将获得以下好处：\n• 你的力量或体质 +1，上限为 20。\n• 当你使用简单武器或军用武器进行攻击时，你可以投掷该武器的其中一个额外增加一次伤害骰子，并将其添加为武器伤害类型的额外伤害。一旦你使用了此能力，你就无法再次使用它，直到你完成短休或长休。\n• 在你使用“坚韧不屈”特质后，你可以立即使用你的反应来进行一次武器攻击。
 Feat/&FeatGroupOrcishFuryTitle=兽人之怒
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/MeleeCombat-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/MeleeCombat-zh-CN.txt
index 9ae4a0bd38..c09a29da51 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/MeleeCombat-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/MeleeCombat-zh-CN.txt
@@ -22,7 +22,7 @@ Feat/&FeatCrusherConDescription=你精通粉碎敌人的艺术。你的体质 +1
 Feat/&FeatCrusherConTitle=粉碎者【体质】
 Feat/&FeatCrusherStrDescription=你精通粉碎敌人的艺术。你的力量 +1，上限为 20。每回合一次，当你用造成钝击伤害的攻击击中生物时，你将敌人推开 5 尺。当你重击时，在你的下一轮开始之前，对该生物的攻击掷骰具有优势。
 Feat/&FeatCrusherStrTitle=粉碎者【力量】
-Feat/&FeatDefensiveDuelistDescription=当你挥舞着你擅长的精巧武器时，另一个生物用近战攻击击中你，你可以使用你的反应将你的熟练加值添加到该攻击的AC中，这可能会导致攻击错过你。
+Feat/&FeatDefensiveDuelistDescription=当你挥舞着你擅长的近战武器时，另一个生物用近战攻击击中你，你可以使用你的反应将你的熟练加值添加到你对该次攻击的护甲等级上，这可能会导致攻击未命中你。
 Feat/&FeatDefensiveDuelistTitle=防御式决斗者
 Feat/&FeatFellHandedDescription=你掌握了手斧、战斧、巨斧、战锤和大锤。使用其中任何一项时，你获得下列增益：\n• 你使用该武器进行的攻击掷骰获得 +1 加值。\n• 当你在近战攻击中有优势时，如果两个 d20 中较低的一个也会击中目标，你就会将目标击倒。\n• 当你在近战攻击中处于劣势并且没有命中时，目标将受到与你的力量调整值相等的钝击伤害。
 Feat/&FeatFellHandedTitle=凶残握持
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/OtherFeats-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/OtherFeats-zh-CN.txt
index a1c4000bb8..7ad4b341b5 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/OtherFeats-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/OtherFeats-zh-CN.txt
@@ -30,7 +30,6 @@ Feat/&FeatChefConDescription=你的体质 +1，上限为 20。\n你可以花 1 
 Feat/&FeatChefConTitle=大厨【体质】
 Feat/&FeatChefWisDescription=你的感知 +1，上限为 20。\n你可以花 1 小时做饭，恢复你及同伴 1d8 的生命值。\n每日一次，你可以花 1 小时做出数量为你的熟练加值，食用时可提供 5 点临时生命值的美味。
 Feat/&FeatChefWisTitle=大厨【感知】
-Feat/&FeatCriticalVirtuosoDescription=你的重击范围降低了 1 点。
 Feat/&FeatDungeonDelverDescription=警惕许多地城中隐藏的陷阱和秘门，你将获得以下好处：\n• 你在感知（察觉）和智力（调查）检定上具有优势。\n• 你在避免或抵抗陷阱的豁免检定上具有优势。\n• 你获得对陷阱伤害的抗性。\n• 快速行进不会对你的被动感知（察觉）造成正常的 -5 减值。
 Feat/&FeatDungeonDelverTitle=地城探险者
 Feat/&FeatEldritchAdeptDescription=你可以从邪术士职业中选择一种祈唤。如果祈唤有先决条件，则只有当你是邪术士并且满足先决条件时才能选择该祈唤。每当你获得一个等级时，你就可以用另一个来自邪术士职业的祈唤来替换该祈唤。
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Races-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Races-zh-CN.txt
index d5151c4447..9979ed1e9d 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Races-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/Races-zh-CN.txt
@@ -36,9 +36,9 @@ Feat/&FeatGrudgeBearerWisDescription=你对某种特定的生物怀有深深的
 Feat/&FeatGrudgeBearerWisTitle=怨恨者【感知】
 Feat/&FeatInfernalConstitutionDescription=恶魔之血在你体内流淌，释放出恶魔般的韧性。你获得以下增益：\n• 你的体质 +1，上限为 20。\n• 你对冷冻和毒素伤害具有抗性。\n• 你在对抗中毒的豁免检定中具有优势。
 Feat/&FeatInfernalConstitutionTitle=炼狱体质
-Feat/&FeatOrcishAggressionConDescription=你的攻击性不知疲倦地燃烧。你将获得以下好处：\n• 你的体质 +1，上限为 20。\n• 作为附赠动作，当在主手中挥舞近战武器时，你可以以你的速度冲向你选择的敌人并用你的主要武器自由攻击该生物。
+Feat/&FeatOrcishAggressionConDescription=你的攻击性不知疲倦地燃烧。你将获得以下好处：\n• 你的体质 +1，上限为 20。\n• 作为附赠动作，当在主手中挥舞近战武器时，你可以用你的速度朝着你选择的敌人冲锋并用你的主要武器自由攻击该生物。此特性可以在每次长休时使用熟练加值次数。
 Feat/&FeatOrcishAggressionConTitle=兽人侵袭【体质】
-Feat/&FeatOrcishAggressionDescription=你的攻击性不知疲倦地燃烧。你将获得以下好处：\n• 你的力量 +1，上限为 20。\n• 作为附赠动作，当在主手中挥舞近战武器时，你可以以你的速度冲向你选择的敌人并用你的主要武器自由攻击该生物。
+Feat/&FeatOrcishAggressionDescription=你的攻击性不知疲倦地燃烧。你将获得以下好处：\n• 你的力量 +1，上限为 20。\n• 作为附赠动作，当在主手中挥舞近战武器时，你可以用你的速度朝着你选择的敌人冲锋并用你的主要武器自由攻击该生物。此特性可以在每次长休时使用熟练加值次数。
 Feat/&FeatOrcishAggressionTitle=兽人侵袭【力量】
 Feat/&FeatOrcishFuryConDescription=你的怒火燃烧不绝。你获得以下好处：\n• 体质 +1，上限为 20。\n• 当你使用简易武器或军用武器攻击命中时，你可以再掷一枚与武器伤害骰大小和伤害类型相同的伤害骰作为额外伤害。一旦你使用了此能力，直到完成一次短休或长休不能再次使用。\n• 当你使用“坚韧不屈”特质时，可以立即用反应来进行一次武器攻击。
 Feat/&FeatOrcishFuryConTitle=兽人之怒【体质】
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/RangedCombat-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/RangedCombat-zh-CN.txt
index 3067824964..5adaa340c8 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/RangedCombat-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Feats/RangedCombat-zh-CN.txt
@@ -2,13 +2,13 @@ Condition/&ConditionFeatSteadyAimAdvantageDescription=你在下一次攻击检
 Condition/&ConditionFeatSteadyAimAdvantageTitle=稳定瞄准
 Condition/&ConditionFeatSteadyAimRestrainedDescription=在你的回合结束之前你不能移动。
 Condition/&ConditionFeatSteadyAimRestrainedTitle=受稳定瞄准束缚
-Feat/&FeatBowMasteryDescription=你的弓箭专业训练会给你带来这些好处：\n• 你在使用短弓和长弓进行的伤害检定上获得 +1 加值。\n• 当你在你的回合使用短弓使用攻击动作时，你可以使用附赠动作进行一次远程武器攻击，将你的属性调整值添加到伤害中。\n• 在使用长弓进行攻击和伤害检定时，你可以使用力量替代敏捷。
+Feat/&FeatBowMasteryDescription=当你在回合中使用弓箭进行攻击动作时，你可以用附赠动作进行一次远程武器攻击，将你的属性调整值添加到伤害中。
 Feat/&FeatBowMasteryTitle=弓箭精通
-Feat/&FeatCrossbowMasteryDescription=你的弩矢专业训练将为你带来以下好处：\n• 你使用重弩、轻弩和手弩进行的伤害检定获得 +1 加值。\n• 当你在回合中使用轻弩或手弩进行攻击动作时，你可以使用附赠动作进行一次远程武器攻击，将你的属性调整值添加到伤害中。\n• 在使用重弩进行攻击和伤害检定时，你可以使用力量替代敏捷。
+Feat/&FeatCrossbowMasteryDescription=当你在回合中使用弩进行攻击动作时，你可以用附赠动作进行一次远程武器攻击，将你的属性调整值添加到伤害中。
 Feat/&FeatCrossbowMasteryTitle=弩矢精通
 Feat/&FeatDeadeyeDescription=你已经学会了用准确性换取更致命的射击：\n• 当使用远程武器攻击时，你可以选择对你的攻击检定承受 -5 减值，其伤害掷骰获得 +10 加值。\n• 攻击在远距离不会造成劣势，远程武器攻击会忽略半身掩护和四分之三掩护。
 Feat/&FeatDeadeyeTitle=神射手
-Feat/&FeatRangedExpertDescription=你对远程武器的专业训练为你带来以下好处：\n• 近战范围内的攻击不会带来劣势。\n• 当你在你的回合采取攻击行动时，你可以使用附赠动作进行一次单手远程武器攻击，附加你的属性调整值。
+Feat/&FeatRangedExpertDescription=你对远程武器的专业训练为你带来以下好处：\n• 近战范围内的攻击不会带来劣势。\n• 当你在你的回合采取攻击行动时，你可以用附赠动作进行一次单手远程武器攻击，将你的属性调整值添加到伤害中。
 Feat/&FeatRangedExpertTitle=远程专家
 Feat/&FeatSteadyAimDescription=你的敏捷 +1，上限为 20。作为附赠动作，你在当前回合的下一次攻击检定中获得优势。只有当你在本回合中没有移动时你才能使用这个附赠动作，并且在你使用这个附赠动作后，你的速度在本回合结束前为 0。
 Feat/&FeatSteadyAimTitle=稳步瞄准
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/FightingStyles-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/FightingStyles-zh-CN.txt
index ed2b446545..90bbb40d83 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/FightingStyles-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/FightingStyles-zh-CN.txt
@@ -6,9 +6,11 @@ Feedback/&AdditionalDamageCripplingFormat=致残伤害！
 Feedback/&AdditionalDamageCripplingLine={1} 遭受致残伤害。
 Feedback/&AdditionalDamageExecutionerFormat=处刑！
 Feedback/&AdditionalDamageExecutionerLine={0} 处刑 {1} +{2} 额外伤害！
+FightingStyle/&AstralReachDescription=你的徒手攻击范围增加 5 尺。
+FightingStyle/&AstralReachTitle=星界触及
 FightingStyle/&BlindFightingDescription=你有 10 尺范围的盲视。在这个范围内，即使你被致盲或身处黑暗，你依然能看到任何没有完全遮蔽的物体。此外，你可以看到该范围内的隐形生物，除非其隐藏成功。
 FightingStyle/&BlindFightingTitle=盲斗
-FightingStyle/&CripplingDescription=近战攻击命中后，你可以将对手的速度降低 10 尺，并将他们的护甲等级降低 1 级，直到你的下一回合结束。
+FightingStyle/&CripplingDescription=近战攻击命中后，你可以将对手的速度降低 10 尺，直到你的下回合结束。
 FightingStyle/&CripplingTitle=致残
 FightingStyle/&ExecutionerDescription=你将你的熟练加值加到对目盲、恐慌、束缚、失能、麻痹、倒地或震慑的生物的伤害上。
 FightingStyle/&ExecutionerTitle=刽子手
@@ -28,12 +30,12 @@ FightingStyle/&PugilistDescription=你的徒手攻击造成额外的 1d4 钝击
 FightingStyle/&PugilistTitle=拳师
 FightingStyle/&RemarkableTechniqueDescription=你接受了武术训练，可以让你执行称为战技的特殊战斗技巧：\n• 你可以从战斗大师子职中学习你选择的一种战技。这些战技的战技 DC 为 8 + 熟练加值 + 力量或敏捷调整值，以较高者为准。\n• 你获得 1 个卓越骰。骰子是 d6，如果你不是战斗大师，它的尺寸不会增加。该骰子用于为你的战技提供动力。当你使用它时它会被消耗，当你完成短休或长休时它会被恢复。
 FightingStyle/&RemarkableTechniqueTitle=卓越技法
-FightingStyle/&RopeItUpDescription=你的投掷攻击在攻击和伤害掷骰上获得 +1，你将它的最长距离和最短距离扩展 10 尺，并且在它被用来进行投掷攻击后立即返回你的手中。
-FightingStyle/&RopeItUpTitle=绳索戏法
+FightingStyle/&RopeItUpDescription=当你使用投掷武器进行远程攻击时，其短距离增加 10 英尺，远距离增加 20 英尺。此外，武器在用于投掷攻击后会立即返回你的手中。
+FightingStyle/&RopeItUpTitle=投掷武器大师
 FightingStyle/&SentinelDescription=你已经掌握了利用任何敌人防御的技巧：\n• 当你以借机攻击击中一个生物时，该生物的速度在本回合剩余时间变为 0。\n• 生物会引发借机攻击即使他们在离开你的触及范围之前采取撤离动作，你也是如此。\n• 当一个生物对你以外的目标进行攻击时，你可以使用你的反应对攻击生物进行近战武器攻击。
 FightingStyle/&SentinelTitle=哨兵
-FightingStyle/&ShieldExpertDescription=你受过使用盾牌作为武器的训练。它成为一件你擅长的近战武器，造成 1d4 的钝击伤害。在使用盾牌时，你会在推撞尝试中获得优势。
-FightingStyle/&ShieldExpertTitle=盾牌专家
+FightingStyle/&ShieldExpertDescription=你可以用附赠动作用你的盾牌猛击一个生物，把它暂时变成你擅长的特殊的临时武器。对你 5 尺内的生物进行近战武器攻击，该攻击使用力量调整值。如果你命中，该生物将受到 1d4 + 力量调整值 作为钝击伤害。
+FightingStyle/&ShieldExpertTitle=盾击
 FightingStyle/&TorchbearerDescription=你擅长在战斗中使用火把。每回合一次，作为一个附赠动作，你可以选择使用你装备的光源来尝试点燃你可以接触到的敌人。你的目标必须通过一次敏捷豁免（DC 8 + 你的熟练加值 + 你的敏捷调整值），否则每回合受到 1d4 火焰伤害，持续 3 回合或直到熄灭。
 FightingStyle/&TorchbearerTitle=火炬手
 FightingStyle/&ZenArcherDescription=使用弓时，你的直觉会引导你的手。将你的感知属性 +1，上限为 20。你可以使用你的感知调整值代替你的敏捷调整值来使用这些武器进行攻击和伤害检定。
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Level20-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Level20-zh-CN.txt
index ec62fc3eca..cf723d72c9 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Level20-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Level20-zh-CN.txt
@@ -74,12 +74,8 @@ Feature/&FeatureSetTraditionLightPurityOfLightDescription=从第 17 级开始，
 Feature/&FeatureSetTraditionLightPurityOfLightTitle=纯净之光
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmDescription=从第 17 级开始，你可以将暗劲击入他人体内。你的徒手打击命中目标生物时，可以消耗 3 点气将一股致命的劲力送入敌人体内。劲力的持续天数等于你的武僧等级，且在你用动作终止劲力之前它不产生任何减益。而你使用动作终止劲力后，目标必须进行一次体质豁免，豁免失败则其生命值降为0，豁免成功则目标受到 10d10 的 黯蚀伤害。
 Feature/&FeatureSetTraditionOpenHandQuiveringPalmTitle=渗透劲
-Feature/&GrantInvocationsSpellMasteryDescription=你已经精通某些法术，可以随意施展它们。你准备的前两个 1 级和 2 级法师法术可以在不消耗法术位的情况下以最低环级施展。如果你想施展任何一个更高环阶的法术，你必须照常消耗一个法术位。
-Feature/&GrantInvocationsSpellMasteryTitle=法术精通
-Feature/&InvocationPoolSignatureSpellsLearnDescription=选择一个招牌法术。
-Feature/&InvocationPoolSignatureSpellsLearnTitle=招牌法术
-Feature/&InvocationPoolWizardSignatureSpellsDescription=你精通两个强大的法术，可以毫不费力地施放它们。选择两个 3 环法师法术作为你的招牌法术。你总是准备着这些法术，它们不会占用你的法术准备位，你可以施展这两个法术的 3 环版本各一次，且无需消耗法术位。每次短休或长休后可以使用一次。
-Feature/&InvocationPoolWizardSignatureSpellsTitle=招牌法术
+Feature/&FeatureWizardSpellMasteryDescription=你已经精通某些法术，可以随意施放它们。选择你的法术书中的一个 1 环法师法术和一个 2 环法师法术。只要你准备了它们，就可以随意施展其最低环阶版本，且无需消耗法术位。你也可以消耗法术位来施展其更高环阶版本。
+Feature/&FeatureWizardSpellMasteryTitle=法术精通
 Feature/&MagicAffinityArchDruidDescription=你可以无限次使用荒野形态。此外，你可以忽略德鲁伊法术的语言和肢体成分，以及任何没有成本且不会被法术消耗的物质成分。你的正常形态和野兽形态都从荒野形态中获得了这个好处。
 Feature/&MagicAffinityArchDruidTitle=大德鲁伊
 Feature/&MagicAffinitySorcererChildRiftMagicMasteryDescription=从第 18 级开始，每当你投掷 d20 来从裂隙魔法特性中重新获得法术位时，你现在可以在投掷 18、19 或 20 时重新获得任何环阶法术位。
@@ -142,6 +138,8 @@ Feature/&PowerTraditionSurvivalPhysicalPerfectionDescription=从第 17 级开始
 Feature/&PowerTraditionSurvivalPhysicalPerfectionTitle=超凡体能
 Feature/&PowerWarlockEldritchMasterDescription=你可以利用储备的魔力祈求你的宗主为你恢复已消耗的法术位。你可以花 1 分钟祈求宗主的帮助，恢复所有你已消耗的契约魔法法术位。使用该特性恢复法术位后，你必须完成一次长休才能再次使用该特性。
 Feature/&PowerWarlockEldritchMasterTitle=魔能掌控
+Feature/&PowerWizardSignatureSpellsDescription=你精通两个强大的法术，甚至可以用更低的成本施展这些法术。选择你的法术书中的两个 3 环法师法术，作为你的招牌法术。这两个法术将永远视为已准备法术，且不计入你的准备法术数量之中，并且你可以施展这两个法术的 3 环版本各一次，且无需消耗法术位。招牌法术使用后，需要完成一次短休或长休才能再次使用。
+Feature/&PowerWizardSignatureSpellsTitle=招牌法术
 Feature/&SenseRangerFeralSensesDescription=你获得超自然的感官，帮助你对抗看不见的生物。当你攻击一个你看不见的生物时，你无法看见它不会对你对它的攻击掷骰造成不利影响。
 Feature/&SenseRangerFeralSensesTitle=野性感官
 Feedback/&AdditionalDamageBrutalAssaultFormat=凶蛮之袭！
@@ -158,6 +156,14 @@ Reaction/&UsePhysicalPerfectionDescription=使用 1 点气回复 1 点生命值
 Reaction/&UsePhysicalPerfectionReactDescription=使用 1 点气回复 1 点生命值。
 Reaction/&UsePhysicalPerfectionReactTitle=治疗
 Reaction/&UsePhysicalPerfectionTitle=超凡体能
+RestActivity/&RestActivitySignatureSpellsDescription=您可以选择一次您的签名咒语。
+RestActivity/&RestActivitySignatureSpellsTitle=签名咒语
+RestActivity/&RestActivitySpellMasteryDescription=当你完成长休后，你可以改变你的精通法术列表。
+RestActivity/&RestActivitySpellMasteryTitle=法术精通
 Rules/&DamagePureDescription=暗劲摧毁了敌人的身躯。
 Rules/&DamagePureTitle=暗劲
+Screen/&SignatureSpellsExtraSpellDescription=此招牌法术始终是准备好的，并且每次长休一次，在最低环阶施展时不会消耗法术位。
+Screen/&SignatureSpellsExtraSpellTitle=招牌
+Screen/&SpellMasteryExtraSpellDescription=该精通法术始终是准备好的，并且在最低环阶施展时不会消耗法术位。
+Screen/&SpellMasteryExtraSpellTitle=精通
 Tooltip/&MustHaveQuiveringPalmCondition=不被渗透劲影响
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Others-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Others-zh-CN.txt
index d56507b77a..cbee905d5f 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Others-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Others-zh-CN.txt
@@ -4,10 +4,6 @@ Action/&BrutalStrikeToggleDescription=激活/停用凶蛮打击
 Action/&BrutalStrikeToggleTitle=凶蛮打击
 Action/&CastPlaneMagicDescription=施展你从位面之触专长中获得的法术之一
 Action/&CastPlaneMagicTitle=施展位面魔法
-Action/&CastSignatureSpellsDescription=使用这些 3 环法术时不消耗法术位
-Action/&CastSignatureSpellsTitle=招牌法术
-Action/&CastSpellMasteryDescription=你施放的 1 环或 2 环法术不消耗法术位
-Action/&CastSpellMasteryTitle=法术精通
 Action/&CoordinatedAssaultToggleDescription=激活/停用协同攻击
 Action/&CoordinatedAssaultToggleTitle=协同攻击
 Action/&CunningStrikeToggleDescription=激活/停用狡诈打击
@@ -312,7 +308,6 @@ UI/&CustomFeatureSelectionTooltipTypePower=力量
 UI/&CustomFeatureSelectionTooltipTypeProficiency=熟练项
 UI/&CustomFeatureSelectionTooltipTypeRangerPreferredEnemy=首选敌人
 UI/&CustomFeatureSelectionTooltipTypeRangerTerrainTypeAffinity=地形类型亲和
-UI/&CustomFeatureSelectionTooltipTypeSignatureSpells=招牌法术
 UI/&CustomFeatureSelectionTooltipTypeSorcererDraconicChoice=龙族血统术法起源
 UI/&CustomFeatureSelectionTooltipTypeWeaponSpecialization=武器训练
 UI/&ForcePreferredCantripDescription=如果此开关为开，则只有首选的戏法可以触发。如果没有选择首选的戏法，那么第一个有效的戏法将被触发，而无视这个开关。
diff --git a/SolastaUnfinishedBusiness/Translations/zh-CN/Settings-zh-CN.txt b/SolastaUnfinishedBusiness/Translations/zh-CN/Settings-zh-CN.txt
index 9b55332973..c1a3ad71c1 100644
--- a/SolastaUnfinishedBusiness/Translations/zh-CN/Settings-zh-CN.txt
+++ b/SolastaUnfinishedBusiness/Translations/zh-CN/Settings-zh-CN.txt
@@ -30,7 +30,6 @@ ModUi/&AllowHasteCasting=允许使用加速术赋予的额外动作施法<color=
 ModUi/&AllowHornsOnAllRaces=允许所有种族长角<i><color=#F0DAA0>[根据种族、头和角的不同，结果可能看起来很怪]</color></i>
 ModUi/&AllowMoreRealStateOnRestPanel=允许在休息面板上显示更多真实状态<i><color=#F0DAA0>[在面板打开后隐藏休息动作，在面板关闭后恢复功能]</color></i>
 ModUi/&AllowStackedMaterialComponent=允许堆叠材料组件<i><color=#F0DAA0>[例如2x500gp钻石相当于1000gp钻石]</color></i>
-ModUi/&AllowTargetingSelectionWhenCastingChainLightningSpell=允许在施展<color=#D89555>闪电链</color>法术时选择目标
 ModUi/&AllowUnmarkedSorcerers=允许<color=#D89555>术士</color>没有起源标记和纹身
 ModUi/&AltOnlyHighlightItemsInPartyFieldOfView=按<color=#1E81B0>ALT</color>键只高亮队伍视野中的可用物品<i><color=#F0DAA0>[仅限自定义地下城]</color></i>
 ModUi/&ArcaneShieldstaffOptions=允许<color=#D89555>奥术盾杖</color>被任何职业同调
@@ -85,6 +84,7 @@ ModUi/&DocsRaces=文档：种族
 ModUi/&DocsSpells=文档：法术
 ModUi/&DocsSubclasses=文档：子职
 ModUi/&DocsSubraces=文档：亚种
+ModUi/&DocsVersatilities=多功能性
 ModUi/&Donate=<b><color=#D89555>捐赠：</color></b> <i>{0}</i>
 ModUi/&DontDisplayHelmets=不在角色图像上显示头盔<b><i><color=#C04040E0>[需要重启]</color></i></b>
 ModUi/&DontEndTurnAfterReady=使用准备动作后不会结束回合<i><color=#F0DAA0>[允许使用附赠动作或任何来自加速或其他来源的额外主要动作]</color></i>
@@ -151,6 +151,7 @@ ModUi/&EnableRogueFightingStyle=在<color=#D89555>游荡者</color> 2 级启用<
 ModUi/&EnableRogueSteadyAim=在<color=#D89555>游荡者</color> 3 级时启用<b>手稳就准</b><i><color=#F0DAA0>[作为附赠动作，在当前回合中为你的下一次攻击检定带来优势，如果你还没移动]</color></i>
 ModUi/&EnableRogueStrSaving=启用<color=#D89555>游荡者</color>在<b>诡诈/凶狡打击</b>、<b>虚弱/精通打击</b>和<b>剑刃冰雹</b>上使用敏捷或力量调整值
 ModUi/&EnableSaveByLocation=启用按活动/位置保存
+ModUi/&EnableSignatureSpellsRelearn=启用<color=#D89555>法师</color>招牌法术，以便在每次长休时准备<i><color=#F0DAA0>[而不是在 20 级时一次]</color></i>
 ModUi/&EnableSortingDungeonMakerAssets=在地城编辑器上启用素材排序
 ModUi/&EnableStatsOnHeroTooltip=在英雄的工具提示上显示统计数据<i><color=#F0DAA0>[即：暴击次数、暴击失败次数等]</color></i>
 ModUi/&EnableSumD20OnAlternateVotingSystem=。此外，每个英雄都增加了 D20 骰子重量以获得一点随机性
diff --git a/SolastaUnfinishedBusiness/Validators/ValidatorsCharacter.cs b/SolastaUnfinishedBusiness/Validators/ValidatorsCharacter.cs
index 6517b8863f..121f3ade0a 100644
--- a/SolastaUnfinishedBusiness/Validators/ValidatorsCharacter.cs
+++ b/SolastaUnfinishedBusiness/Validators/ValidatorsCharacter.cs
@@ -4,7 +4,6 @@
 using SolastaUnfinishedBusiness.Api;
 using SolastaUnfinishedBusiness.Api.GameExtensions;
 using SolastaUnfinishedBusiness.Behaviors.Specific;
-using SolastaUnfinishedBusiness.FightingStyles;
 using SolastaUnfinishedBusiness.Models;
 using SolastaUnfinishedBusiness.Subclasses;
 using static SolastaUnfinishedBusiness.Api.DatabaseHelper.WeaponTypeDefinitions;
@@ -112,32 +111,10 @@ internal static class ValidatorsCharacter
     {
         var weapon = character.GetOffhandWeapon();
 
-        if (ValidatorsWeapon.IsMelee(weapon) || (weapon == null && InnovationArmor.InGuardianMode(character)))
-        {
-            return true;
-        }
-
-        if (character is not RulesetCharacterHero hero)
-        {
-            return false;
-        }
-
-        var hasShield = HasShield(hero);
-        var hasShieldExpert =
-            hero.TrainedFightingStyles.Any(x => x.Name == ShieldExpert.ShieldExpertName);
-
-        return hasShield && hasShieldExpert;
+        return ValidatorsWeapon.IsMelee(weapon) ||
+               (weapon == null && InnovationArmor.InGuardianMode(character));
     };
 
-    internal static readonly IsCharacterValidHandler HasMeleeWeaponInMainAndNoBonusAttackInOffhand = character =>
-        HasMeleeWeaponInMainHand(character) &&
-        (
-            HasShield(character)
-                ? character.GetOriginalHero() is { } hero &&
-                  hero.TrainedFightingStyles.All(x => x.Name != ShieldExpert.ShieldExpertName)
-                : HasMeleeWeaponInOffHand(character)
-        );
-
     internal static readonly IsCharacterValidHandler HasMeleeWeaponInMainAndOffhand = character =>
         HasMeleeWeaponInMainHand(character) && HasMeleeWeaponInOffHand(character);