diff --git a/LyrianChronicles/LyrianChronicles.css b/LyrianChronicles/LyrianChronicles.css
index 3d302c71d8..16f76552fa 100644
--- a/LyrianChronicles/LyrianChronicles.css
+++ b/LyrianChronicles/LyrianChronicles.css
@@ -556,10 +556,10 @@
   width: 240px;
 }
 .charsheet .features-left-column {
-  width: 380px;
+  width: 350px;
 }
 .charsheet .features-right-column {
-  width: 420px;
+  width: 450px;
 }
 .charsheet .inventory-left-column{
   width: 450px;
@@ -1730,7 +1730,7 @@
   min-height: 635px;
 }
 .charsheet .table-container .headers-container .header2.name3 {
-  flex: 10;
+  flex: 9;
   text-align: left;
   padding-left: 5px;
 }
@@ -1741,12 +1741,12 @@
   flex: 4;
 }
 .charsheet .table-container .headers-container .header2.actions3 {
-  flex: 3;
+  flex: 4;
 }
 
 .charsheet .table-container .table-row .name3{
   font-size: 10px;
-  flex: 10;
+  flex: 9;
   text-align: left;
   padding-left: 5px;
   font-weight: bold;
@@ -1777,8 +1777,16 @@
   text-align: center;
   cursor: default;
 }
+.charsheet .table-container .table-row  .name-button.icon button{
+  width: 20px;
+}
+.charsheet .table-container .table-row  .name-button.icon span{
+  width: 20px;
+  font-size: 15px;
+  padding-bottom: 3px;
+}
 .charsheet .table-container .table-row .actions3{
-  flex: 3;
+  flex: 4;
 }
 
 .charsheet .table-container input:checked + input:checked + .details-container.ability {
@@ -1904,11 +1912,28 @@
   display: none;
 }
 
+.charsheet .table-container.favorite-abilities .table-row{
+  display: flex;
+  flex-direction: row;
+}
+.charsheet .table-container.favorite-abilities .table-row  .name-button.name3 {
+  flex:11
+}
+.charsheet .table-container.favorite-abilities .table-row  .name-button.icon {
+  display: flex;
+  justify-content: end;
+  flex:1;
+}
+.charsheet .table-container.favorite-abilities .table-row  .name-button span {
+  display: flex;
+  justify-content: center;
+}
+
 .charsheet .table-container.favorite-abilities .table-row  .name-button.name3 button{
-  width: 192px;
+  width: 100%;
 }
 .charsheet .table-container.favorite-abilities .table-row  .name-button.name3 span{
-  width: 192px;
+  width: 100%;
   text-align: center;
   justify-content: center;
 }
diff --git a/LyrianChronicles/LyrianChronicles.html b/LyrianChronicles/LyrianChronicles.html
index 026c6aabfa..c76ecd49b5 100644
--- a/LyrianChronicles/LyrianChronicles.html
+++ b/LyrianChronicles/LyrianChronicles.html
@@ -216,14 +216,13 @@
               </div>
 
               <input class="mount-shower" hidden type="checkbox" name="attr_current_mount_mounted" />
-              <span class="mount-divider" name="attr_current_mount_divider">
-              </span>
+              <span class="mount-divider" name="attr_current_mount_divider"> </span>
               <div class="attribute-container all-mount-hp">
                 <div class="label composite">Max | HP | Temp</div>
                 <div class="value composite">
-                  <input readonly type="number" name="attr_current_mount_max_hp" title="@{current_mount_max_hp}" tabindex="-1"/>
-                  <input type="number" name="attr_current_mount_hp" title="@{current_mount_hp}"/>
-                  <input type="number" name="attr_current_mount_temp_hp" title="@{current_mount_temp_hp}"/>
+                  <input readonly type="number" name="attr_current_mount_max_hp" title="@{current_mount_max_hp}" tabindex="-1" />
+                  <input type="number" name="attr_current_mount_hp" title="@{current_mount_hp}" />
+                  <input type="number" name="attr_current_mount_temp_hp" title="@{current_mount_temp_hp}" />
                 </div>
               </div>
             </div>
@@ -872,6 +871,10 @@
                             <button type="action" name="act_post_ability_info" tabindex="-1"></button>
                             <span class="pseudo-button" name="attr_ability_name"></span>
                           </div>
+                            <div class="item thin name-button icon">
+                              <button type="action" name="act_post_ability_info" data-only-roll="true" tabindex="-1"></button>
+                              <span class="pseudo-button">⚂</span>
+                            </div>
                         </div>
                       </div>
                       <!-- ROW END -->
@@ -958,6 +961,7 @@
                             <option value="culinarian">Culinarian</option>
                             <option value="cultivator">Cultivator</option>
                             <option value="curse-knight">Curse Knight</option>
+                            <option value="cutthroat">Cutthroat</option>
                             <option value="dark-priest">Dark Priest</option>
                             <option value="deadeye">Deadeye</option>
                             <option value="death-knight">Death Knight</option>
@@ -991,6 +995,7 @@
                             <option value="hussar">Hussar</option>
                             <option value="hydromancer">Hydromancer</option>
                             <option value="iai-style">Iai Style</option>
+                            <option value="jonin">Jonin</option>
                             <option value="lancer">Lancer</option>
                             <option value="mage">Mage</option>
                             <option value="mage-knight">Mage Knight</option>
@@ -1039,6 +1044,7 @@
                             <option value="sword-saint">Sword Saint</option>
                             <option value="tactician">Tactician</option>
                             <option value="tavern-brawler">Tavern Brawler</option>
+                            <option value="temporal-trickster">Temporal Trickster</option>
                             <option value="thief">Thief</option>
                             <option value="timberwright">Timberwright</option>
                             <option value="time-thief">Time Thief</option>
@@ -1056,6 +1062,7 @@
                             <option value="zen-warrior">Zen Warrior</option>
                             <option value="zephyr-warder">Zephyr Warder</option>
                             <!-- All Clases Picker List END -->
+                            <!-- All Clases Picker List END -->
                           </select>
                         </div>
                         <div class="xp-modifier">
@@ -1212,6 +1219,7 @@
                             <option value="wide_circuits_ii">Wide Circuits II</option>
                             <option value="wide_circuits_iii">Wide Circuits III</option>
                             <!-- All Breakthroughs Picker List END -->
+                            <!-- All Breakthroughs Picker List END -->
                           </select>
                         </div>
                         <div class="picker starter">
@@ -1358,6 +1366,7 @@
                             <option value="armorsmith_basics">Armorsmith Basics</option>
                             <option value="armorsmithing_expert">Armorsmithing Expert</option>
                             <option value="arms_mastery">Arms Mastery</option>
+                            <option value="artery_cut">Artery Cut</option>
                             <option value="artificer_basics">Artificer Basics</option>
                             <option value="assign_decoy">Assign Decoy</option>
                             <option value="at_your_side">At your side</option>
@@ -1464,6 +1473,7 @@
                             <option value="decipher_magic">Decipher Magic</option>
                             <option value="defensive_flexibility">Defensive Flexibility</option>
                             <option value="deflect_missiles">Deflect Missiles</option>
+                            <option value="delay_time">Delay Time</option>
                             <option value="delayed_hit">Delayed Hit</option>
                             <option value="demonblood_regeneration">Demonblood Regeneration</option>
                             <option value="despair_of_isolation">Despair of Isolation</option>
@@ -1471,6 +1481,7 @@
                             <option value="destroying_angel">Destroying Angel</option>
                             <option value="deus_vult">Deus Vult</option>
                             <option value="devastating_strike">Devastating Strike</option>
+                            <option value="devastating_strike_ii">Devastating Strike II</option>
                             <option value="devastating_strike_iii">Devastating Strike III</option>
                             <option value="devils_blow">Devil's Blow</option>
                             <option value="devils_curse">Devil's Curse</option>
@@ -1522,6 +1533,7 @@
                             <option value="emergency_shields">Emergency Shields</option>
                             <option value="empty_body">Empty Body</option>
                             <option value="empty_body">Empty Body</option>
+                            <option value="en-dama">En-dama</option>
                             <option value="enduring_warmth">Enduring Warmth</option>
                             <option value="energy_drain">Energy Drain</option>
                             <option value="escape_artist">Escape Artist</option>
@@ -1544,6 +1556,7 @@
                             <option value="expert_scribe">Expert Scribe</option>
                             <option value="explosive_advance">Explosive Advance</option>
                             <option value="explosive_ward">Explosive Ward</option>
+                            <option value="exposing_stab">Exposing Stab</option>
                             <option value="extending_spear">Extending Spear</option>
                             <option value="extra_arms">Extra Arms</option>
                             <option value="fading_counter">Fading Counter</option>
@@ -1566,6 +1579,7 @@
                             <option value="feeding_frenzy">Feeding Frenzy</option>
                             <option value="feigned_retreat">Feigned Retreat</option>
                             <option value="feint">Feint</option>
+                            <option value="feinting_stab">Feinting Stab</option>
                             <option value="felling_strike">Felling Strike</option>
                             <option value="fiery_rebirth">Fiery Rebirth</option>
                             <option value="fight_or_flight">Fight or Flight</option>
@@ -1607,6 +1621,7 @@
                             <option value="full_power_swing">Full Power Swing</option>
                             <option value="fungal_metabolite">Fungal Metabolite</option>
                             <option value="gale-wind_aura">Gale-Wind Aura</option>
+                            <option value="genjutsu_kai">Genjutsu Kai</option>
                             <option value="giant_strength">Giant Strength</option>
                             <option value="glacial_bastion">Glacial Bastion</option>
                             <option value="glacial_wall">Glacial Wall</option>
@@ -1682,6 +1697,7 @@
                             <option value="jump_back">Jump Back</option>
                             <option value="just_a_hug">Just a hug</option>
                             <option value="justice_blade">Justice Blade</option>
+                            <option value="kage_bunshin:_kyomei">Kage Bunshin: Kyomei</option>
                             <option value="kage_shuriken_no_jutsu">Kage Shuriken no Jutsu</option>
                             <option value="kawarimi_no_jutsu">Kawarimi no Jutsu</option>
                             <option value="ki_blast">Ki Blast</option>
@@ -1693,6 +1709,7 @@
                             <option value="kiri-tsuke_ii">Kiri-tsuke II</option>
                             <option value="knockdown_swing">Knockdown Swing</option>
                             <option value="knockout_punch">Knockout Punch</option>
+                            <option value="kugeki-zan">Kugeki-zan</option>
                             <option value="last_rites">Last Rites</option>
                             <option value="last_stand">Last Stand</option>
                             <option value="lay_on_hands">Lay on Hands</option>
@@ -1731,6 +1748,7 @@
                             <option value="mark_of_justice">Mark of Justice</option>
                             <option value="martial_artists_journey">Martial Artist's Journey</option>
                             <option value="master_of_the_empty_sky">Master of the Empty Sky</option>
+                            <option value="mending">Mending</option>
                             <option value="mighty_leap">Mighty Leap</option>
                             <option value="mind_connection">Mind Connection</option>
                             <option value="mining_expertise">Mining Expertise</option>
@@ -1753,12 +1771,14 @@
                             <option value="nightvision">Nightvision</option>
                             <option value="ninja_run">Ninja Run</option>
                             <option value="ninja_style">Ninja Style</option>
+                            <option value="ninja_techniques">Ninja Techniques</option>
                             <option value="no_getting_past!">No getting past!</option>
                             <option value="none_-_instinct">None - Instinct</option>
                             <option value="oil_slick">Oil Slick</option>
                             <option value="on_my_terms">On my terms</option>
                             <option value="order:_retreat">Order: Retreat</option>
                             <option value="ore_hunter">Ore Hunter</option>
+                            <option value="ougi:_taju_bunshin_no_jutsu">Ougi: Taju Bunshin no Jutsu</option>
                             <option value="overpower">Overpower</option>
                             <option value="overwhelming_critical">Overwhelming Critical</option>
                             <option value="own_mount">Own Mount</option>
@@ -1786,6 +1806,7 @@
                             <option value="point_of_death">Point of Death</option>
                             <option value="point_of_death_ii">Point of Death II</option>
                             <option value="poison_spore">Poison Spore</option>
+                            <option value="position_rewind">Position Rewind</option>
                             <option value="power_jump">Power Jump</option>
                             <option value="power_strike">Power Strike</option>
                             <option value="power_word:_barrier">Power Word: Barrier</option>
@@ -1866,6 +1887,7 @@
                             <option value="secret_art:_chase_the_horizon">Secret Art: Chase the Horizon</option>
                             <option value="secret_art:_divine_judgement">Secret Art: Divine Judgement</option>
                             <option value="secret_art:_divine_shield">Secret Art: Divine Shield</option>
+                            <option value="secret_art:_double_accel">Secret Art: Double Accel</option>
                             <option value="secret_art:_dragonslaying_jump">Secret Art: Dragonslaying Jump</option>
                             <option value="secret_art:_dynamic_duo">Secret Art: Dynamic Duo</option>
                             <option value="secret_art:_earthquake">Secret Art: Earthquake</option>
@@ -1977,6 +1999,7 @@
                             <option value="squadsight">Squadsight</option>
                             <option value="stab_&_throw">Stab & Throw</option>
                             <option value="start_dash">Start Dash</option>
+                            <option value="stasis">Stasis</option>
                             <option value="static_discharge">Static Discharge</option>
                             <option value="static_overload">Static Overload</option>
                             <option value="statue_form">Statue Form</option>
@@ -2009,6 +2032,7 @@
                             <option value="summoning_basics">Summoning Basics</option>
                             <option value="superconductor">Superconductor</option>
                             <option value="superior_assessment">Superior Assessment</option>
+                            <option value="surgical_precision">Surgical Precision</option>
                             <option value="swallow_acrobatics">Swallow Acrobatics</option>
                             <option value="swap">Swap</option>
                             <option value="sweeping_stance">Sweeping Stance</option>
@@ -2148,24 +2172,17 @@
                         <div class="picker rolls">
                           <label>Optional: Roll (when ability is triggered)</label>
                           <select name="attr_ability_roll_select" title="@{ability_roll_select}" value="no-roll">
-                            <option value="no-roll">No Roll</option>
+                            <option value="default_roll">Default Ability Roll(s)</option>
                             <option value="generic_attack_roll">Generic Attack Roll</option>
                             <option value="weapon_attack_roll">Weapon Attack Roll</option>
                             <option value="custom_macro">Custom Macro</option>
+                            <option value="no-roll">No Roll</option>
                           </select>
                           <input class="custom-enabler" name="attr_custom_macro_show" type="checkbox" hidden />
                           <div class="custom-macro">
                             <label>Custom Macro</label>
                             <textarea name="attr_ability_roll_macro" class="block-textarea"></textarea>
                           </div>
-                          <!-- <div class="header">
-                            <label>Optional: Roll</label>
-                          </div>
-                          <div>
-                            <label></label>
-                            <input type="text" name="attr_ability_name" title="@{ability_name}" />
-                          </div> -->
-                          <!-- <textarea name="attr_ability_description" class="block-textarea"></textarea> -->
                         </div>
                         <div class="form-close">
                           <input type="checkbox" name="attr_ability_form_hide" />
@@ -2188,6 +2205,11 @@
                             <span name="attr_ability_costs"> </span>
                           </div>
                           <div class="actions actions3 flex-row">
+                            <div class="item thin name-button icon">
+                              <button type="action" name="act_post_ability_info" data-only-roll="true" tabindex="-1"></button>
+                              <span class="pseudo-button">⚂</span>
+                            </div>
+                            <!-- <div class="item thin"><input type="checkbox" name="attr_ability_favorite" /><span class="favorite">★</span></div> -->
                             <div class="item thin"><input type="checkbox" name="attr_ability_favorite" /><span class="favorite">★</span></div>
                             <div class="item thin"><input type="checkbox" name="attr_ability_details_show" /><span class="info">ℹ</span></div>
                             <div class="item thin"><input type="checkbox" name="attr_ability_form_hide" /><span class="edit">⚙</span></div>
@@ -2532,7 +2554,7 @@
               </div>
             </div>
             <!-- WEAPONS END -->
-           <!-- MOUNTS START -->
+            <!-- MOUNTS START -->
             <div class="section-container">
               <div class="table-container minH100 full-width">
                 <div class="table-name2">Mounts</div>
@@ -2555,10 +2577,10 @@
                         </div>
                         <div class="picker status">
                           <label>Status:</label>
-                            <select name="attr_mount_status" title="@{mount_status}" value="stabled">
-                              <option value="stabled">Stabled</option>
-                              <option value="mounted">Mounted</option>
-                            </select>
+                          <select name="attr_mount_status" title="@{mount_status}" value="stabled">
+                            <option value="stabled">Stabled</option>
+                            <option value="mounted">Mounted</option>
+                          </select>
                         </div>
                         <div class="hp">
                           <label>Max HP</label>
@@ -2582,7 +2604,7 @@
                         </div>
                         <div class="description">
                           <label>Description</label>
-                          <textarea name="attr_mount_description" class="block-textarea" >--</textarea>
+                          <textarea name="attr_mount_description" class="block-textarea">--</textarea>
                         </div>
                         <div class="form-close">
                           <input type="checkbox" name="attr_mount_form_hide" />
@@ -2644,13 +2666,10 @@
               </div>
             </div>
             <!-- MOUNTS END -->
-
           </div>
           <!-- BURDER, CLIM, ARMORS, WEAPONS END -->
           <!-- MISC ITEMS START -->
           <div class="flex-column inventory-right-column">
-
-
             <div class="section-container misc-inventory">
               <div class="table-container misc-inventory full-width">
                 <div class="table-name2">Misc Inventory</div>
@@ -3634,7 +3653,6 @@
                             <option value="armorsmiths_modification_a">Armorsmith's Modification A</option>
                             <option value="artifice_modification_a">Artifice Modification A</option>
                             <option value="attach/detach_artifice">Attach/Detach Artifice</option>
-                            <option value="barrel_length_optimization">Barrel Length Optimization</option>
                             <option value="blacksmiths_modification_a">Blacksmith’s Modification A</option>
                             <option value="bouncing_ideas">Bouncing Ideas</option>
                             <option value="carpenters_modification_a">Carpenter's Modification A</option>
@@ -3660,12 +3678,12 @@
                             <option value="expertise_study_(blacksmithing)">Expertise Study (Blacksmithing)</option>
                             <option value="expertise_study_(carpentry)">Expertise Study (Carpentry)</option>
                             <option value="explosive_lining">Explosive Lining</option>
+                            <option value="firearm_alloy">Firearm Alloy</option>
                             <option value="fish_stock">Fish Stock</option>
                             <option value="focused_detonation">Focused Detonation</option>
                             <option value="four_field_system">Four Field System</option>
                             <option value="greater_infuse_qi">Greater Infuse Qi</option>
                             <option value="grindstone_echo">Grindstone Echo</option>
-                            <option value="grip_design">Grip Design</option>
                             <option value="harvest">Harvest</option>
                             <option value="herbal_stock">Herbal Stock</option>
                             <option value="in_the_zone">In The Zone</option>
@@ -3707,8 +3725,7 @@
                             <option value="verdant_instinct">Verdant Instinct</option>
                             <option value="volatile_flask">Volatile Flask</option>
                             <option value="weapon_alloy">Weapon Alloy</option>
-                            <!-- All Crafting abilities Picker List END -->
-
+                            <option value="weapon_modification_a">Weapon Modification A</option>
                             <!-- All Crafting abilities Picker List END -->
                           </select>
                         </div>
@@ -4111,7 +4128,7 @@
                     <label>Main Wpn Type:</label>
                     <input class="disabled" readonly type="text" name="attr_main_weapon_type" value="" />
                   </div>
-                  </div>
+                </div>
                 <div class="setup-row">
                   <div class="setup-pair">
                     <label>Main Wpn Focus:</label>
@@ -4132,7 +4149,7 @@
                     <label>Current Mount Type:</label>
                     <input class="disabled" readonly type="text" name="attr_current_mount_type" value="" />
                   </div>
-                  </div>
+                </div>
                 <div class="setup-row">
                   <div class="setup-pair">
                     <label>Current Mount HP:</label>
@@ -4142,7 +4159,7 @@
                     <label>Current Mount Speed:</label>
                     <input class="disabled" readonly type="number" name="attr_current_mount_speed" value="0" />
                   </div>
-                  </div>
+                </div>
                 <div class="setup-row">
                   <div class="setup-pair">
                     <label>Current Mount Power:</label>
@@ -4197,7 +4214,8 @@
     <input type="text" name="attr_main_weapon_focus" hidden />
     <input type="text" name="attr_main_weapon_power" hidden />
     <!-- UNIVERSAL VARIABLES END-->
-    <script type="text/worker">
+    <script>
+      //<script type="text/worker">
       // Variables
 
       const classList = {
@@ -4240,6 +4258,7 @@
         culinarian: { name: "Culinarian", tier: 1 },
         cultivator: { name: "Cultivator", tier: 2 },
         "curse-knight": { name: "Curse Knight", tier: 2 },
+        cutthroat: { name: "Cutthroat", tier: 2 },
         "dark-priest": { name: "Dark Priest", tier: 2 },
         deadeye: { name: "Deadeye", tier: 3 },
         "death-knight": { name: "Death Knight", tier: 3 },
@@ -4273,6 +4292,7 @@
         hussar: { name: "Hussar", tier: 2 },
         hydromancer: { name: "Hydromancer", tier: 2 },
         "iai-style": { name: "Iai Style", tier: 2 },
+        jonin: { name: "Jonin", tier: 3 },
         lancer: { name: "Lancer", tier: 2 },
         mage: { name: "Mage", tier: 1 },
         "mage-knight": { name: "Mage Knight", tier: 2 },
@@ -4321,6 +4341,7 @@
         "sword-saint": { name: "Sword Saint", tier: 3 },
         tactician: { name: "Tactician", tier: 2 },
         "tavern-brawler": { name: "Tavern Brawler", tier: 2 },
+        "temporal-trickster": { name: "Temporal Trickster", tier: 3 },
         thief: { name: "Thief", tier: 2 },
         timberwright: { name: "Timberwright", tier: 2 },
         "time-thief": { name: "Time Thief", tier: 2 },
@@ -4653,7 +4674,12 @@
           description:
             "You gain a +1 bonus to Focus, Power, Agility or Toughness.This breakthrough can be selected multiple times. The effects stack. Each time you take this breakthrough the cost increases by 100, up to a maximum of 700.",
         },
-        racial_flight: { name: "Racial Flight", cost: 300, requirements: "Must be Phoenix, Mothfolk or Lizardfolk race.", description: "You may use Flight." },
+        racial_flight: {
+          name: "Racial Flight",
+          cost: 300,
+          requirements: "Must be Phoenix, Mothfolk, Lizardfolk or Willowisp race.",
+          description: "You may use Flight.",
+        },
         rapid_flash: { name: "Rapid Flash", cost: 100, requirements: "Must be a High Fae.", description: "Your Fae Flash gains the Rapid keyword." },
         rich_parents: {
           name: "Rich Parents",
@@ -4701,7 +4727,7 @@
           cost: 0,
           requirements: "Must be a summoner and have visited the eidolon.",
           description:
-            "Appearance: Fortuna appears as a beautiful lady wearing clothing of the highest quality. Her clothes change each time she appears, but she always carries with her a parasol designed like a roulette wheel.Desires: Fortuna desires to see gambling. To have people bet their all on impossible odds.Pact Cost: You can never naturally roll 20 again. Every 20 you roll is reduced to 19.Attunement Cost: NoneRe-Summon Cost: Roll a natural 20 (before the pact cost reduces it) on an attack, save or skill check with consequences for failure (GM’s decision).When you contract Fortuna, you are able to attune to it. While attuned, you gain access to the Draw Luck ability through your Channel Eidolon ability. You summon the Jack of Hearts for your Lesser Eidolon and Fortuna for your Eidolon (The stats for these are listed under monsters).",
+            "Appearance: Fortuna appears as a beautiful lady wearing clothing of the highest quality. Her clothes change each time she appears, but she always carries with her a parasol designed like a roulette wheel.Desires: Fortuna desires to see gambling. To have people bet their all on impossible odds.Pact Cost: You can never naturally roll 20 again. Every 20 you roll is reduced to 19.Attunement Cost: NoneRe-Summon Cost: Roll a natural 20 (before the pact cost reduces it) on an attack or skill check with consequences for failure (GM’s decision).When you contract Fortuna, you are able to attune to it. While attuned, you gain access to the Draw Luck ability through your Channel Eidolon ability. You summon the Jack of Hearts for your Lesser Eidolon and Fortuna for your Eidolon (The stats for these are listed under monsters).",
         },
         "summon_contract:_ixilune,_the_swarm": {
           name: "Summon Contract: Ixilune, The Swarm",
@@ -4791,8 +4817,8 @@
           keywords: "Rapid",
           range: "Self",
           description:
-            "You gain Damage Reduction 100 Water(Frost) against the triggering attack. After the attack resolves, if the caster is not you or someone allied to you, you gain Temporary HP until the end of the encounter equal to the amount of damage this ability reduces.",
-          requirements: "You're about to take Water(Frost) Damage.",
+            "You gain Damage Reduction 100 Frost against the triggering attack. After the attack resolves, if the caster is not you or someone allied to you, you gain Temporary HP until the end of the encounter equal to the amount of damage this ability reduces.",
+          requirements: "You're about to take Frost Damage.",
           costs: "1 RP",
           benefits: "",
         },
@@ -4838,16 +4864,6 @@
           costs: "2 MP, 1 RP",
           benefits: "",
         },
-        advanced_artificing: {
-          name: "Advanced Artificing",
-          type: "true_ability",
-          keywords: "",
-          range: "",
-          description: "Skeleton WeldingCost: 40 crafting points",
-          requirements: "",
-          costs: "",
-          benefits: "",
-        },
         advanced_artificing: {
           name: "Advanced Artificing",
           type: "key_ability",
@@ -4858,6 +4874,16 @@
           costs: "",
           benefits: "You gain Artificer Advanced Crafting Abilities",
         },
+        advanced_artificing: {
+          name: "Advanced Artificing",
+          type: "true_ability",
+          keywords: "",
+          range: "",
+          description: "Skeleton WeldingCost: 40 crafting points",
+          requirements: "",
+          costs: "",
+          benefits: "",
+        },
         adventurer_essentials: {
           name: "Adventurer Essentials",
           type: "key_ability",
@@ -5211,6 +5237,16 @@
           costs: "",
           benefits: "You are considered proficient with every melee weapon you wield (This does not count as being proficient for class requirements).",
         },
+        artery_cut: {
+          name: "Artery Cut",
+          type: "true_ability",
+          keywords: "",
+          range: "Melee Weapon",
+          description: "You change the arc of your weapon and go for a vital spot, turning the hit into a critical hit.",
+          requirements: "One-Handed weapon only, can be used after a light attack hits and is not reacted against.",
+          costs: "1 RP",
+          benefits: "",
+        },
         artificer_basics: {
           name: "Artificer Basics",
           type: "key_ability",
@@ -5485,21 +5521,11 @@
           keywords: "Lightning, Rapid, Spell",
           range: "360ft",
           description:
-            "You may make a Heavy Attack that deals Wind(Lightning) Damage with a bolt from the sky. On damage, inflict Static X where X equals your Power x 3. As the attack from the sky, any cover is calculated from above the target rather than from your path to the target.",
+            "You may make a Heavy Attack that deals Lightning Damage with a bolt from the sky. On damage, inflict Static X where X equals your Power x 3. As the attack from the sky, any cover is calculated from above the target rather than from your path to the target.",
           requirements: "-",
           costs: "2 AP, 1 MP",
           benefits: "",
         },
-        bone_armor: {
-          name: "Bone Armor",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You may use Bone Armor.",
-        },
         bone_armor: {
           name: "Bone Armor",
           type: "true_ability",
@@ -5511,6 +5537,16 @@
           costs: "1 AP",
           benefits: "",
         },
+        bone_armor: {
+          name: "Bone Armor",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may use Bone Armor.",
+        },
         boomerang: {
           name: "Boomerang",
           type: "key_ability",
@@ -5741,7 +5777,7 @@
           keywords: "Lightning, Spell",
           range: "60ft",
           description:
-            "You may make a Heavy Attack against the target dealing Wind(Lightning) Damage and inflicting Static X where X equals your Power x 3. On damage, you may repeat this attack against another target within 30ft of the target without paying additional costs. This attack may repeat multiple times like this.You cannot target the same creature more than once per use of this ability.",
+            "You may make a Heavy Attack against the target dealing Lightning Damage and inflicting Static X where X equals your Power x 3. On damage, you may repeat this attack against another target within 30ft of the target without paying additional costs. This attack may repeat multiple times like this.You cannot target the same creature more than once per use of this ability.",
           requirements: "-",
           costs: "2 AP, 2 MP",
           benefits: "",
@@ -5943,8 +5979,8 @@
           keywords: "Rapid",
           range: "Self",
           description:
-            "You gain Damage Reduction 100 Wind(Lightning) for the triggering attack. If you reduce damage in any way from this ability, you gain Lightning Boost. Lightning Boost grants a damage bonus on your next Lightning Elemental Attack equal to the attacker’s power. This damage bonus is doubled on heavy attacks.",
-          requirements: "You are about to take Wind(Lightning) damage, Caster is not you.",
+            "You gain Damage Reduction 100 Lightning for the triggering attack. If you reduce damage in any way from this ability, you gain Lightning Boost. Lightning Boost grants a damage bonus on your next Lightning Elemental Attack equal to the attacker’s power. This damage bonus is doubled on heavy attacks.",
+          requirements: "You are about to take Lightning damage, Caster is not you.",
           costs: "1 RP",
           benefits: "",
         },
@@ -6042,7 +6078,7 @@
           requirements: "",
           costs: "",
           benefits:
-            "You gain Blacksmith Core Crafting Abilities. You can craft using the Iron and Tamahagane base materials, as well as any alloys. You can use a Smith’s Hammer as a crafting tool for blacksmithing crafts. You may also use it as a Bludgeoning weapon in which you are proficient.",
+            "You gain Blacksmith Core Crafting Abilities. You can craft using the Iron and Tamahagane base materials, as well as any alloys. You can use a Smith’s Hammer as a crafting tool for blacksmithing crafts. You may also use it as a Bludgeoning weapon in which you are proficient. You gain proficiency in 1 smithing weapon.",
         },
         crashing_foam_wave: {
           name: "Crashing Foam Wave",
@@ -6342,6 +6378,17 @@
           costs: "",
           benefits: "You may use your Parry ability against ranged weapon attacks as well.",
         },
+        delay_time: {
+          name: "Delay Time",
+          type: "true_ability",
+          keywords: "",
+          range: "40ft",
+          description:
+            "You choose one or more negative effects on the target that would trigger at the start or end of their turn. They trigger on the turn after the turn they would normally trigger instead. You may only delay an effect once, but you are able to delay Stasis even though the target is normally immune to all abilities.Start of turn effects still trigger at the start of the turn and end of turn effects still trigger at the end of the turn.",
+          requirements: "",
+          costs: "1 MP, 0 RP",
+          benefits: "",
+        },
         delayed_hit: {
           name: "Delayed Hit",
           type: "true_ability",
@@ -6418,6 +6465,16 @@
           costs: "1 AP",
           benefits: "",
         },
+        devastating_strike_ii: {
+          name: "Devastating Strike II",
+          type: "true_ability",
+          keywords: "Sure Hit, Full Pierce",
+          range: "Melee Weapon",
+          description: "You make a Light attack against the target. The dice are maximized instead of rolling.",
+          requirements: "The target has no RP.",
+          costs: "1 AP",
+          benefits: "",
+        },
         devastating_strike_iii: {
           name: "Devastating Strike III",
           type: "true_ability",
@@ -6739,16 +6796,6 @@
           costs: "1 AP",
           benefits: "",
         },
-        draw_elements: {
-          name: "Draw Elements",
-          type: "true_ability",
-          keywords: "",
-          range: "-",
-          description: "You may choose an element. Until the start of your next turn, you are considered to have mastered that element.",
-          requirements: "-",
-          costs: "0 AP, 1 MP",
-          benefits: "",
-        },
         draw_elements: {
           name: "Draw Elements",
           type: "key_ability",
@@ -6759,6 +6806,16 @@
           costs: "",
           benefits: "You may use Draw Elements.",
         },
+        draw_elements: {
+          name: "Draw Elements",
+          type: "true_ability",
+          keywords: "",
+          range: "-",
+          description: "You may choose an element. Until the start of your next turn, you are considered to have mastered that element.",
+          requirements: "-",
+          costs: "0 AP, 1 MP",
+          benefits: "",
+        },
         draw_elements_ii: {
           name: "Draw Elements II",
           type: "key_ability",
@@ -6957,6 +7014,17 @@
           costs: "",
           benefits: "You may use Empty Body.",
         },
+        "en-dama": {
+          name: "En-dama",
+          type: "true_ability",
+          keywords: "",
+          range: "5ft",
+          description:
+            "You throw a smoke bomb on the ground within range that blocks line of sight in a 5ft radius (15x15 area total) of where it was thrown. Targets inside or within 5ft of the smoke can only see up to 5ft into or out of the smoke.If you’re inside of it at the point it's thrown, you may immediately take the Hide action.The smoke lasts until the start of your next turn. When it ends, if you are inside your smoke, you may immediately move up to your speed and you are considered hidden up until you finish that movement.",
+          requirements: "",
+          costs: "2 AP, 1 MP",
+          benefits: "",
+        },
         enduring_warmth: {
           name: "Enduring Warmth",
           type: "true_ability",
@@ -7000,6 +7068,16 @@
           benefits:
             "When you would apply Burning, you instead apply Hellfire. Hellfire functions like Burning, but it can no longer be removed the normal way if not removed before the end of the target’s next turn. Hellfire is automatically removed at the end of the encounter. If you apply Hellfire to a target that is already burning, you deal extra fire damage equal to your Power.",
         },
+        eternal_mirane_cage: {
+          name: "Eternal Mirane Cage",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may use Eternal Mirane Cage.",
+        },
         eternal_mirane_cage: {
           name: "Eternal Mirane Cage",
           type: "true_ability",
@@ -7011,16 +7089,6 @@
           costs: "1 MP, 0 RP",
           benefits: "",
         },
-        eternal_mirane_cage: {
-          name: "Eternal Mirane Cage",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You may use Eternal Mirane Cage.",
-        },
         eternal_vigil: {
           name: "Eternal Vigil",
           type: "true_ability",
@@ -7189,6 +7257,17 @@
           costs: "2 MP",
           benefits: "",
         },
+        exposing_stab: {
+          name: "Exposing Stab",
+          type: "true_ability",
+          keywords: "",
+          range: "Melee Weapon",
+          description:
+            "You make a Light attack against the damage. On damage, you may use your Devastating Strike against the target until the end of your turn as if the target had 0 RP.",
+          requirements: "",
+          costs: "2 AP",
+          benefits: "",
+        },
         extending_spear: {
           name: "Extending Spear",
           type: "true_ability",
@@ -7268,7 +7347,7 @@
           keywords: "Concentration, Mind Affecting, Illusion",
           range: "60ft",
           description:
-            "You lock eyes with an enemy, casting an illusion onto the target’s mind. Name an ability that the target had previously used in the current encounter. The target forgets the target ability, being unable to use it completely while the Illusion is in effect. This ability cannot target Secret Arts, Climax Arts or Esoteric Arts. Only one target may be under the effect of this illusion at a time. If the target is non-heroic and under the effect of Faerie Light Eyes: Hold Person, instead the target immediately is rendered insane permanently. An insane target takes no further combat actions.Does not work against Boss type enemies.",
+            "You lock eyes with an enemy, casting an illusion onto the target’s mind. Name an ability that the target had previously used in the current encounter. The target forgets the target ability, being unable to use it completely while the Illusion is in effect. This ability cannot target Secret Arts, Climax Arts or Esoteric Arts. Only one target may be under the effect of this illusion at a time. If the target is non-heroic and under the effect of Faerie Light Eyes: Hold Person, instead the target immediately is rendered insane permanently. An insane target takes no further combat actions.If used on a grunt under the effects of Hold Person, they do not need to meet the normal requirements for this ability.Does not work against Boss type enemies.",
           requirements: "Enemy has used the target ability",
           costs: "2 AP",
           benefits: "",
@@ -7309,7 +7388,7 @@
         faithful_shield: {
           name: "Faithful Shield",
           type: "true_ability",
-          keywords: "Overcharge",
+          keywords: "",
           range: "Self",
           description:
             "You may use Shelter once at 0 RP cost if the target is your Soulmate. This effect lasts until the start of your next turn.Overcharge: You may spend 4 AP on this ability to instead gain 2 free uses of Shelter.These free uses ignore the normal limitation of using an ability only once per turn.",
@@ -7424,6 +7503,17 @@
           costs: "1 AP",
           benefits: "",
         },
+        feinting_stab: {
+          name: "Feinting Stab",
+          type: "true_ability",
+          keywords: "",
+          range: "5ft",
+          description:
+            "You make a Heavy attack against the target. If they react to it in any way, you may cancel your attack on them and instead make it against a different enemy in range. Any RP spent by the first target is not refunded.",
+          requirements: "At least two enemies within range.",
+          costs: "2 AP, 1 MP",
+          benefits: "",
+        },
         felling_strike: {
           name: "Felling Strike",
           type: "true_ability",
@@ -7537,7 +7627,7 @@
           keywords: "Fire, Spell, Type",
           range: "30ft",
           description:
-            "You surround a willing target in searing flames, changing their typing to Fire II. As a Fire II type, they take half damage from Fire and Earth Damage or attacks with the Fire or Earth keywords unless that attack deals true damage. They take 50% more damage from Water Damage or attacks with the Water keyword. While the ward lasts, they also gain immunity to Burning. The ward lasts until the end of the encounter or until their type is overwritten by a more powerful type.",
+            "You surround a willing target in searing flames, changing their typing to Fire II. As a Fire II type, they take half damage from Fire and Frost Damage or attacks with the Fire or Frost keywords unless that attack deals true damage. They take 50% more damage from Water Damage or attacks with the Water keyword. While the ward lasts, they also gain immunity to Burning. The ward lasts until the end of the encounter or until their type is overwritten by a more powerful type.",
           requirements: "-",
           costs: "1 AP, 0 MP",
           benefits: "",
@@ -7774,7 +7864,7 @@
           keywords: "Lightning, Spell",
           range: "120ft",
           description:
-            "You make a Light Attack against two different targets who can be no further than 20ft apart, dealing Wind(Lightning) Damage and on damage, inflict Static X where X equals your power + 5.",
+            "You make a Light Attack against two different targets who can be no further than 20ft apart, dealing Lightning Damage and on damage, inflict Static X where X equals your power + 5.",
           requirements: "-",
           costs: "2 AP",
           benefits: "",
@@ -7818,7 +7908,7 @@
           keywords: "Frost, Root, Slow, Spell, Combo",
           range: "80ft",
           description:
-            "You send ice spikes along the ground towards a single target, making a Heavy attack that deals Water(Frost) Damage. This cannot hit a target higher than 5ft above the ground. On hit, the target is Slowed until the end of their next turn.  If the target is already Slowed, they instead become Rooted, making them unable to move until the end of their next turn.Combo:  When used after Icicle Nail hits, reduce the mana cost to 0.",
+            "You send ice spikes along the ground towards a single target, making a Heavy attack that deals Frost Damage. This cannot hit a target higher than 5ft above the ground. On hit, the target is Slowed until the end of their next turn.  If the target is already Slowed, they instead become Rooted, making them unable to move until the end of their next turn.Combo: When used after Icicle Nail hits, reduce the mana cost to 0.",
           requirements: "",
           costs: "2 AP, 1 MP",
           benefits: "",
@@ -7866,6 +7956,16 @@
           costs: "2 AP",
           benefits: "",
         },
+        genjutsu_kai: {
+          name: "Genjutsu Kai",
+          type: "true_ability",
+          keywords: "Ninjutsu",
+          range: "5ft",
+          description: "You focus your internal energies and dispel any Illusions affecting you or an ally within 5ft of you.",
+          requirements: "Target is under the effects of an Illusion.",
+          costs: "0 AP, 1 MP",
+          benefits: "",
+        },
         giant_strength: {
           name: "Giant Strength",
           type: "key_ability",
@@ -7874,7 +7974,8 @@
           description: "",
           requirements: "",
           costs: "",
-          benefits: "While in Rage Stance, your size is treated as one size bigger than it actually is and you get an additional +5 bonus to Fitness checks.",
+          benefits:
+            "While in Rage Stance, you may choose to have your size be treated as one size bigger than it actually is. You get an additional +5 bonus to Fitness checks during Rage stance regardless.",
         },
         glacial_bastion: {
           name: "Glacial Bastion",
@@ -8239,16 +8340,6 @@
           costs: "1 AP, 2 MP",
           benefits: "",
         },
-        holy_orders: {
-          name: "Holy Orders",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You may use Holy Orders.",
-        },
         holy_orders: {
           name: "Holy Orders",
           type: "true_ability",
@@ -8260,6 +8351,16 @@
           costs: "0 AP",
           benefits: "",
         },
+        holy_orders: {
+          name: "Holy Orders",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may use Holy Orders.",
+        },
         holy_shield: {
           name: "Holy Shield",
           type: "true_ability",
@@ -8352,7 +8453,7 @@
           keywords: "Errand",
           range: "",
           description:
-            "As an errand action, you may refund an ability and choose to learn another ability. You cannot pick an ability that makes you ineligible for any of your prerequisites. Your new ability must cost the same as your unlearned one, or you must pay additional normal EXP to make up for the cost difference. If you choose to unlearn a class and learn a new one with this ability, you must spend IP for that new class as normal. Any previous IP spent on learning the class you unlearn is NOT refunded.If you choose to refund primary stats, secondary stats or skill points and then level up the class again, you must put those points back in the same things you originally put them in.",
+            "As an errand action, you may refund an ability and choose to learn another ability. You cannot pick an ability that makes you ineligible for any of your prerequisites. Your new ability must cost the same as your unlearned one, or you must pay additional normal EXP to make up for the cost difference. If you choose to unlearn a class and learn a new one with this ability, you must spend IP for that new class as normal. Any previous IP spent on learning the class you unlearn is NOT refunded.If you choose to refund primary stats, secondary stats or skill points and then level up the class again, you must put those points back in the same things you originally put them in.Does not work on breakthroughs.",
           requirements: "",
           costs: "",
           benefits: "",
@@ -8416,7 +8517,7 @@
           keywords: "Frost, Slow, Spell",
           range: "60ft",
           description:
-            "You fire a shard of ice at a target unit, making a Light Attack that deals Water(Frost) Damage. On hit, the target is Slowed until the end of their next turn.",
+            "You fire a shard of ice at a target unit, making a Light Attack that deals Frost Damage. On hit, the target is Slowed until the end of their next turn.",
           requirements: "-",
           costs: "1 AP, 1 MP",
           benefits: "",
@@ -8427,7 +8528,7 @@
           keywords: "Frost, Slow, Spell",
           range: "60ft",
           description:
-            "You fire a shard of ice at a target unit, making a Light Attack that deals Water(Frost) Damage. On hit, the target is Slowed until the end of their next turn.",
+            "You fire a shard of ice at a target unit, making a Light Attack that deals Frost Damage. On hit, the target is Slowed until the end of their next turn.",
           requirements: "-",
           costs: "1 AP, 1 MP",
           benefits: "",
@@ -8617,16 +8718,6 @@
           costs: "1 RP",
           benefits: "",
         },
-        jump: {
-          name: "Jump",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "When using an ability with the Jump keyword, you do not take fall damage. You may use Jump.",
-        },
         jump: {
           name: "Jump",
           type: "true_ability",
@@ -8637,6 +8728,16 @@
           costs: "2 AP",
           benefits: "",
         },
+        jump: {
+          name: "Jump",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "When using an ability with the Jump keyword, you do not take fall damage. You may use Jump.",
+        },
         jump_back: {
           name: "Jump Back",
           type: "true_ability",
@@ -8668,6 +8769,16 @@
           costs: "1 AP, 1 MP",
           benefits: "",
         },
+        "kage_bunshin:_kyomei": {
+          name: "Kage Bunshin: Kyomei",
+          type: "true_ability",
+          keywords: "Ninjutsu",
+          range: "5ft",
+          description: "Your clone assists in the preparation of your next Ninjutsu, reducing the AP cost of it by 1.",
+          requirements: "You must have a Bunshin clone active and within range.",
+          costs: "0 AP",
+          benefits: "",
+        },
         kage_shuriken_no_jutsu: {
           name: "Kage Shuriken no Jutsu",
           type: "true_ability",
@@ -8783,6 +8894,16 @@
           costs: "4 AP",
           benefits: "",
         },
+        "kugeki-zan": {
+          name: "Kugeki-zan",
+          type: "true_ability",
+          keywords: "Ninjutsu, Sure Hit, Full Pierce",
+          range: "",
+          description: "You make a Light attack against the target.",
+          requirements: "Target must have 0 RP remaining.",
+          costs: "1 AP",
+          benefits: "",
+        },
         last_rites: {
           name: "Last Rites",
           type: "true_ability",
@@ -8889,17 +9010,6 @@
           benefits:
             "When the Static you apply deals damage to an enemy, that enemy becomes afflicted with Static X, where X is the value of the Static that damaged it.",
         },
-        lightning_weapon: {
-          name: "Lightning Weapon",
-          type: "true_ability",
-          keywords: "",
-          range: "",
-          description:
-            "When attacking with a weapon, you may choose to have the weapon deal Wind(Lightning) Damage instead of its normal damage type. You must declare you chosen damage type before making the accuracy roll.",
-          requirements: "",
-          costs: "",
-          benefits: "",
-        },
         lightning_weapon: {
           name: "Lightning Weapon",
           type: "key_ability",
@@ -8909,7 +9019,18 @@
           requirements: "",
           costs: "",
           benefits:
-            "When attacking with a weapon, you may choose to have the weapon deal Wind(Lightning) Damage instead of its normal damage type. You must declare you chosen damage type before making the accuracy roll.",
+            "When attacking with a weapon, you may choose to have the weapon deal Lightning Damage instead of its normal damage type. You must declare you chosen damage type before making the accuracy roll.",
+        },
+        lightning_weapon: {
+          name: "Lightning Weapon",
+          type: "true_ability",
+          keywords: "",
+          range: "",
+          description:
+            "When attacking with a weapon, you may choose to have the weapon deal Lightning Damage instead of its normal damage type. You must declare you chosen damage type before making the accuracy roll.",
+          requirements: "",
+          costs: "",
+          benefits: "",
         },
         lights_care: {
           name: "Light's Care",
@@ -9131,6 +9252,16 @@
           costs: "",
           benefits: "",
         },
+        mana_sight: {
+          name: "Mana Sight",
+          type: "true_ability",
+          keywords: "Quick",
+          range: "Sight",
+          description: "You can assess the approximate mana percentage of a unit until the end of combat. (The DM should enable mana bar for the unit).",
+          requirements: "-",
+          costs: "0 AP",
+          benefits: "",
+        },
         mana_sight: {
           name: "Mana Sight",
           type: "key_ability",
@@ -9142,16 +9273,6 @@
           benefits:
             "You may use Mana Sight. One of your eyes becomes an Life Perception Eye. It may be used to make Mystic Eye type abilities of the appropriate type. An eye can only be a single mystic eye type. When making an attack with the Mystic Eye keyword that use the Life Perception eye, you ignore 1 point of guard.",
         },
-        mana_sight: {
-          name: "Mana Sight",
-          type: "true_ability",
-          keywords: "Quick",
-          range: "Sight",
-          description: "You can assess the approximate mana percentage of a unit until the end of combat. (The DM should enable mana bar for the unit).",
-          requirements: "-",
-          costs: "0 AP",
-          benefits: "",
-        },
         mark_of_justice: {
           name: "Mark of Justice",
           type: "true_ability",
@@ -9184,6 +9305,16 @@
           costs: "",
           benefits: "When flying and not benefiting from cover, you gain +2 Evasion and Dodge.",
         },
+        mending: {
+          name: "Mending",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may spend an EP to restore a Broken item. Some items (such as consumables) cannot be repaired (GM’s discretion).",
+        },
         mighty_leap: {
           name: "Mighty Leap",
           type: "true_ability",
@@ -9417,6 +9548,16 @@
           costs: "",
           benefits: "You gain proficiency in both Small Weapons and Sets of Missiles. You may use Ninja Run.",
         },
+        ninja_techniques: {
+          name: "Ninja Techniques",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "Your Ninja Run now lasts for the entire turn. You may use Genjutsu Kai",
+        },
         "no_getting_past!": {
           name: "No getting past!",
           type: "true_ability",
@@ -9483,6 +9624,17 @@
           benefits:
             "You can gather Tier 2 mining outcrops. You are an expert and tying knots. Using rope, you can secure yourself to objects and safely rappel down to investigate down cliffsides.",
         },
+        "ougi:_taju_bunshin_no_jutsu": {
+          name: "Ougi: Taju Bunshin no Jutsu",
+          type: "true_ability",
+          keywords: "Secret Art, Ninjutsu, Illusion, Upkeep",
+          range: "Self",
+          description:
+            "You create 3 illusionary copies of yourself within 10ft of yourself or your Bunshin clone. These copies can take actions similar to your Bunshin Tai no Jutsu, but each of them may also act with its own 2 AP from the start of your next turn.Each clone has 1 HP and upon taking any damage, they vanish. You may use RP for these clones as normal.Upkeep: 2 AP",
+          requirements: "",
+          costs: "2 AP, 3 MP",
+          benefits: "",
+        },
         overpower: {
           name: "Overpower",
           type: "true_ability",
@@ -9775,6 +9927,16 @@
           costs: "2 AP, 1 RP",
           benefits: "",
         },
+        position_rewind: {
+          name: "Position Rewind",
+          type: "true_ability",
+          keywords: "",
+          range: "2000ft",
+          description: "You teleport to where you were at the start of your last turn. (Use a token to mark the position)",
+          requirements: "",
+          costs: "1 MP, 0 RP",
+          benefits: "",
+        },
         power_jump: {
           name: "Power Jump",
           type: "true_ability",
@@ -9977,7 +10139,7 @@
         quick_assist: {
           name: "Quick Assist",
           type: "true_ability",
-          keywords: "Teleport",
+          keywords: "",
           range: "20ft",
           description:
             "You teleport next to your soulmate and force the triggering attack to resolve against you, gaining the benefit of the Block action against it.Afterwards, if your Soulmate is in range of the attacker, they may make an Attack of Opportunity against it.If you were already next to your Soulmate before you used this ability, the mana cost is reduced by 1.",
@@ -10049,16 +10211,6 @@
           costs: "2 AP, 2 MP",
           benefits: "",
         },
-        raise_undead: {
-          name: "Raise Undead",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You may use Raise Undead.",
-        },
         raise_undead: {
           name: "Raise Undead",
           type: "true_ability",
@@ -10070,6 +10222,16 @@
           costs: "2 AP",
           benefits: "",
         },
+        raise_undead: {
+          name: "Raise Undead",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may use Raise Undead.",
+        },
         rangers_journey: {
           name: "Ranger's Journey",
           type: "key_ability",
@@ -10102,6 +10264,16 @@
           costs: "1 AP, 1 MP",
           benefits: "",
         },
+        receive_oracle: {
+          name: "Receive Oracle",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may use Receive Oracle.",
+        },
         receive_oracle: {
           name: "Receive Oracle",
           type: "true_ability",
@@ -10113,16 +10285,6 @@
           costs: "4 AP",
           benefits: "",
         },
-        receive_oracle: {
-          name: "Receive Oracle",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You may use Receive Oracle.",
-        },
         reckless_strike: {
           name: "Reckless Strike",
           type: "true_ability",
@@ -10383,7 +10545,7 @@
           keywords: "Healing, Spell, Earth",
           range: "60ft",
           description:
-            "You may make a Light Attack against the target, dealing Earth damage On damage, the current host of Spore Symbiote is Healed for your Power + 3.",
+            "You may make a Light Attack against the target, dealing Earth damage. On damage, the current host of Spore Symbiote is Healed for your Power + 3.",
           requirements: "-",
           costs: "1 AP, 1 MP",
           benefits: "",
@@ -10625,6 +10787,16 @@
           costs: "0 AP",
           benefits: "",
         },
+        "secret_art:_double_accel": {
+          name: "Secret Art: Double Accel",
+          type: "true_ability",
+          keywords: "Secret Art",
+          range: "Self",
+          description: "You gain 4 AP. Your AP recovery is lowered by 3 until the end of your next turn.",
+          requirements: "",
+          costs: "0 AP",
+          benefits: "",
+        },
         "secret_art:_dragonslaying_jump": {
           name: "Secret Art: Dragonslaying Jump",
           type: "true_ability",
@@ -10639,7 +10811,7 @@
         "secret_art:_dynamic_duo": {
           name: "Secret Art: Dynamic Duo",
           type: "true_ability",
-          keywords: "Challenge, Secret Art",
+          keywords: "",
           range: "Sight",
           description:
             "You challenge all enemies in range until the start of your next turn. Any time you would be allowed to make an Attack of Opportunity, your Soulmate may make it instead. They may Sidestep up to their speed before making each Attack of Opportunity.",
@@ -11591,6 +11763,16 @@
           costs: "2 AP, 1 MP",
           benefits: "",
         },
+        sound_the_retreat: {
+          name: "Sound the retreat",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You may use Sound the retreat",
+        },
         sound_the_retreat: {
           name: "Sound the retreat",
           type: "true_ability",
@@ -11602,16 +11784,6 @@
           costs: "4 AP",
           benefits: "",
         },
-        sound_the_retreat: {
-          name: "Sound the retreat",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You may use Sound the retreat",
-        },
         speak_with_dead: {
           name: "Speak with dead",
           type: "true_ability",
@@ -11765,16 +11937,6 @@
           costs: "2 AP",
           benefits: "",
         },
-        spore_symbiote: {
-          name: "Spore Symbiote",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You can use Spore Symbiote. You gain Earth Elemental Mastery. You can create a cute mushroom cap hat to wear.",
-        },
         spore_symbiote: {
           name: "Spore Symbiote",
           type: "true_ability",
@@ -11786,6 +11948,16 @@
           costs: "0 AP",
           benefits: "",
         },
+        spore_symbiote: {
+          name: "Spore Symbiote",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You can use Spore Symbiote. You gain Earth Elemental Mastery. You can create a cute mushroom cap hat to wear.",
+        },
         squadsight: {
           name: "Squadsight",
           type: "true_ability",
@@ -11818,6 +11990,17 @@
           costs: "0 AP",
           benefits: "",
         },
+        stasis: {
+          name: "Stasis",
+          type: "true_ability",
+          keywords: "",
+          range: "40ft",
+          description:
+            "You put a Grunt level character or any willing ally into Stasis until the start of your next turn. While in Stasis, they cannot be affected by any ability, attack or anything similar but they also cannot take any actions.",
+          requirements: "",
+          costs: "2 AP",
+          benefits: "",
+        },
         static_discharge: {
           name: "Static Discharge",
           type: "true_ability",
@@ -11834,8 +12017,7 @@
           type: "true_ability",
           keywords: "Daze, Lightning, Spell",
           range: "60ft",
-          description:
-            "A single target in range must make a save or immediately take Wind(Lightning) damage equal to their Static and become inflicted with Daze.",
+          description: "A single target in range must make a save or immediately take Lightning damage equal to their Static and become inflicted with Daze.",
           requirements: "The target must be afflicted with Static you applied.",
           costs: "2 AP",
           benefits: "",
@@ -11992,16 +12174,6 @@
           costs: "0 AP",
           benefits: "",
         },
-        store_time: {
-          name: "Store Time",
-          type: "true_ability",
-          keywords: "",
-          range: "Self",
-          description: "You store time, granting you 1 extra AP at the start of your next turn.",
-          requirements: "",
-          costs: "1 AP",
-          benefits: "",
-        },
         store_time: {
           name: "Store Time",
           type: "key_ability",
@@ -12012,6 +12184,16 @@
           costs: "",
           benefits: "You can use Store Time.",
         },
+        store_time: {
+          name: "Store Time",
+          type: "true_ability",
+          keywords: "",
+          range: "Self",
+          description: "You store time, granting you 1 extra AP at the start of your next turn.",
+          requirements: "",
+          costs: "1 AP",
+          benefits: "",
+        },
         "stratagem:_lightning": {
           name: "Stratagem: Lightning",
           type: "true_ability",
@@ -12148,7 +12330,7 @@
           requirements: "",
           costs: "",
           benefits:
-            "Your Electromancer and Electromaster abilities that deal Wind(Lightning) Damage gain Lock On and Half Pierce when used against a target in natural water, with water typing or with the Soaked debuff. You gain Elemental Mastery: Lightning.",
+            "Your Electromancer and Electromaster abilities that deal Lightning Damage gain Lock On and Half Pierce when used against a target in natural water, with water typing or with the Soaked debuff. You gain Elemental Mastery: Lightning.",
         },
         superior_assessment: {
           name: "Superior Assessment",
@@ -12160,6 +12342,17 @@
           costs: "",
           benefits: "You may use Status Assessment III.",
         },
+        surgical_precision: {
+          name: "Surgical Precision",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits:
+            "When you deal damage with a one-handed melee weapon that is both Sure Hit and Full Pierce or a critical hit, you inflict Bleeding on the target for 1 turn. This effect stacks with other Bleeds effects and itself up to 3 times.",
+        },
         swallow_acrobatics: {
           name: "Swallow Acrobatics",
           type: "true_ability",
@@ -12394,7 +12587,7 @@
           keywords: "Lightning, Spell",
           range: "40ft",
           description:
-            "You may make a Light Attack that deals Wind(Lightning) damage against all enemies in range. As the attack comes from the sky, any cover is calculated from above the target rather than from your path to the target.",
+            "You may make a Light Attack that deals Lightning damage against all enemies in range. As the attack comes from the sky, any cover is calculated from above the target rather than from your path to the target.",
           requirements: "",
           costs: "3 AP",
           benefits: "",
@@ -12625,6 +12818,16 @@
           costs: "0 AP, 1 MP",
           benefits: "",
         },
+        tremorsense: {
+          name: "Tremorsense",
+          type: "key_ability",
+          keywords: "",
+          range: "",
+          description: "",
+          requirements: "",
+          costs: "",
+          benefits: "You gain Earth Mastery. You may use Tremorsense",
+        },
         tremorsense: {
           name: "Tremorsense",
           type: "true_ability",
@@ -12636,16 +12839,6 @@
           costs: "1 AP, 1 MP",
           benefits: "",
         },
-        tremorsense: {
-          name: "Tremorsense",
-          type: "key_ability",
-          keywords: "",
-          range: "",
-          description: "",
-          requirements: "",
-          costs: "",
-          benefits: "You gain Earth Mastery. You may use Tremorsense",
-        },
         true_death: {
           name: "True Death",
           type: "true_ability",
@@ -13002,7 +13195,7 @@
           keywords: "Frost, Slow, Spell",
           range: "80ft",
           description:
-            "You target a Glacial Wall in range and fire a bolt of Frost energy that requires line of sight. On impact, the wall is destroyed and explodes into blades of ice, attacking all enemies within 5ft of the destroyed wall with a Precise attack that deals Water(Frost) damage. On damage, the target is Slowed until the end of their next turn.",
+            "You target a Glacial Wall in range and fire a bolt of Frost energy that requires line of sight. On impact, the wall is destroyed and explodes into blades of ice, attacking all enemies within 5ft of the destroyed wall with a Precise attack that deals Frost damage. On damage, the target is Slowed until the end of their next turn.",
           requirements: "",
           costs: "1 AP",
           benefits: "",
@@ -13122,7 +13315,7 @@
           keywords: "Aid, Shield, Spell",
           range: "30ft",
           description:
-            "You grant the target  1 RP that must be spent on the basic Dodge or Block action against the triggering attack as well as Wind Shield. Wind Shield grants a bonus to Evasion equal to your Focus against the triggering attack. The triggering attack can also no longer benefit from Lock On or Sure Hit",
+            "You grant the target  1 RP that must be spent on the basic Dodge or Block action against the triggering attack as well as Wind Shield. Wind Shield grants a bonus to Dodge equal to your Focus against the triggering attack. The triggering attack can also no longer benefit from Lock On or Sure Hit",
           requirements: "Ally is targeted by a ranged attack.",
           costs: "1 RP",
           benefits: "",
@@ -13176,7 +13369,7 @@
           keywords: "Lightning, Lock On, Spell",
           range: "60ft",
           description:
-            "You may make a Light attack against the target, dealing Wind(Lightning) damage. On damage, inflict Static X where X equals your Power X 3. If your Superconductor ability would be valid against the target, this attack gains Sure Hit.",
+            "You may make a Light attack against the target, dealing Lightning damage. On damage, inflict Static X where X equals your Power X 3. If your Superconductor ability would be valid against the target, this attack gains Sure Hit.",
           requirements: "-",
           costs: "1 AP, 1 MP",
           benefits: "",
@@ -13193,6 +13386,711 @@
         },
       };
 
+      const abilityMacroMap = {
+        "secret_art:_beaver_timber_fang": "missing_macro",
+        disarming_attack: "missing_macro",
+        gods_blessing: "missing_macro",
+        just_a_hug: "missing_macro",
+        point_of_death: "missing_macro",
+        refreshing_stream: "missing_macro",
+        "rider_&_mount_as_one": "missing_macro",
+        scent_of_blood: "missing_macro",
+        share_armor: "missing_macro",
+        reinforce_armor: "missing_macro",
+        spore_symbiote: "missing_macro",
+        transmute_weapon: "missing_macro",
+        vampiric_domination: "no_macro_needed",
+        arcane_explosion: "missing_macro",
+        cat_form: "missing_macro",
+        cavalry_charge: "missing_macro",
+        "secret_art:_ambush_shot": "missing_macro",
+        snap_shot_ii: "missing_macro",
+        soul_strike: "missing_macro",
+        "take_cover!": "missing_macro",
+        wild_thrusts: "missing_macro",
+        chain_lightning: "missing_macro",
+        decipher_magic: "missing_macro",
+        foragers_eye: "missing_macro",
+        full_power_swing: "missing_macro",
+        graceful_landing: "missing_macro",
+        ki_blast: "&{template:default} {{name=@{name} ❖ Heavy Attack}} {{Attack=[[1d20+@{focus}]]}} {{Damage=[[4d6+2*@{power}]]}}",
+        tiny_pixie: "missing_macro",
+        "secret_art:_dynamic_duo": "missing_macro",
+        wind_infusion: "missing_macro",
+        bolting:
+          "&{template:default} {{name=@{name} ❖ Bolting}} {{ Heavy Attack=[[1d20+@{focus}]]}} {{ Damage= [[4d6+2*@{power}]]}} {{ Max Damage= [[4*6+2*@{power}]]}} {{ Static= [[3*@{power}]]}}",
+        call_of_the_grave: "missing_macro",
+        death_perception: "missing_macro",
+        evil_eye_of_fear: "missing_macro",
+        ignite: "missing_macro",
+        shared_defense: "missing_macro",
+        faerie_flash: "missing_macro",
+        flash_bomb: "missing_macro",
+        mighty_leap: "missing_macro",
+        secret_talisman: "no_macro_needed",
+        soulreap: "missing_macro",
+        shieldcrusher: "missing_macro",
+        steadfast_earth_stance: "missing_macro",
+        aqua_drill: "missing_macro",
+        destroying_angel:
+          "&{template:default} {{name=@{name} ❖ Destroying Angel}} {{ Precise Attack=[[1d20+2*@{focus}]]}} {{ Damage= [[2d4+@{power}]]}} {{ Max Damage= [[2*4+@{power}]]}} {{ Heal= [[5+2*@{power}]]}}",
+        haste: "missing_macro",
+        stalks_of_comparison: "missing_macro",
+        "counter-potion": "missing_macro",
+        "secret_art:_7_points_of_death": "missing_macro",
+        "secret_art:_rewind": "missing_macro",
+        status_assessment_iii: "missing_macro",
+        terracing: "missing_macro",
+        wind_scatter: "missing_macro",
+        wither_the_stalk: "missing_macro",
+        "darkvision_(passive)": "missing_macro",
+        discipline: "missing_macro",
+        half_restore: "missing_macro",
+        "secret_art:_whiteout": "missing_macro",
+        sheet_ice: "missing_macro",
+        vampire_shapeshift: "no_macro_needed",
+        evasive_maneuver: "missing_macro",
+        explosive_ward: "missing_macro",
+        hopping_zombie: "missing_macro",
+        multishot: "missing_macro",
+        "store/consume_item": "missing_macro",
+        threatening_aura: "missing_macro",
+        battle_cast: "missing_macro",
+        bone_armor: "missing_macro",
+        "secret_art:_shatter":
+          "&{template:default} {{name=@{name} ❖ Heavy Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[4d6+2(@{power}+@{main_weapon_power})]]}}",
+        "secret_art:_ultimate_spell": "missing_macro",
+        two_sword_crush: "&{template:default} {{name=@{name} ❖ Two Sword Crush @{main_weapon_name}}} {{ Light Damage= [[2d4+@{power}+@{main_weapon_power}]]}}",
+        wind_wall: "missing_macro",
+        assign_decoy: "no_macro_needed",
+        devils_curse: "no_macro_needed",
+        divine_storm: "missing_macro",
+        hardening_fist: "missing_macro",
+        into_the_fray: "missing_macro",
+        purifying_shields: "missing_macro",
+        repair_weapon: "missing_macro",
+        scarecrows_gaze: "missing_macro",
+        blue_tide: "missing_macro",
+        channel_eidolon: "no_macro_needed",
+        flyby_attack: "missing_macro",
+        "hit_&_run":
+          "&{template:default} {{name=@{name} ❖ Light Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[2d4+@{power}+@{main_weapon_power}]]}}",
+        holy_light: "missing_macro",
+        leashing: "missing_macro",
+        "lu_-_dense_mana": "missing_macro",
+        reverse_polarity: "missing_macro",
+        paragon_of_virtue: "missing_macro",
+        plow_the_fields: "missing_macro",
+        psychometry: "missing_macro",
+        weighing_the_heart: "missing_macro",
+        arcane_barrier: "missing_macro",
+        blood_shield: "missing_macro",
+        extra_arms: "missing_macro",
+        "secret_art:_jade_skin": "&{template:default} {{name=@{name} ❖ Secret Art: Jade Skin}} {{ Block= @{total_block}}}",
+        "secret_art:_ride_of_the_valkyrie": "missing_macro",
+        canter: "missing_macro",
+        horse_whistle: "missing_macro",
+        "ni_-_emergency_maneuvers": "missing_macro",
+        "secret_art:_dragonslaying_jump": "missing_macro",
+        stoneskin: "missing_macro",
+        absorb_ice: "missing_macro",
+        bloodbolt: "missing_macro",
+        create_talisman: "missing_macro",
+        darkness: "missing_macro",
+        hidden_wards: "missing_macro",
+        infuse_potion: "missing_macro",
+        line_of_death: "missing_macro",
+        "secret_art:_entropic_magic_pulse": "missing_macro",
+        riposte: "missing_macro",
+        devils_blow: "missing_macro",
+        fast_runner: "missing_macro",
+        forged_knowledge: "missing_macro",
+        icicle_nail: "missing_macro",
+        kawarimi_no_jutsu: "missing_macro",
+        persistent_spell: "missing_macro",
+        strike_of_still_water: "missing_macro",
+        divine_might: "missing_macro",
+        eternal_vigil: "missing_macro",
+        flying_kick: "missing_macro",
+        incendiary_ray: "missing_macro",
+        ki_burst: "missing_macro",
+        "secret_art:_shield_wall": "missing_macro",
+        vital_drive: "missing_macro",
+        abjurers_blast: "missing_macro",
+        adaptive_defense: "missing_macro",
+        quick_revive: "missing_macro",
+        spiritual_sync: "missing_macro",
+        throw_potion: "missing_macro",
+        bear_trap: "missing_macro",
+        crescent_sweep: "missing_macro",
+        gleaming_cut: "missing_macro",
+        holy_declaration: "&{template:default} {{name=@{name} ❖ Holy Declaration}} {{ Block= @{total_block}}}",
+        momentum: "missing_macro",
+        "secret_art:_unholy_strength": "no_macro_needed",
+        true_death: "missing_macro",
+        armor_up: "missing_macro",
+        "elemental_mastery:_dark": "missing_macro",
+        "faerie_light_eyes:__empty": "missing_macro",
+        fissure: "missing_macro",
+        sable_grace: "missing_macro",
+        "secret_art:_earthquake": "missing_macro",
+        travelers_end: "missing_macro",
+        blast_away: "missing_macro",
+        "d_-_mana_burst": "missing_macro",
+        evil_eye_of_lethargy: "missing_macro",
+        holy_shield: "missing_macro",
+        mordschlag: "missing_macro",
+        "slide_&_shoot": "missing_macro",
+        stolen_skill: "missing_macro",
+        strengthening_the_bond: "missing_macro",
+        cavalry_heal: "missing_macro",
+        evil_eye_of_death: "no_macro_needed",
+        focused_detonation: "missing_macro",
+        gravitational_ki: "missing_macro",
+        summon_lesser_eidolon: "missing_macro",
+        tempestuous_fire_stance: "missing_macro",
+        track: "missing_macro",
+        zhen_jiao: "missing_macro",
+        antennae: "missing_macro",
+        eternal_mirane_cage: "missing_macro",
+        heavenfall_descent: "missing_macro",
+        hover: "missing_macro",
+        magic_missile: "missing_macro",
+        running_shot: "missing_macro",
+        schadenfreude: "missing_macro",
+        "secret_art:_gae_bolg": "missing_macro",
+        "faerie_light_eyes:_golden_illusion": "missing_macro",
+        flame_wall: "missing_macro",
+        "flash_star_style:_thunderbolt_slash": "missing_macro",
+        provoke_ii: "missing_macro",
+        pull_the_weeds: "no_macro_needed",
+        redirected_force: "no_macro_needed",
+        statue_form: "missing_macro",
+        tireless_undead: "missing_macro",
+        blood_drain: "missing_macro",
+        bullet_magnet: "missing_macro",
+        empty_body: "missing_macro",
+        overclock: "missing_macro",
+        quick_artifice_reload: "missing_macro",
+        repair_armor: "missing_macro",
+        "secret_art:_whirling_death": "missing_macro",
+        tailwind: "no_macro_needed",
+        disrupt_ki: "missing_macro",
+        double_punch: "missing_macro",
+        "secret_art:_overcharge": "missing_macro",
+        "rescue_&_drop": "missing_macro",
+        "anti-magic_shield": "missing_macro",
+        craft_pemmican: "missing_macro",
+        lifebeat_sense: "missing_macro",
+        movement_burst: "missing_macro",
+        power_jump: "missing_macro",
+        "secret_art:_summon_eidolon": "missing_macro",
+        summon_animal: "missing_macro",
+        fight_or_flight: "missing_macro",
+        glittershards: "no_macro_needed",
+        imbue_weapon: "missing_macro",
+        mud_wall: "missing_macro",
+        soul_absorption: "missing_macro",
+        transmute_effective_implement: "missing_macro",
+        vampire_bite: "missing_macro",
+        "ar_-_minds_eye": "missing_macro",
+        cleave: "missing_macro",
+        consistent_shot: "missing_macro",
+        double_palm_strike: "missing_macro",
+        duelist_blow: "missing_macro",
+        flash_cut:
+          "&{template:default} {{name=@{name} ❖ Heavy Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[4d6+2(@{power}+@{main_weapon_power})]]}}",
+        human_adaptability: "missing_macro",
+        scry: "missing_macro",
+        crashing_foam_wave: "missing_macro",
+        "expertise_study_(armorsmithing)": "missing_macro",
+        illuminating_flash: "missing_macro",
+        instinct: "missing_macro",
+        shield_burst: "missing_macro",
+        store_time: "missing_macro",
+        swallow_acrobatics: "no_macro_needed",
+        bunshin_tai_no_jutsu: "missing_macro",
+        "faerie_light_eyes:_time_dilation": "missing_macro",
+        glide: "missing_macro",
+        own_mount: "missing_macro",
+        panda_roll: "missing_macro",
+        wind_blast: "missing_macro",
+        deus_vult: "missing_macro",
+        escape_artist: "missing_macro",
+        jump_back: "missing_macro",
+        last_rites: "missing_macro",
+        "secret_art:_galaxy_stop": "missing_macro",
+        "secret_art:_lifesaver": "missing_macro",
+        trample: "missing_macro",
+        feeding_frenzy: "missing_macro",
+        forged_knowledge_ii: "missing_macro",
+        ninja_run: "missing_macro",
+        oil_slick: "missing_macro",
+        tackle: "missing_macro",
+        warm_together: "missing_macro",
+        conduit: "no_macro_needed",
+        mana_eater: "missing_macro",
+        mana_sight: "missing_macro",
+        "secret_art:_gate_of_fate": "missing_macro",
+        shadow_cloak: "missing_macro",
+        "stratagem:_lightning": "missing_macro",
+        torture_techniques: "missing_macro",
+        dark_healing:
+          "&{template:default} {{name=@{name} ❖ Dark Healing}} {{?{Light or Heavy? |Light, Light Damage=  [[2d4+@{power}]] |Heavy, Heavy Damage= [[4d6+2*@{power}]]}}}",
+        deconstruction: "missing_macro",
+        horse_step_acceleration: "missing_macro",
+        malevolent_phantasm: "missing_macro",
+        "power_word:_guardian_shield": "missing_macro",
+        "secret_art:_divine_shield": "missing_macro",
+        "secret_art:_spirit_stigma": "missing_macro",
+        "wind-up_punch": "missing_macro",
+        concealed_shot: "missing_macro",
+        draw_elements: "missing_macro",
+        hunting_wolf: "missing_macro",
+        stolen_power:
+          "&{template:default} {{name=@{name} ❖ Stolen Power}} {{?{Light , Heavy, or Precise? |Light, Light Attack: [[1d20+@{focus}]] Damage Roll: [[2d4]] |Heavy, Heavy Attack: [[1d20+@{focus}]] Damage Roll: [[4d6]] |Precise, Precise Attack: [[1d20+2*@{focus}]] Damage: [[2d4+]]}}}",
+        attune_eidolon: "missing_macro",
+        flight: "missing_macro",
+        frost_driver: "missing_macro",
+        pathfinder: "missing_macro",
+        "secret_art:_bloody_ritual": "missing_macro",
+        aftershock: "missing_macro",
+        fireball_barrage: "missing_macro",
+        "secret_art:_assassinate": "missing_macro",
+        "secret_art:_nightcaller": "missing_macro",
+        craft_artificers_glove: "missing_macro",
+        demonblood_regeneration: "missing_macro",
+        leg_sweep: "missing_macro",
+        perfect_shot: "missing_macro",
+        "secret_art:_life_sacrifice": "missing_macro",
+        spore_burst: "missing_macro",
+        wire_sweep: "missing_macro",
+        accelerating_strike: "missing_macro",
+        cant_escape_death: "missing_macro",
+        inspiring_song: "missing_macro",
+        natures_grasp: "missing_macro",
+        dark_barrier: "&{template:default} {{name=@{name} ❖ Dark Barrier}} {{ Temp HP= [[2*[[2d4+@{power}]]]]}} {{Damage= $[[0]]}}",
+        misdirected_blow: "missing_macro",
+        parry: "missing_macro",
+        preparedness: "missing_macro",
+        spirit_jump: "missing_macro",
+        vanish: "missing_macro",
+        victory_or_death: "missing_macro",
+        prehensile_tail: "missing_macro",
+        resheathe: "missing_macro",
+        anvil_tactics: "missing_macro",
+        detailed_finish: "missing_macro",
+        transmuter_tricks: "missing_macro",
+        verdant_instinct: "missing_macro",
+        "wind-empowered_aim": "missing_macro",
+        quickdraw: "missing_macro",
+        ambush_trapper: "no_macro_needed",
+        consume_enemy: "missing_macro",
+        divine_smite_ii: "missing_macro",
+        "flash_star_style_secret_art:_twin_nova_pursuit": "missing_macro",
+        horse_body: "missing_macro",
+        penetrating_shot: "missing_macro",
+        static_discharge: "missing_macro",
+        fireball_ii: "missing_macro",
+        grand_theft_horse: "missing_macro",
+        lifesense: "missing_macro",
+        point_blank_shot: "missing_macro",
+        thunderstorm: "missing_macro",
+        wind_blast_ii: "missing_macro",
+        feigned_retreat: "missing_macro",
+        long_toss: "missing_macro",
+        presence_concealment: "missing_macro",
+        true_divine_release: "missing_macro",
+        "secret_art:_walking_church": "missing_macro",
+        "stab_&_throw": "missing_macro",
+        cure_touch: "missing_macro",
+        divine_smite: "missing_macro",
+        draw_elements_ii: "missing_macro",
+        fast_hands: "missing_macro",
+        pepper_spray: "missing_macro",
+        flame_infusion: "no_macro_needed",
+        wall_formation: "missing_macro",
+        boundless_wind_stance: "missing_macro",
+        "secret_art:_meteor": "missing_macro",
+        weapon_maintenance: "missing_macro",
+        blast_wave: "&{template:default} {{name=@{name} ❖ Light Attack}} {{Attack=[[1d20+@{focus}]]}} {{Damage=[[2d4+@{power}]]}}",
+        "single-minded_fury": "missing_macro",
+        spirit_circuit_crash: "missing_macro",
+        aerial_crashdown: "missing_macro",
+        cave_raider: "missing_macro",
+        divine_guard: "missing_macro",
+        headless: "missing_macro",
+        memory_of_the_grove: "missing_macro",
+        radiant_halo: "&{template:default} {{name=@{name} ❖ Radiant Halo}} {{ Heal= [[11+2*@{power}]]}}",
+        spirited_bravado: "missing_macro",
+        tap_cracker: "missing_macro",
+        chiburi_noto_ii: "missing_macro",
+        doctor_jekyll: "missing_macro",
+        thermal_vision: "missing_macro",
+        two_point_strike: "missing_macro",
+        vivisect: "missing_macro",
+        shadow_step: "missing_macro",
+        siphon_material: "missing_macro",
+        spellsteal: "missing_macro",
+        status_assessment_ii: "missing_macro",
+        "wi_-_presence_concealment": "missing_macro",
+        excavation_crash: "missing_macro",
+        regrowing_limbs: "missing_macro",
+        "secret_art:_chase_the_horizon": "missing_macro",
+        "secret_art:_seventeen_dissection": "missing_macro",
+        shelter: "missing_macro",
+        unholy_pact: "missing_macro",
+        cut_away: "&{template:default} {{name=@{name} ❖ Cut Away}} {{ Precise Attack= [[1d20+2*@{focus}]]}}",
+        justice_blade:
+          "&{template:default} {{name=@{name} ❖ Heavy Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[4d6+2(@{power}+@{main_weapon_power})]]}}",
+        "kiri-tsuke": "missing_macro",
+        mark_of_justice: "missing_macro",
+        "secret_art:_override": "&{template:default} {{name=@{name} ❖ Heavy Attack}} {{Attack=[[1d20+@{focus}]]}} {{Damage=[[4d6+2*@{power}]]}}",
+        kibaku_fuda_shuriken: "missing_macro",
+        knockdown_swing:
+          "&{template:default} {{name=@{name} ❖ Knockdown Swing @{main_weapon_name}}} {{ Light Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{ Damage= [[2d4+@{power}+@{main_weapon_power}]]}} {{ Max Damage= [[2*4+@{power}+@{main_weapon_power}]]}} {{ Power= [[@{power}]]}}",
+        reckless_strike: "missing_macro",
+        shatter_time: "missing_macro",
+        corpse_explosion: "missing_macro",
+        dullahans_mount: "missing_macro",
+        explosive_advance: "missing_macro",
+        last_stand: "missing_macro",
+        "secret_art:_transmute_proto_armatae": "missing_macro",
+        separate_wheat_from_chaff: "missing_macro",
+        stable_foundation: "missing_macro",
+        undying_justice: "missing_macro",
+        at_your_side: "missing_macro",
+        frost_coffin: "missing_macro",
+        mounted_casting: "no_macro_needed",
+        "secret_art:_the_grand_theater": "missing_macro",
+        volley:
+          "&{template:default} {{name=@{name} ❖ Light Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[2d4+@{power}+@{main_weapon_power}]]}}",
+        consume_lightning: "missing_macro",
+        forest_walker: "missing_macro",
+        repair_artifice: "no_macro_needed",
+        spear_charge: "missing_macro",
+        temporary_protection: "missing_macro",
+        "flash_star_style:_starlight_crescent_reversal": "missing_macro",
+        four_point_strike: "missing_macro",
+        plaguebringer: "missing_macro",
+        "power_word:_reinforce": "missing_macro",
+        dragonfire_dive: "missing_macro",
+        "expertise_study_(carpentry)": "missing_macro",
+        lengthened_incantation:
+          "&{template:default} {{name=@{name} ❖ Lengthened Incantation}} {{?{2AP, 4AP, 6AP, or 8AP? |2AP, Damage= [[2d4+@{power}]] |4AP, Damage= [[4d4+2*@{power}]] |6AP, Damage= [[6d4+3*@{power}]] |8AP, Damage= [[8d4+4*@{power}]]}}}",
+        lucid_sleep: "missing_macro",
+        rage_stance: "missing_macro",
+        "secret_art:_tsubame_gaeshi": "missing_macro",
+        aquatic_fae: "missing_macro",
+        cloud_piercing_claw: "missing_macro",
+        despair_of_isolation: "missing_macro",
+        iai_strike: "missing_macro",
+        killshot: "missing_macro",
+        saprophytic_bolt: "missing_macro",
+        spiked_armor: "missing_macro",
+        fading_counter: "missing_macro",
+        "faerie_light_eyes:_hold_person": "missing_macro",
+        flame_shield: "missing_macro",
+        shatter: "missing_macro",
+        steal_time: "missing_macro",
+        flowing_kick: "missing_macro",
+        sacrament: "missing_macro",
+        sense_magic: "missing_macro",
+        snatch: "missing_macro",
+        dimensional_armory_expansion: "missing_macro",
+        kage_shuriken_no_jutsu: "missing_macro",
+        lay_on_hands: "missing_macro",
+        "no_getting_past!": "missing_macro",
+        "power_word:_shield": "missing_macro",
+        scurry_away: "missing_macro",
+        "secret_art:_endless_waltz": "missing_macro",
+        counter_stance: "missing_macro",
+        disarming_shot: "missing_macro",
+        forward_momentum: "missing_macro",
+        "secret_art:_guiding_shot":
+          "&{template:default} {{name=@{name} ❖ Heavy Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[4d6+2(@{power}+@{main_weapon_power})]]}}",
+        swap: "no_macro_needed",
+        ki_blast_ii: "missing_macro",
+        mana_razor: "missing_macro",
+        presence_of_mind: "missing_macro",
+        "secret_art:_lightning_field": "missing_macro",
+        steal_heart: "missing_macro",
+        chilling_cold: "missing_macro",
+        double_elements: "missing_macro",
+        hide_in_shadows: "missing_macro",
+        increased_reach: "missing_macro",
+        raise_undead: "missing_macro",
+        blood_frenzy: "no_macro_needed",
+        mind_connection: "missing_macro",
+        mountain_slayer: "missing_macro",
+        "expertise_study_(artificing)": "missing_macro",
+        amphibious: "missing_macro",
+        break_away: "missing_macro",
+        dispel_magic: "missing_macro",
+        inspired_finish: "missing_macro",
+        poison_spore: "missing_macro",
+        cloak_of_bats: "missing_macro",
+        dragon_breaks_the_ranks: "missing_macro",
+        fly: "missing_macro",
+        "secret_art:_fan_the_hammer": "missing_macro",
+        "secret_art:_titan_blade": "missing_macro",
+        unerring_aim: "no_macro_needed",
+        lights_care: "missing_macro",
+        ave_maría: "missing_macro",
+        destroy_ground: "missing_macro",
+        "faerie_eyes:_calling": "missing_macro",
+        glacial_wall: "&{template:default} {{name=@{name} ❖ Glacial Wall}} {{ Wall HP= [[20+@{focus}]]}}",
+        hyphal_force: "missing_macro",
+        jump: "missing_macro",
+        "lir_-_predict": "missing_macro",
+        "miracle:_sanctuary": "missing_macro",
+        eagle_hunt: "missing_macro",
+        quickdraw_alchemy: "missing_macro",
+        seismic_shove: "&{template:default} {{name=@{name} ❖ Light Attack}} {{Attack=[[1d20+@{focus}]]}} {{Damage=[[2d4+@{power}]]}}",
+        serene_water_stance: "missing_macro",
+        snap_shot: "missing_macro",
+        stygian_screen: "missing_macro",
+        trailblazer: "missing_macro",
+        transfusion: "missing_macro",
+        cut_magic: "missing_macro",
+        "expertise_study_(blacksmithing)": "missing_macro",
+        transmute_wall: "missing_macro",
+        wind_shield: "missing_macro",
+        chair_grab: "missing_macro",
+        consume_fire: "missing_macro",
+        lunge: "missing_macro",
+        prediction: "missing_macro",
+        wind_buffet: "missing_macro",
+        zap: "missing_macro",
+        crippling_attack: "missing_macro",
+        headwind: "missing_macro",
+        light_work: "missing_macro",
+        start_dash: "missing_macro",
+        take_it_easy: "missing_macro",
+        vengeance: "missing_macro",
+        white_thunder: "missing_macro",
+        advanced_artificing: "missing_macro",
+        dark_bolt: "missing_macro",
+        divining_petalfall: "missing_macro",
+        duplicate: "missing_macro",
+        enduring_warmth: "missing_macro",
+        hug_tight: "&{template:default} {{name=@{name} ❖ Hug Tight}} {{ Light Damage= [[2d4+@{power}]]}}",
+        panda_stance: "missing_macro",
+        phoenix_tears: "missing_macro",
+        pack_tactics: "missing_macro",
+        "secret_art:_bestial_wrath": "missing_macro",
+        "secret_art:_bladestorm": "missing_macro",
+        skydive: "missing_macro",
+        slam: "missing_macro",
+        speak_with_dead: "missing_macro",
+        alchemical_detonation: "missing_macro",
+        clearcasting: "missing_macro",
+        precise_thrust: "missing_macro",
+        redistribute: "missing_macro",
+        steel_aura: "missing_macro",
+        anathema: "missing_macro",
+        death_mark: "missing_macro",
+        downburst_ii: "missing_macro",
+        forked_lightning: "missing_macro",
+        mining_expertise: "missing_macro",
+        "none_-_instinct": "missing_macro",
+        rushing_knee_drop: "missing_macro",
+        vital_drain: "missing_macro",
+        blinding_dust: "missing_macro",
+        crucified_by_radiance: "missing_macro",
+        send_to_armory: "missing_macro",
+        status_assessment: "missing_macro",
+        aimed_shot: "missing_macro",
+        lightning_weapon: "missing_macro",
+        smash_through_the_pain: "missing_macro",
+        unconventional_weapon: "missing_macro",
+        arcane_buster: "missing_macro",
+        fast_dimensional_equip: "missing_macro",
+        loyalty: "missing_macro",
+        quick_getaway: "no_macro_needed",
+        butterfly_effect: "missing_macro",
+        divine_providence: "missing_macro",
+        four_field_system: "missing_macro",
+        suckerpunch: "missing_macro",
+        warning_shot: "missing_macro",
+        arcane_barrier_ii: "&{template:default} {{name=@{name} ❖ Arcane Barrier II}} {{ Barrier HP= [[15+@{focus}]]}}",
+        attacks_from_the_past: "missing_macro",
+        bottle_smash: "missing_macro",
+        faerie_flash_ii: "missing_macro",
+        receive_oracle: "missing_macro",
+        foretell: "&{template:default} {{name=@{name} ❖ Foretell}} {{ Foretold Roll= [[1d20]]}}",
+        "gale-wind_aura": "missing_macro",
+        hammer_and_nail:
+          "&{template:default} {{name=@{name} ❖ Light Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[2d4+@{power}+@{main_weapon_power}]]}}",
+        sealing_talisman: "missing_macro",
+        "secret_art:_perfect_repetition": "missing_macro",
+        static_overload: "missing_macro",
+        tag_rotation: "missing_macro",
+        arcane_pull: "no_macro_needed",
+        aura_of_resistance: "&{template:default} {{name=@{name} ❖ Aura of Resistance}} {{ Toughness= @{toughness}}}",
+        darkvision: "missing_macro",
+        emergency_recall: "no_macro_needed",
+        aerial_loop: "missing_macro",
+        scouting_ahead: "missing_macro",
+        "secret_art:__revitalize": "missing_macro",
+        "secret_art:_divine_judgement": "missing_macro",
+        divine_release: "missing_macro",
+        elbow_uppercut:
+          "&{template:default} {{name=@{name} ❖ Heavy Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[4d6+2(@{power}+@{main_weapon_power})]]}}",
+        guided_aim: "missing_macro",
+        improvised_defense: "missing_macro",
+        "secret_art:_life_bet": "missing_macro",
+        feint: "missing_macro",
+        "secret_art:_all_of_creation": "missing_macro",
+        unrelenting_assault: "missing_macro",
+        angels_embrace: "missing_macro",
+        crusaders_advance: "missing_macro",
+        downburst: "missing_macro",
+        elemental_strike: "missing_macro",
+        in_the_zone: "missing_macro",
+        overpower: "missing_macro",
+        "secret_art:_razor_hurricane": "missing_macro",
+        amoxicillin: "missing_macro",
+        shield_the_fallen: "missing_macro",
+        squadsight: "missing_macro",
+        tengu_mask: "missing_macro",
+        cure_touch_ii: "missing_macro",
+        intercept: "missing_macro",
+        mist_of_the_vale: "missing_macro",
+        piercing_stab: "missing_macro",
+        rappelling_dagger: "missing_macro",
+        "secret_art:_moving_castle": "no_macro_needed",
+        "secret_art:_shock_&_awe": "missing_macro",
+        silentium: "missing_macro",
+        "anti-shield": "missing_macro",
+        faithful_shield: "missing_macro",
+        full_dimensional_equip: "missing_macro",
+        mystic_eyes_of_life_perception: "missing_macro",
+        sound_the_retreat: "missing_macro",
+        thermal_quench: "missing_macro",
+        bottle_toss: "missing_macro",
+        counterspell: "missing_macro",
+        delayed_hit: "missing_macro",
+        efficient_strike: "missing_macro",
+        provoke: "missing_macro",
+        "secret_art:_true_serenity": "missing_macro",
+        siren_song: "missing_macro",
+        "un_-_graceful_service": "missing_macro",
+        nightvision: "missing_macro",
+        "secret_art:_pyroblast": "missing_macro",
+        spellstrike: "missing_macro",
+        chiburi_noto: "missing_macro",
+        guard_dog: "missing_macro",
+        alarm_ward: "missing_macro",
+        execute_heretic: "missing_macro",
+        hearthlight: "missing_macro",
+        "power_word:_barrier": "missing_macro",
+        rescue: "missing_macro",
+        skillfull_blow: "missing_macro",
+        uke_nagashi: "missing_macro",
+        fireball: "missing_macro",
+        gloom_infusion: "missing_macro",
+        phantoms_of_the_mist: "missing_macro",
+        selective_casting: "missing_macro",
+        spellblades_preparation: "missing_macro",
+        circle_swing: "missing_macro",
+        "secret_art:_efficient_spirit_control": "missing_macro",
+        "x-attack": "missing_macro",
+        felling_strike: "missing_macro",
+        cure_water: "missing_macro",
+        dirge_of_despair: "missing_macro",
+        drink_to_battle: "no_macro_needed",
+        harvest_moon: "missing_macro",
+        hold_the_line: "missing_macro",
+        knockout_punch:
+          "&{template:default} {{name=@{name} ❖ Heavy Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[4d6+2(@{power}+@{main_weapon_power})]]}}",
+        steady_stance: "missing_macro",
+        riposte_ii: "missing_macro",
+        double_slam: "missing_macro",
+        elemental_sweep: "missing_macro",
+        "secret_art:_mushroomize": "missing_macro",
+        devastating_strike_iii:
+          "&{template:default} {{name=@{name} ❖ Devastating Strike III @{main_weapon_name}}} {{?{Light , Heavy, or Precise? |Light, Light Attack: [[1d20+@{focus}+@{main_weapon_focus}]] Damage Roll: [[2d4+@{power}+@{main_weapon_power}]] |Heavy, Heavy Attack: [[1d20+@{focus}+@{main_weapon_focus}]] Damage Roll: [[4d6+2*@{power}+2*@{main_weapon_power}]]}}}",
+        dualcast: "missing_macro",
+        gnome_claws: "missing_macro",
+        hide_in_bush: "missing_macro",
+        independent_action: "missing_macro",
+        mage_armor: "no_macro_needed",
+        power_strike: "missing_macro",
+        attack_in_detail: "missing_macro",
+        aura_of_protection: "missing_macro",
+        countershot: "missing_macro",
+        holy_orders: "missing_macro",
+        grindstone_echo: "missing_macro",
+        mana_shield: "missing_macro",
+        shade_form: "missing_macro",
+        trail_mix: "missing_macro",
+        prone_cover: "missing_macro",
+        chemical_explosive: "missing_macro",
+        "elemental_mastery:_fire": "missing_macro",
+        energy_drain: "missing_macro",
+        scouts_retreat: "missing_macro",
+        sweeping_stance: "missing_macro",
+        cyclone: "&{template:default} {{name=@{name} ❖ Cyclone}} {{ Potency= @{potency}}}",
+        devastating_strike: "missing_macro",
+        slime_body: "missing_macro",
+        tetsuzanko: "missing_macro",
+        charge: "missing_macro",
+        cursed_evil_eye: "missing_macro",
+        earthen_guardian: "&{template:default} {{name=@{name} ❖ Earthen Guardian}} {{ Block= @{total_block}}}",
+        quick_assist: "missing_macro",
+        repair_wood_weapon: "missing_macro",
+        defensive_flexibility: "no_macro_needed",
+        greater_imbue_weapon: "missing_macro",
+        backlash: "missing_macro",
+        break_free: "missing_macro",
+        "kiri-tsuke_ii": "missing_macro",
+        shooting_form: "missing_macro",
+        swift_wind_palm: "missing_macro",
+        tengu_aura_weapon: "missing_macro",
+        transmute_terrain: "missing_macro",
+        vampiric_fascination: "no_macro_needed",
+        extending_spear:
+          "&{template:default} {{name=@{name} ❖ Light Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[2d4+@{power}+@{main_weapon_power}]]}}",
+        flame_weapon: "missing_macro",
+        unsummon: "missing_macro",
+        "vi_-_first_response": "missing_macro",
+        fan_of_knives: "missing_macro",
+        perfect_seasoning: "missing_macro",
+        place_trap: "missing_macro",
+        "secret_art:_spectrum_blade": "no_macro_needed",
+        study_target: "missing_macro",
+        blackbird: "missing_macro",
+        "flash_star_style:_photon_line": "missing_macro",
+        point_of_death_ii: "missing_macro",
+        bring_out_your_dead: "missing_macro",
+        glacial_bastion: "missing_macro",
+        pistol_whip:
+          "&{template:default} {{name=@{name} ❖ Light Attack[@{main_weapon_name}]}} {{Attack=[[1d20+@{focus}+@{main_weapon_focus}]]}} {{Damage=[[2d4+@{power}+@{main_weapon_power}]]}}",
+        rock_fang: "missing_macro",
+        vital_drive_ii: "missing_macro",
+        "order:_retreat": "missing_macro",
+        purify: "missing_macro",
+        sneak_attack: "missing_macro",
+        spider_climb: "missing_macro",
+        accelerando: "missing_macro",
+        arcane_power: "missing_macro",
+        brilliance: "missing_macro",
+        "elemental_mastery:_lightning": "missing_macro",
+        fiery_rebirth: "missing_macro",
+        ricochet: "missing_macro",
+        seal_cloak: "missing_macro",
+        "secret_art:_mythical_awakening": "missing_macro",
+        tremorsense: "missing_macro",
+        magic_missile_ii: "&{template:default} {{name=@{name} ❖ Light Attack}} {{Attack=[[1d20+@{focus}]]}} {{Damage=[[2d4+@{power}]]}}",
+        slow: "missing_macro",
+        steady_craft_ii: "missing_macro",
+        bestial_command: "missing_macro",
+        power_rock_strike: "missing_macro",
+        sapping_ward: "missing_macro",
+        "draw-in": "missing_macro",
+      };
+
       const craftingAbilityList = {
         adaptive_layering: {
           name: "Adaptive Layering",
@@ -13244,14 +14142,6 @@
           costs: "Errand",
           othercosts: "",
         },
-        barrel_length_optimization: {
-          name: "Barrel Length Optimization",
-          type: "crafting_ability",
-          description: "A firearm or artifice weapon gains +1 Power Artisan Bonus. Only works with actual weapons, not attachments.",
-          requirements: "",
-          costs: "10 crafting points",
-          othercosts: "",
-        },
         blacksmiths_modification_a: {
           name: "Blacksmith’s Modification A",
           type: "crafting_ability",
@@ -13465,6 +14355,14 @@
           costs: "10 Crafting Points",
           othercosts: "",
         },
+        firearm_alloy: {
+          name: "Firearm Alloy",
+          type: "crafting_ability",
+          description: "You mix a special material into the firearm or artifice weapon. Each material has its own crafting point cost.",
+          requirements: "",
+          costs: "X Crafting Points",
+          othercosts: "",
+        },
         fish_stock: {
           name: "Fish Stock",
           type: "crafting_ability",
@@ -13508,14 +14406,6 @@
           costs: "1 Crafting Dice",
           othercosts: "",
         },
-        grip_design: {
-          name: "Grip Design",
-          type: "crafting_ability",
-          description: "A firearm or artifice weapon gains +1 Focus Artisan Bonus. Only works with actual weapons, not attachments.",
-          requirements: "",
-          costs: "10 crafting points",
-          othercosts: "",
-        },
         harvest: {
           name: "Harvest",
           type: "crafting_ability",
@@ -13864,6 +14754,15 @@
           costs: "X Crafting Points",
           othercosts: "",
         },
+        weapon_modification_a: {
+          name: "Weapon Modification A",
+          type: "crafting_ability",
+          description:
+            "You add an A-Type modification to the weapon. See the Universal Weapon or Crafting mods page as well as the individual weapon page for details. Each modification has its own cost.",
+          requirements: "",
+          costs: "X Crafting Points",
+          othercosts: "",
+        },
       };
 
       // General purpose roll
@@ -14116,9 +15015,9 @@
               realHeavyDmg = veryHeavyAtkDmg;
               realMaxHeavyDmg = maxVeryHeavyAtkDmg;
               critLightExtraDmg = `
-                    Crit Extra Dmg: [[1d4]]`;
+                          Crit Extra Dmg: [[1d4]]`;
               critHeavyExtraDmg = `
-                    Crit Extra Dmg: [[1d4]]`;
+                          Crit Extra Dmg: [[1d4]]`;
               break;
             // case "musket":
             // realHeavyDmg = heavyAtkDmg
@@ -14136,9 +15035,9 @@
               realHeavyDmg = veryHeavyAtkDmg;
               realMaxHeavyDmg = maxVeryHeavyAtkDmg;
               critLightExtraDmg = `
-                    Crit Extra Dmg: [[1d4]]`;
+                          Crit Extra Dmg: [[1d4]]`;
               critHeavyExtraDmg = `
-                    Crit Extra Dmg: [[1d12]]`;
+                          Crit Extra Dmg: [[1d12]]`;
               break;
             // case "pistol-one-hands":
             // realHeavyDmg = heavyAtkDmg
@@ -14224,18 +15123,18 @@
           let regularAtk = `[[${d20Roll}+${focus_base}+${focus_race}+${focus_misc}+${wpn_focus}]]`;
           let preciseAtk = `[[${d20Roll}+(2*(${focus_base}+${focus_race}+${focus_misc}+${wpn_focus}))]]`;
           let regularDmg = `[[${lightAtkDmg}+${power_base}+${power_race}+${power_misc}+${wpn_power}]]
-                Max Dmg: [[${maxLightAtkDmg}+${power_base}+${power_race}+${power_misc}+${wpn_power}]]`;
+                      Max Dmg: [[${maxLightAtkDmg}+${power_base}+${power_race}+${power_misc}+${wpn_power}]]`;
           let heavyDmg = `[[${realHeavyDmg}+(2*(${power_base}+${power_race}+${power_misc}+${wpn_power}))]]
-                Max Dmg: [[${realMaxHeavyDmg}+(2*(${power_base}+${power_race}+${power_misc}+${wpn_power}))]]`;
+                      Max Dmg: [[${realMaxHeavyDmg}+(2*(${power_base}+${power_race}+${power_misc}+${wpn_power}))]]`;
 
           roll = `&{template:default} {{name=@{name} ❖ Main Weapon Attack: ${wpn_Name}}} {{?{Light, Heavy, or Precise?
-                  |Light,Light Attack=Atk:${regularAtk} 
-                  Damage: ${regularDmg} ${critLightExtraDmg}
-                  |Heavy,Heavy Attack=Atk: ${regularAtk} 
-                  Damage: ${heavyDmg} ${critHeavyExtraDmg}
-                  |Precise,Precise Attack=Atk: ${preciseAtk} 
-                  Damage: ${regularDmg} ${critLightExtraDmg}
-                  }}}`;
+                        |Light,Light Attack=Atk:${regularAtk}
+                        Damage: ${regularDmg} ${critLightExtraDmg}
+                        |Heavy,Heavy Attack=Atk: ${regularAtk}
+                        Damage: ${heavyDmg} ${critHeavyExtraDmg}
+                        |Precise,Precise Attack=Atk: ${preciseAtk}
+                        Damage: ${regularDmg} ${critLightExtraDmg}
+                        }}}`;
           startRoll(roll, function (results) {
             finishRoll(results.rollId);
           });
@@ -14249,19 +15148,19 @@
 
       function universalAttackRoll(eventInfo) {
         roll = `&{template:default} {{name=@{name} ❖ Offensive Options}} {{?{Light, Heavy, HEAVY, or Precise?
-|Light, Light Attack= Atk:[[1d20+@{focus_base}+@{focus_race}+@{focus_misc}]] 
-Damage: [[2d4+@{power_base}+@{power_race}+@{power_misc}]]
-Max Dmg: [[2*4+@{power_base}+@{power_race}+@{power_misc}]]
-|Heavy, Heavy Attack= Atk:[[1d20+@{focus_base}+@{focus_race}+@{focus_misc}]] 
-Damage: [[4d6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
-Max Dmg: [[4*6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
-|HEAVY, HEAVY-Melee Attack= Atk[[1d20+@{focus_base}+@{focus_race}]] 
-Damage: [[5d6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
-Max Dmg: [[5*6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
-|Precise, Precise Attack= Atk[[1d20+(2*(@{focus_base}+@{focus_race}+@{focus_misc}))]] 
-Damage: [[2d4+(@{power_base}+@{power_race}+@{power_misc})]]
-Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
-}}}`;
+      |Light, Light Attack= Atk:[[1d20+@{focus_base}+@{focus_race}+@{focus_misc}]]
+      Damage: [[2d4+@{power_base}+@{power_race}+@{power_misc}]]
+      Max Dmg: [[2*4+@{power_base}+@{power_race}+@{power_misc}]]
+      |Heavy, Heavy Attack= Atk:[[1d20+@{focus_base}+@{focus_race}+@{focus_misc}]]
+      Damage: [[4d6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
+      Max Dmg: [[4*6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
+      |HEAVY, HEAVY-Melee Attack= Atk[[1d20+@{focus_base}+@{focus_race}]]
+      Damage: [[5d6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
+      Max Dmg: [[5*6+(2*(@{power_base}+@{power_race}+@{power_misc}))]]
+      |Precise, Precise Attack= Atk[[1d20+(2*(@{focus_base}+@{focus_race}+@{focus_misc}))]]
+      Damage: [[2d4+(@{power_base}+@{power_race}+@{power_misc})]]
+      Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
+      }}}`;
         startRoll(roll, function (results) {
           finishRoll(results.rollId);
         });
@@ -14751,15 +15650,18 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
                 update[`repeating_abilities_${id}_ability_benefits`] = "";
                 update[`repeating_abilities_${id}_ability_requirements`] = "--";
                 update[`repeating_abilities_${id}_ability_costs`] = "--";
+                update[`repeating_abilities_${id}_ability_default_roll`] = "missing_macro";
                 update[`repeating_abilities_${id}_custom_ability_show`] = "on";
               } else {
                 let foundAbility = abilityList[values[`repeating_abilities_${id}_ability_select`]];
+                let foundAbilityMacro = abilityMacroMap[values[`repeating_abilities_${id}_ability_select`]];
                 update[`repeating_abilities_${id}_ability_name`] = foundAbility ? (foundAbility.name ? foundAbility.name : "Unknown") : "Unknown";
                 update[`repeating_abilities_${id}_ability_keywords`] = foundAbility ? (foundAbility.keywords ? foundAbility.keywords : "--") : "--";
                 update[`repeating_abilities_${id}_ability_range`] = foundAbility ? (foundAbility.range ? foundAbility.range : "--") : "--";
                 update[`repeating_abilities_${id}_ability_requirements`] = foundAbility ? (foundAbility.requirements ? foundAbility.requirements : "--") : "--";
                 update[`repeating_abilities_${id}_ability_costs`] = foundAbility ? (foundAbility.costs ? foundAbility.costs : "--") : "--";
                 update[`repeating_abilities_${id}_ability_type`] = foundAbility ? (foundAbility.type ? foundAbility.type : "--") : "--";
+                update[`repeating_abilities_${id}_ability_default_roll`] = foundAbilityMacro ? foundAbilityMacro : "missing_macro";
                 update[`repeating_abilities_${id}_custom_ability_show`] = "";
 
                 if (foundAbility.type === "true_ability") {
@@ -14834,6 +15736,9 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
       // This is to trigger the post of an ability to the chat when the button in the repeating section is clicked.
       // This is quite extensive, since it involves not only posting the ability info, but also potentially rolling attacks and damage.
       on("clicked:repeating_abilities", function (eventInfo) {
+        const button = eventInfo.htmlAttributes;
+        const attr = button["data-only-roll"];
+
         // console.log("eventInfo:", eventInfo);
         if (eventInfo.htmlAttributes.name === "act_post_ability_info") {
           getSectionIDs("repeating_abilities", function (ids) {
@@ -14850,6 +15755,7 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
                     `repeating_abilities_${id}_ability_description`,
                     `repeating_abilities_${id}_ability_costs`,
                     `repeating_abilities_${id}_ability_roll_select`,
+                    `repeating_abilities_${id}_ability_default_roll`,
                     `repeating_abilities_${id}_ability_roll_macro`,
                   ])
                 );
@@ -14862,6 +15768,7 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
                   abDesc = values[`repeating_abilities_${id}_ability_description`];
                   abCost = values[`repeating_abilities_${id}_ability_costs`];
                   abRoll = values[`repeating_abilities_${id}_ability_roll_select`];
+                  abDefaultRoll = values[`repeating_abilities_${id}_ability_default_roll`];
                   abRollMacro = values[`repeating_abilities_${id}_ability_roll_macro`];
 
                   let roll = `&{template:default} {{name=@{name} ❖ Ability: ${abName}}} `;
@@ -14876,17 +15783,39 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
                   } else {
                     console.log("Ability type not set");
                   }
+                  if (attr === "true") {
+                    console.log("Ignoring description in ability roll");
+                  } else {
+                    console.log("Including description in ability roll");
                   startRoll(roll, function (results) {
                     finishRoll(results.rollId);
                   });
+                  }
+
+                  console.log("Ability roll type:", abRoll);
 
                   let roll2 = "";
                   if (abRoll === "generic_attack_roll") {
+                    console.log("Using generic attack roll");
                     universalAttackRoll(eventInfo);
                   } else if (abRoll === "weapon_attack_roll") {
+                    console.log("Using weapon attack roll");
                     mainWeaponAttack(eventInfo);
                   } else if (abRoll === "custom_macro") {
+                    console.log("Using custom roll macro:", abRollMacro);
                     roll2 = abRollMacro;
+                  } else if (abRoll === "default_roll") {
+                    console.log("Using default roll macro:", abDefaultRoll);
+                    if (abDefaultRoll && abDefaultRoll === "missing_macro") {
+                      console.log("Default roll macro is missing");
+                      roll2 = `&{template:default} {{name=Missing macro}} {{Description=There is no default macro for this ability or the macro is missing.}}`;
+                    } else {
+                      roll2 = abDefaultRoll;
+                    }
+                  } else if (abRoll === "missing_macro") {
+                    roll2 = `&{template:default} {{name=Missing macro}} {{Description=There is no default macro for this ability or the macro is missing.}}`;
+                  } else {
+                    console.log("Ability roll not set");
                   }
 
                   if (roll2 && roll2 !== "") {
@@ -15054,7 +15983,7 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
         });
       });
 
-    // Recalculate all mount related values when mount parameters are changed
+      // Recalculate all mount related values when mount parameters are changed
       on(
         "change:repeating_mounts:mount_name change:repeating_mounts:mount_speed change:repeating_mounts:mount_max_hp change:repeating_mounts:mount_focus change:repeating_mounts:mount_power change:repeating_mounts:mount_type remove:repeating_mounts",
         function (eventInfo) {
@@ -15090,7 +16019,7 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
       on("change:repeating_mounts:mount_status", function (eventInfo) {
         const match = eventInfo.sourceAttribute.match(/^repeating_mounts_([a-zA-Z0-9\-]+)_/);
         const tID = match ? match[1] : null;
-        console.log(eventInfo)
+        console.log(eventInfo);
         let otherIDs = [];
         getSectionIDs("repeating_mounts", function (ids) {
           otherIDs = ids.filter((id) => id !== tID);
@@ -15111,8 +16040,6 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
             if (values[`repeating_mounts_${tID}_mount_status`] === "mounted") {
               mountedFound = true;
 
-
-
               otherIDs.forEach((id) => {
                 if (values[`repeating_mounts_${id}_mount_status`] === "mounted") {
                   setAttrs({ [`repeating_mounts_${id}_mount_status`]: "stabled" });
@@ -15128,7 +16055,10 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
                 current_mount_focus: values[`repeating_mounts_${tID}_mount_focus`],
                 current_mount_power: values[`repeating_mounts_${tID}_mount_power`],
                 current_mount_type: values[`repeating_mounts_${tID}_mount_type`],
-                current_mount_divider: "Mount - "+values[`repeating_mounts_${tID}_mount_name`]+` ${values[`repeating_mounts_${tID}_mount_type`] ? "("+values[`repeating_mounts_${tID}_mount_type`]+")" : ""}`,
+                current_mount_divider:
+                  "Mount - " +
+                  values[`repeating_mounts_${tID}_mount_name`] +
+                  ` ${values[`repeating_mounts_${tID}_mount_type`] ? "(" + values[`repeating_mounts_${tID}_mount_type`] + ")" : ""}`,
                 current_mount_mounted: "on",
               };
 
@@ -15158,7 +16088,6 @@ Max Dmg: [[2*4+(@{power_base}+@{power_race}+@{power_misc})]]
         });
       });
 
-
       // Recalculates all armor related values when armor is changed
       on("change:repeating_miscs:misc_status change:repeating_miscs:misc_burden remove:repeating_miscs", function () {
         getSectionIDs("repeating_miscs", function (ids) {