diff --git a/dataParser/aeonsEnd.js b/dataParser/aeonsEnd.js
index b1e7b4c0..0d4f9295 100644
--- a/dataParser/aeonsEnd.js
+++ b/dataParser/aeonsEnd.js
@@ -46,9 +46,9 @@ const aeonsEndData = {
       name: 'Adelheim',
       id: 'Adelheim',
       mageTitle: 'Breach Mage Weaponsmith',
-      ability: `
-        <h2>Aethereal Ward</h2>
-        <p class="ability-activation">Activate during the nemesis draw phase:</p>
+      abilityName: 'Aethereal Ward',
+      abilityActivation: 'Activate during the nemesis draw phase:',
+      abilityEffect: `
         <p>When a nemesis attack or power card is drawn but before it is resolved, 
         you may discard it. It has no effect.
         <span class="hint">(The nemesis does not draw a replacement card)</span></p>
@@ -76,9 +76,9 @@ const aeonsEndData = {
       name: 'Brama',
       id: 'Brama',
       mageTitle: 'Breach Mage Elder',
-      ability: `
-        <h2>Brink Siphon</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: 'Brink Siphon',
+      abilityActivation: 'Activate during your main phase:',
+      abilityEffect: `
         <p>Any player gains 4 life.</p>
       `,
       numberOfCharges: 5,
@@ -104,9 +104,9 @@ const aeonsEndData = {
       name: 'Jian',
       id: 'Jian',
       mageTitle: 'Breach Mage Orphan',
-      ability: `
-        <h2>Black Mirror</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: 'Black Mirror',
+      abilityActivation: 'Activate during your main phase',
+      abilityEffect: `
         <p>Cast any player's prepped spell without discarding it.</p>
         <p>Then cast that prepped spell again.
         <span class="hint">(Discard it afterward.)</span></p>
@@ -135,9 +135,9 @@ const aeonsEndData = {
       name: 'Kadir',
       id: 'Kadir',
       mageTitle: 'Breach Mage Delver',
-      ability: `
-        <h2>Otherworldly Gate</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+      abilityName: 'Otherworldly Gate',
+      abilityActivation: "Activate during any player's main phase:",
+      abilityEffect: `
         <p>That player may return up to three spells in their discard pile 
         to their hand. That player may prep up to two spells to each 
         of their opened breaches this turn.</p>
@@ -166,9 +166,9 @@ const aeonsEndData = {
       name: 'Lash',
       id: 'Lash',
       mageTitle: 'Breach Mage Scout',
-      ability: `
-        <h2>Quicken Thought</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+      abilityName: 'Quicken Thought',
+      abilityActivation: "Activate during any player's main phase:",
+      abilityEffect: `
         <p>Shuffle any player's turn order card into the turn order deck. 
         That player suffers 1 damage. <span class="hint">(You may not choose the 
         wildcard turn order card.)</span></p>
@@ -198,9 +198,9 @@ const aeonsEndData = {
       name: 'Mist',
       id: 'Mist',
       mageTitle: 'Dagger Captain',
-      ability: `
-        <h2>Divine Augury</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: 'Divine Augury',
+      abilityActivation: 'Activate during your main phase:',
+      abilityEffect: `
         <p>Any ally draws 4 cards.</p>
       `,
       numberOfCharges: 5,
@@ -227,9 +227,9 @@ const aeonsEndData = {
       name: 'Phaedraxa',
       id: 'Phaedraxa',
       mageTitle: 'Breach Mage Seer',
-      ability: `
-        <h2>Auspex Rune</h2>
-        <p class="ability-activation">Activate immediately after a turn order card is drawn:</p>
+      abilityName: 'Auspex Rune',
+      abilityActivation: 'Activate immediately after a turn order card is drawn:',
+      abilityEffect: `
         <p>Prevent any damage that the players or Gravehold would suffer during that turn.</p>
       `,
       numberOfCharges: 5,
@@ -255,9 +255,9 @@ const aeonsEndData = {
       name: 'Xaxos',
       id: 'Xaxos',
       mageTitle: 'Breach Mage Adept',
-      ability: `
-        <h2>Metaphysical Link</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+      abilityName: `Metaphysical Link`
+      abilityActivation: `Activate during any player's main phase:`
+      abilityEffect: `
         <p>Allies collectively gain 4 charges. Reveal the turn order deck and return 
         the revealed cards in any order.</p>
       `,
diff --git a/dataParser/intoTheWild.js b/dataParser/intoTheWild.js
index c95f842a..dd67c00c 100644
--- a/dataParser/intoTheWild.js
+++ b/dataParser/intoTheWild.js
@@ -19,9 +19,9 @@ const intoTheWildData = {
       name: 'Inco',
       id: 'Inco',
       mageTitle: 'Child Of Green',
-      ability: `
-        <h2>Massive Growth</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Massive Growth`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Cast any number of Rose Thorns prepped by any number of players. 
         Those spells deal 2 additional damage.</p>`,
       numberOfCharges: 5,
@@ -46,9 +46,9 @@ const intoTheWildData = {
       name: 'Razra',
       id: 'Razra',
       mageTitle: 'The Trainer',
-      ability: `
-        <h2>Train Rip</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Train Rip`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Destroy a card with "Rip" in its name in your hand. 
         Gain a card with "Rip" in its name from the personal upgrade deck 
         that costs 3 <span class="aether">&AElig;</span> more than the destroyed card 
diff --git a/dataParser/outerDark.js b/dataParser/outerDark.js
index d32d1813..be06ca88 100644
--- a/dataParser/outerDark.js
+++ b/dataParser/outerDark.js
@@ -28,9 +28,9 @@ const outerDarkData = {
       name: 'Indira',
       id: 'Indira',
       mageTitle: 'Breach Apprentice',
-      ability: `
-        <h2>Pyromancer's Guile</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Pyromancer's Guile`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Cast any number of spells in hand. Those spells each 
         deal 1 additional damage.</p>
         <p>You may destroy a card in your discard pile.</p>
@@ -58,9 +58,9 @@ const outerDarkData = {
       name: 'Remnant',
       id: 'Remnant',
       mageTitle: 'Aethereal Entity',
-      ability: `
-        <h2>Ephemera Masque</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Ephemera Masque`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Any ally returns two cards in their discard pile to their hand.
         <span class="or">OR</span>
         Gravehold gains 5 life.</p>
diff --git a/dataParser/shatteredDreams.js b/dataParser/shatteredDreams.js
index c317b0d3..e963e52e 100644
--- a/dataParser/shatteredDreams.js
+++ b/dataParser/shatteredDreams.js
@@ -19,9 +19,9 @@ const shatteredDreamsData = {
       name: 'Nook',
       id: 'Nook',
       mageTitle: 'Orb Caller',
-      ability: `
-        <h2>Condense Aether</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Condense Aether`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>You my destroy a card in your hand or discard pile.
         Gain 4 <span class="aether">&AElig;</span>.<br/>
         You may place the next spell you gain this turn into your hand.</p>`,
diff --git a/dataParser/theAncients.js b/dataParser/theAncients.js
index 23db6243..4e2a8c8c 100644
--- a/dataParser/theAncients.js
+++ b/dataParser/theAncients.js
@@ -19,9 +19,9 @@ const theAncientsData = {
       name: 'Mazra',
       id: 'Mazra',
       mageTitle: 'The Reader',
-      ability: `
-        <h2>Research</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Research`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Destroy a card with "Mazra" in its name in your hand. 
         Gain a card with "Mazra" in its name from the personal upgrade deck 
         that costs 3 <span class="aether">&AElig;</span> more than the destroyed card 
@@ -50,9 +50,9 @@ const theAncientsData = {
       name: 'Qu',
       id: 'Qu',
       mageTitle: 'Builder And Destroyer',
-      ability: `
-        <h2>Duality Embrace</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Duality Embrace`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>If you are in Destroyer form, cast up to two different spells prepped 
         by any number of players, and then flip over the Form token. 
         Otherwise, any player preps up to two spells in their discard pile 
diff --git a/dataParser/theDepths.js b/dataParser/theDepths.js
index 97b38954..54412b8a 100644
--- a/dataParser/theDepths.js
+++ b/dataParser/theDepths.js
@@ -19,9 +19,9 @@ const theDepthsData = {
       name: 'Nym',
       id: 'Nym',
       mageTitle: 'Breach Mage Apprentice',
-      ability: `
-        <h2>Terminus Barrier</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Terminus Barrier`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Discard the top card of the nemesis deck.</p>
         <p>If you discarded an attack card, discard an additional card.</p>
       `,
@@ -49,9 +49,9 @@ const theDepthsData = {
       name: 'Reeve',
       id: 'Reeve',
       mageTitle: 'Breach Mage Elite',
-      ability: `
-        <h2>Quelling Blade</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Quelling Blade`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Deal 5 damage to a minion.</p>
         <p>Deal 3 damage to a different minion.</p>
       `,
@@ -78,9 +78,9 @@ const theDepthsData = {
       name: "Z'hana",
       id: 'Zhana',
       mageTitle: 'Breach Mage Renegade',
-      ability: `
-        <h2>Sanctum Glyph</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Sanctum Glyph`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Gravehold gains 7 life.</p>
       `,
       numberOfCharges: 5,
diff --git a/dataParser/theNameless.js b/dataParser/theNameless.js
index 71939e10..4407f2de 100644
--- a/dataParser/theNameless.js
+++ b/dataParser/theNameless.js
@@ -28,9 +28,9 @@ const theNamelessData = {
       name: 'Malastar',
       id: 'Malastar',
       mageTitle: 'Breach Mage Mentor',
-      ability: `
-        <h2>Gift Of Aether</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Gift Of Aether`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Gain a spell from any supply pile. You may prep that spell to 
         any player's opened breach.</p>
       `,
diff --git a/dataParser/theNewAge.js b/dataParser/theNewAge.js
index 6c6443bc..25b57ce5 100644
--- a/dataParser/theNewAge.js
+++ b/dataParser/theNewAge.js
@@ -46,9 +46,9 @@ const newAgeData = {
       name: 'Sahala',
       id: 'Sahala',
       mageTitle: 'Oracle',
-      ability: `
-        <h2>Star Bind</h2>
-        <p class="ability-activation">Activate during your casting or main phase:</p>
+      abilityName: `Star Bind`,
+      abilityActivation: `Activate during your casting or main phase:`,
+      abilityEffect: `
         <p>Reveal the top three cards of your deck. 
         Place a spell revealed this way into your hand. 
         If there are no spells prepped to your Celestial Breach, 
@@ -74,9 +74,9 @@ const newAgeData = {
       name: 'Gygar',
       id: 'Gygar',
       mageTitle: 'Tide Master',
-      ability: `
-        <h2>High Tide</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `High Tide`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Place a Surge token on your Ancient Breach.
         <span class="or">OR</span>
         Cast a spell prepped to your Ancient Breach. Gain 2 charges.</p>`,
@@ -99,9 +99,9 @@ const newAgeData = {
       name: 'Soskel',
       id: 'Soskel',
       mageTitle: 'Aristocrat',
-      ability: `
-        <h2>Energized Sigil</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Energized Sigil`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Place an Energize token on any player's breach that doesn't have one.
         <span class="or">OR</span>
         Discard an Energize token on any player's breach. 
@@ -126,9 +126,9 @@ const newAgeData = {
       name: 'Taqren',
       id: 'Taqren',
       mageTitle: 'The Shield',
-      ability: `
-        <h2>Breach Siphon</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Breach Siphon`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Focus any player's breach. 
         Any player gains 1 life for each opened breach you have.</p>`,
       numberOfCharges: 4,
@@ -152,9 +152,9 @@ const newAgeData = {
       name: 'Talix',
       id: 'Talix',
       mageTitle: 'The Chain',
-      ability: `
-        <h2>Soaring Ash</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Soaring Ash`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Destroy two sparks in hand. If you do, 
         shuffle your turn order card into the turn order deck.
         <span class="or">OR</span>
@@ -181,9 +181,9 @@ const newAgeData = {
       name: 'Rhia',
       id: 'Rhia',
       mageTitle: 'Relic Hunter',
-      ability: `
-        <h2>Sublimate</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Sublimate`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Return a card in your hand or discard pile to its supply pile. 
         If you returned a relic, gain a card from any supply pile 
         that costs up to 3 <span class="aether">&AElig;</span> more than the returned card. 
@@ -210,9 +210,9 @@ const newAgeData = {
       name: 'Claudia',
       id: 'Claudia',
       mageTitle: 'Prospector',
-      ability: `
-        <h2>Aeplosion</h2>
-        <p class="ability-activation">Activate during any ally's main phase:</p>
+      abilityName: `Aeplosion`,
+      abilityActivation: `Activate during any ally's main phase:`,
+      abilityEffect: `
         <p>That ally gains 2 <span class="aether">&AElig;</span>. The next time that ally 
         gains a card from a supply pile this turn, 
         you gain a copy of that card from that supply pile.
@@ -239,9 +239,9 @@ const newAgeData = {
       name: 'Lost',
       id: 'Lost',
       mageTitle: 'Living Forge',
-      ability: `
-        <h2>Meek's Might</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Meek's Might`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Return up to four cards that cost 0 <span class="aether">&AElig;</span> 
         in your discard pile to your hand.</p>`,
       numberOfCharges: 5,
diff --git a/dataParser/theVoid.js b/dataParser/theVoid.js
index b77d287f..06d35406 100644
--- a/dataParser/theVoid.js
+++ b/dataParser/theVoid.js
@@ -28,9 +28,9 @@ const theVoidData = {
       name: 'Sparrow',
       id: 'Sparrow',
       mageTitle: 'Breach Mage Soldier',
-      ability: `
-        <h2>Eldritch Tether</h2>
-        <p class="ability-activation">Activate during your casting or main phase:</p>
+      abilityName: `Eldritch Tether`,
+      abilityActivation: `Activate during your casting or main phase:`,
+      abilityEffect: `
         <p>Focus any player's breach. Repeat this three additional times.
         <span class="or">OR</span>
         Any ally with no closed breaches draws three cards and then 
@@ -58,9 +58,9 @@ const theVoidData = {
       name: 'Xaxos',
       id: 'XaxosTV',
       mageTitle: 'Voidbringer',
-      ability: `
-        <h2>Praetorian Halo</h2>
-        <p class="ability-activation">Activate during your casting or main phase:</p>
+      abilityName: `Praetorian Halo`,
+      abilityActivation: `Activate during your casting or main phase:`,
+      abilityEffect: `
         <p>Any ally gains 1 charge and discards a random card in hand. Focus 
         one of your breaches. Gain 1 life. Destroy a card in your hand or 
         discard pile.</p>`,
diff --git a/dataParser/warEternal.js b/dataParser/warEternal.js
index ac680386..591b9f58 100644
--- a/dataParser/warEternal.js
+++ b/dataParser/warEternal.js
@@ -51,9 +51,9 @@ const warEternalData = {
       name: 'Dezmodia',
       id: 'Dezmodia',
       mageTitle: 'Voidborn Prodigy',
-      ability: `
-        <h2>Tempest Sigil</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Tempest Sigil`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Any player destroys an opened I or II breach and 
         returns any spells prepped to that breach to their hand. 
         That player gains a Sigil breach and places it where the destroyed 
@@ -82,9 +82,9 @@ const warEternalData = {
       name: 'Garu',
       id: 'Garu',
       mageTitle: 'Oathsworn Protector',
-      ability: `
-        <h2>Colossal Force</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Colossal Force`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Discard up to four of your prepped spells.</p>
         <p>Deal 2 damage plus 4 additional damage for each spell you 
         discarded divided however you choose to the nemesis or any 
@@ -113,9 +113,9 @@ const warEternalData = {
       name: 'Gex',
       id: 'Gex',
       mageTitle: 'Breach Mage Adviser',
-      ability: `
-        <h2>Vimcraft Oath</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Vimcraft Oath`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Destroy up to two cards in your discard pile that cost 
         0 <span class="aether">&AElig;</span>.</p>
         <p>Any ally draws one card and gains 2 life.</p>`,
@@ -142,9 +142,9 @@ const warEternalData = {
       name: 'Mazahaedron',
       id: 'Mazahaedron',
       mageTitle: 'Henge Mystic',
-      ability: `
-        <h2>Underearth Mantra</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Underearth Mantra`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>You may gain a gem that costs 4 <span class="aether">&AElig;</span> or 
         less from any supply pile.</p>
         <p>Gravehold gains 4 life.</p>`,
@@ -174,9 +174,9 @@ const warEternalData = {
       name: 'Mist',
       id: 'MistWE',
       mageTitle: 'Voidwalker',
-      ability: `
-        <h2>Exalted Brand</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Exalted Brand`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Cast up to three different spells prepped by any number of players. 
         For each spell cast this way, place that spell into any ally's hand.</p>`,
       numberOfCharges: 6,
@@ -203,9 +203,9 @@ const warEternalData = {
       name: 'Quilius',
       id: 'Quilius',
       mageTitle: 'Breach Mage Assassin',
-      ability: `
-        <h2>Quietus Vow</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Quietus Vow`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Deal 2 damage for each Trophy token you have.</p>`,
       numberOfCharges: 5,
       uniqueStarters: [
@@ -231,9 +231,9 @@ const warEternalData = {
       name: 'Ulgimor',
       id: 'Ulgimor',
       mageTitle: 'Shadowkin Beast',
-      ability: `
-        <h2>Eidolon Shroud</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Eidolon Shroud`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Gain 6 life.</p>
         <p>If you are exhausted, any ally gains 5 life instead.</p>`,
       numberOfCharges: 6,
@@ -260,9 +260,9 @@ const warEternalData = {
       name: 'Yan Magda',
       id: 'YanMagda',
       mageTitle: 'Enlightened Exile',
-      ability: `
-        <h2>Imperium Ritual</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+      abilityName: `Imperium Ritual`,
+      abilityActivation: `Activate during your main phase:`,
+      abilityEffect: `
         <p>Gain a card from any supply pile. If you have four 
         opened breaches, any ally gains a card from any supply pile and 
         places it on top of their deck.</p>`,
diff --git a/src/Redux/Store/Expeditions/Expeditions/sideEffects/rollWinRewards/__test__/__fixtures__/expeditionState.ts b/src/Redux/Store/Expeditions/Expeditions/sideEffects/rollWinRewards/__test__/__fixtures__/expeditionState.ts
index 91f25d53..6570494e 100644
--- a/src/Redux/Store/Expeditions/Expeditions/sideEffects/rollWinRewards/__test__/__fixtures__/expeditionState.ts
+++ b/src/Redux/Store/Expeditions/Expeditions/sideEffects/rollWinRewards/__test__/__fixtures__/expeditionState.ts
@@ -5245,8 +5245,9 @@ export const state = {
               name: 'Adelheim',
               id: 'Adelheim',
               mageTitle: 'Armurier',
-              ability:
-                '<h2>Gardien étherien</h2>\n<p class="ability-activation">S\'active durant la phase de pioche de la némésis :</p>\n<p>Après qu\'une carte Attaque ou Pouvoir a été piochée, mais avant qu\'elle soit résolue, vous pouvez la défausser sans appliquer son effet.\n<span class="hint">La némésis ne pioche pas de nouvelle carte à la place</span></p>',
+              abilityName: 'Gardien étherien',
+              abilityActivation: 'S\'active durant la phase de pioche de la némésis :',
+              abilityEffect: '<p>Après qu\'une carte Attaque ou Pouvoir a été piochée, mais avant qu\'elle soit résolue, vous pouvez la défausser sans appliquer son effet.\n<span class="hint">La némésis ne pioche pas de nouvelle carte à la place</span></p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5266,8 +5267,9 @@ export const state = {
               name: 'Brama',
               id: 'Brama',
               mageTitle: 'Ancienne',
-              ability:
-                '<h2>Siphon de la bordure</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Un joueur gagne 4 Vie.</p>',
+              abilityName: 'Siphon de la bordure',
+              abilityActivation: 'S\'active durant votre phase principale :',
+              abilityEffect: '<p>Un joueur gagne 4 Vie.</p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5287,8 +5289,9 @@ export const state = {
               name: 'Jian',
               id: 'Jian',
               mageTitle: 'Orpheline',
-              ability:
-                '<h2>Miroir noir</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Lancez le sort préparer d\'un joueur sans le défausser. Puis lancer ce sort à nouveau.\n<span class="hint">Défaussez-le ensuite.</span></p>',
+              abilityName: 'Miroir noir',
+              abilityActivation: 'S\'active durant votre phase principale :',
+              abilityEffect: '<p>Lancez le sort préparer d\'un joueur sans le défausser. Puis lancer ce sort à nouveau.\n<span class="hint">Défaussez-le ensuite.</span></p>',
               numberOfCharges: 4,
               uniqueStarters: [
                 {
@@ -5308,8 +5311,9 @@ export const state = {
               name: 'Kadir',
               id: 'Kadir',
               mageTitle: 'Chercheuse',
-              ability:
-                "<h2>Porte vers l'autre-monde</h2>\n<p class=\"ability-activation\">S'active durant la phase principale d'un joueur :</p>\n<p>Ce joueur peut reprendre en main jusqu'à trois sorts de sa défausse. Durant ce tour, ce joueur peut préparer jusqu'à deux sorts sur chacune de ses brèches ouvertes.</p>",
+              abilityName: "Porte vers l'autre-monde",
+              abilityActivation: "S'active durant la phase principale d'un joueur :",
+              abilityEffect: "<p>Ce joueur peut reprendre en main jusqu'à trois sorts de sa défausse. Durant ce tour, ce joueur peut préparer jusqu'à deux sorts sur chacune de ses brèches ouvertes.</p>",
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5329,8 +5333,9 @@ export const state = {
               name: 'Lash',
               id: 'Lash',
               mageTitle: 'Éclaireur',
-              ability:
-                '<h2>Accélération mentale</h2>\n<p class="ability-activation">S\'active durant la phase principale d\'un joueur :</p>\n<p>Mélangez la carte Ordre du tour d\'un joueur dans le paquet d\'ordre du tour. Ce joueur subit 1 dégât.\n<span class="hint">Vous ne pouvez pas choisir la carte Ordre du jour Joker.</span></p>',
+              abilityName: 'Accélération mentale',
+              abilityActivation: 'S\'active durant la phase principale d\'un joueur :',
+              abilityEffect: '<p>Mélangez la carte Ordre du tour d\'un joueur dans le paquet d\'ordre du tour. Ce joueur subit 1 dégât.\n<span class="hint">Vous ne pouvez pas choisir la carte Ordre du jour Joker.</span></p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5350,8 +5355,9 @@ export const state = {
               name: 'Mist',
               id: 'Mist',
               mageTitle: 'Capitaine de la dague',
-              ability:
-                '<h2>Prédiciton divine</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Un allié pioche quatre cartes.</p>',
+              abilityName: 'Prédiciton divine',
+              abilityActivation: 'S\'active durant votre phase principale :',
+              abilityEffect: '<p>Un allié pioche quatre cartes.</p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5371,8 +5377,9 @@ export const state = {
               name: 'Phaedraxa',
               id: 'Phaedraxa',
               mageTitle: 'Voyante',
-              ability:
-                '<h2>Rune des oracles</h2>\n<p class="ability-activation">S\'active au moment où une carte Ordre du tour est révélée :</p>\n<p>Tous les dégâts que les joueurs ou Gravehold devraient subir ce tour-ci sont annulés.</p>',
+              abilityName: 'Rune des oracles',
+              abilityActivation: 'S\'active au moment où une carte Ordre du tour est révélée :',
+              abilityEffect: '<p>Tous les dégâts que les joueurs ou Gravehold devraient subir ce tour-ci sont annulés.</p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5392,8 +5399,9 @@ export const state = {
               name: 'Xaxos',
               id: 'Xaxos',
               mageTitle: 'Adepte',
-              ability:
-                "<h2>Lien métaphysique</h2>\n<p class=\"ability-activation\">S'active durant la phase principale d'un joueur :</p>\n<p>Les alliés reçoivent collectivement 4 charges. Révélez puis replacez les cartes de la pioche d'Ordre du tour dans l'ordre de votre choix.</p>",
+              abilityName: "Lien métaphysique",
+              abilityActivation: "S'active durant la phase principale d'un joueur :",
+              abilityEffect: "<p>Les alliés reçoivent collectivement 4 charges. Révélez puis replacez les cartes de la pioche d'Ordre du tour dans l'ordre de votre choix.</p>",
               numberOfCharges: 5,
               uniqueStarters: [
                 {
diff --git a/src/__fixtures__/rootState.ts b/src/__fixtures__/rootState.ts
index 5ff716be..bebc500b 100644
--- a/src/__fixtures__/rootState.ts
+++ b/src/__fixtures__/rootState.ts
@@ -5244,8 +5244,9 @@ export const rootState: RootState = {
               name: 'Adelheim',
               id: 'Adelheim',
               mageTitle: 'Armurier',
-              ability:
-                '<h2>Gardien étherien</h2>\n<p class="ability-activation">S\'active durant la phase de pioche de la némésis :</p>\n<p>Après qu\'une carte Attaque ou Pouvoir a été piochée, mais avant qu\'elle soit résolue, vous pouvez la défausser sans appliquer son effet.\n<span class="hint">La némésis ne pioche pas de nouvelle carte à la place</span></p>',
+              abilityName: 'Gardien étherien',
+              abilityActivation: 'S\'active durant la phase de pioche de la némésis :',
+              abilityEffect: '<p>Après qu\'une carte Attaque ou Pouvoir a été piochée, mais avant qu\'elle soit résolue, vous pouvez la défausser sans appliquer son effet.\n<span class="hint">La némésis ne pioche pas de nouvelle carte à la place</span></p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5265,8 +5266,9 @@ export const rootState: RootState = {
               name: 'Brama',
               id: 'Brama',
               mageTitle: 'Ancienne',
-              ability:
-                '<h2>Siphon de la bordure</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Un joueur gagne 4 Vie.</p>',
+              abilityName: 'Siphon de la bordure',
+              abilityActivation: 'S\'active durant votre phase principale :',
+              abilityEffect: '<p>Un joueur gagne 4 Vie.</p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5286,8 +5288,9 @@ export const rootState: RootState = {
               name: 'Jian',
               id: 'Jian',
               mageTitle: 'Orpheline',
-              ability:
-                '<h2>Miroir noir</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Lancez le sort préparer d\'un joueur sans le défausser. Puis lancer ce sort à nouveau.\n<span class="hint">Défaussez-le ensuite.</span></p>',
+              abilityName: 'Miroir noir',
+              abilityActivation: 'S\'active durant votre phase principale :',
+              abilityEffect: '<p>Lancez le sort préparer d\'un joueur sans le défausser. Puis lancer ce sort à nouveau.\n<span class="hint">Défaussez-le ensuite.</span></p>',
               numberOfCharges: 4,
               uniqueStarters: [
                 {
@@ -5307,8 +5310,9 @@ export const rootState: RootState = {
               name: 'Kadir',
               id: 'Kadir',
               mageTitle: 'Chercheuse',
-              ability:
-                "<h2>Porte vers l'autre-monde</h2>\n<p class=\"ability-activation\">S'active durant la phase principale d'un joueur :</p>\n<p>Ce joueur peut reprendre en main jusqu'à trois sorts de sa défausse. Durant ce tour, ce joueur peut préparer jusqu'à deux sorts sur chacune de ses brèches ouvertes.</p>",
+              abilityName: "Porte vers l'autre-monde",
+              abilityActivation: "S'active durant la phase principale d'un joueur :",
+              abilityEffect: "<p>Ce joueur peut reprendre en main jusqu'à trois sorts de sa défausse. Durant ce tour, ce joueur peut préparer jusqu'à deux sorts sur chacune de ses brèches ouvertes.</p>",
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5328,8 +5332,9 @@ export const rootState: RootState = {
               name: 'Lash',
               id: 'Lash',
               mageTitle: 'Éclaireur',
-              ability:
-                '<h2>Accélération mentale</h2>\n<p class="ability-activation">S\'active durant la phase principale d\'un joueur :</p>\n<p>Mélangez la carte Ordre du tour d\'un joueur dans le paquet d\'ordre du tour. Ce joueur subit 1 dégât.\n<span class="hint">Vous ne pouvez pas choisir la carte Ordre du jour Joker.</span></p>',
+              abilityName: 'Accélération mentale',
+              abilityActivation: 'S\'active durant la phase principale d\'un joueur :',
+              abilityEffect: '<p>Mélangez la carte Ordre du tour d\'un joueur dans le paquet d\'ordre du tour. Ce joueur subit 1 dégât.\n<span class="hint">Vous ne pouvez pas choisir la carte Ordre du jour Joker.</span></p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5349,8 +5354,9 @@ export const rootState: RootState = {
               name: 'Mist',
               id: 'Mist',
               mageTitle: 'Capitaine de la dague',
-              ability:
-                '<h2>Prédiciton divine</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Un allié pioche quatre cartes.</p>',
+              abilityName: 'Prédiciton divine',
+              abilityActivation: 'S\'active durant votre phase principale :',
+              abilityEffect: '<p>Un allié pioche quatre cartes.</p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5370,8 +5376,9 @@ export const rootState: RootState = {
               name: 'Phaedraxa',
               id: 'Phaedraxa',
               mageTitle: 'Voyante',
-              ability:
-                '<h2>Rune des oracles</h2>\n<p class="ability-activation">S\'active au moment où une carte Ordre du tour est révélée :</p>\n<p>Tous les dégâts que les joueurs ou Gravehold devraient subir ce tour-ci sont annulés.</p>',
+              abilityName: 'Rune des oracles',
+              abilityActivation: 'S\'active au moment où une carte Ordre du tour est révélée :',
+              abilityEffect: '<p>Tous les dégâts que les joueurs ou Gravehold devraient subir ce tour-ci sont annulés.</p>',
               numberOfCharges: 5,
               uniqueStarters: [
                 {
@@ -5391,8 +5398,9 @@ export const rootState: RootState = {
               name: 'Xaxos',
               id: 'Xaxos',
               mageTitle: 'Adepte',
-              ability:
-                "<h2>Lien métaphysique</h2>\n<p class=\"ability-activation\">S'active durant la phase principale d'un joueur :</p>\n<p>Les alliés reçoivent collectivement 4 charges. Révélez puis replacez les cartes de la pioche d'Ordre du tour dans l'ordre de votre choix.</p>",
+              abilityName: "Lien métaphysique",
+              abilityActivation: "S'active durant la phase principale d'un joueur :",
+              abilityEffect: "<p>Les alliés reçoivent collectivement 4 charges. Révélez puis replacez les cartes de la pioche d'Ordre du tour dans l'ordre de votre choix.</p>",
               numberOfCharges: 5,
               uniqueStarters: [
                 {
diff --git a/src/aer-data/README.md b/src/aer-data/README.md
index de764700..7a5d4ae7 100644
--- a/src/aer-data/README.md
+++ b/src/aer-data/README.md
@@ -159,13 +159,13 @@ Mage example:
   name: 'Adelheim',
   id: 'Adelheim',
   mageTitle: 'Breach Mage Weaponsmith',
-  ability: `
-      <h2>Aethereal Ward</h2>
-      <p class="ability-activation">Activate during the nemesis draw phase:</p>
+  abilityName: 'Aetherial Ward'
+  abilityActivation: 'Activate during the nemesis draw phase:'
+  abilityEffect: `
       <p>When a nemesis attack or power card is drawn but before it is resolved,
       you may discard it. It has no effect.
       <span class="hint">(The nemesis does not draw a replacement card)</span></p>
-    `,
+    `
   numberOfCharges: 5,
   uniqueStarters: [
     {
@@ -186,28 +186,28 @@ Mage example:
 },
 ```
 
-For mages we translate the `name`, `mageTitle`, `ability` and the `uniqueStarters`. For the unique starters you can consult the card section.
+For mages we translate the `name`, `mageTitle`, `abilityName`, `abilityActivation`, `abilityEffect`, and the `uniqueStarters`. For the unique starters you can consult the card section.
 
-The template for the `ability` should look like this:
+The template for the `ability*` attributes should look like this:
 
 ```javascript
-ability: `
-  <h2>Aethereal Ward</h2>
-  <p class="ability-activation">Activate during the nemesis draw phase:</p>
-  <p>When a nemesis attack or power card is drawn but before it is resolved,
-  you may discard it. It has no effect.
-  <span class="hint">(The nemesis does not draw a replacement card)</span></p>
-`,
+  abilityName: 'Aetherial Ward'
+  abilityActivation: 'Activate during the nemesis draw phase:'
+  abilityEffect: `
+      <p>When a nemesis attack or power card is drawn but before it is resolved,
+      you may discard it. It has no effect.
+      <span class="hint">(The nemesis does not draw a replacement card)</span></p>
+    `
 ```
 
-In general we have a headline `<h2>...</h2>`, a paragraph for the ability activation text `<p class="ability-activation">...</p>` and a paragraph for the ability description `<p>...</p>` which can contain some of the template snipptes described above.
+In general we have a name, a the ability activation text, and a paragraph for the ability description `<p>...</p>` which can contain some of the template snipptes described above.
 
 Another example with multiple ability description paragraphs:
 
 ```javascript
-ability: `
-  <h2>Quelling Blade</h2>
-  <p class="ability-activation">Activate during your main phase:</p>
+abilityName: 'Quelling Blade'
+abilityActivation: 'Activate during your main phase:'
+abilityEffect: `
   <p>Deal 5 damage to a minion.</p>
   <p>Deal 3 damage to a different minion.</p>
 `,
diff --git a/src/aer-data/src/DE/aeonsEnd/mages.ts b/src/aer-data/src/DE/aeonsEnd/mages.ts
index bcd8f2ea..f7574815 100644
--- a/src/aer-data/src/DE/aeonsEnd/mages.ts
+++ b/src/aer-data/src/DE/aeonsEnd/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Adelheim',
     id: 'Adelheim',
     mageTitle: 'Riss-Magier-Waffenschmied',
-    ability: `
-        <h2>Aetherium Schutzwall</h2>
-        <p class="ability-activation">Im ERZFEIND-ZUG während der <i>Erzfeind-Aktion</i>:</p>
+    abilityName: `Aetherium Schutzwall`,
+    abilityActivation: `Im ERZFEIND-ZUG während der <i>Erzfeind-Aktion</i>:`,
+    abilityEffect: `
         <p>Zieht ihr einen ANGRIFF oder PLAN? Wirf ihn ab. Er wird nicht ausgeführt und ihr zieht keinen Ersatz.</p>
       `,
     numberOfCharges: 5,
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Brama',
     id: 'Brama',
     mageTitle: 'Riss-Magier-Älteste',
-    ability: `
-        <h2>Den Abgrund Abschöpfen</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Den Abgrund Abschöpfen`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 Spieler, der 4 Leben heilt.</p>
       `,
     numberOfCharges: 5,
@@ -64,9 +64,9 @@ export const mages: Mage[] = [
     name: 'Jian',
     id: 'Jian',
     mageTitle: 'Riss-Magier-Waise',
-    ability: `
-        <h2>Schwarzer Spiegel</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Schwarzer Spiegel`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 Spieler und wirke 1 seiner gebundenen Zauber. Der Zauber bleibt gebunden.</p>
         <p>Dann wirke diesen Zauber erneut
         <span class="hint">(und er wird abgelegt, wie üblich).</span></p>
@@ -94,9 +94,9 @@ export const mages: Mage[] = [
     name: 'Kadir',
     id: 'Kadir',
     mageTitle: 'Riss-Magier-Forscherin',
-    ability: `
-        <h2>Tor ins Anderseits</h2>
-        <p class="ability-activation">Im SPIELER-ZUG DEINER WAHL während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Tor ins Anderseits`,
+    abilityActivation: `Im SPIELER-ZUG DEINER WAHL während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Der Spieler darf bis zu 3 Zauber aus seinem Ablagestapel zurück auf die Hand 
           nehmen. Dann darf er bis zu 2 Zauber an jeden seiner 
           aktiven Risse binden.</p>
@@ -125,9 +125,9 @@ export const mages: Mage[] = [
     name: 'Lash',
     id: 'Lash',
     mageTitle: 'Riss-Magier-Späher',
-    ability: `
-        <h2>Blitzschnell Reagieren</h2>
-        <p class="ability-activation">Im SPIELER-ZUG DEINER WAHL während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Blitzschnell Reagieren`,
+    abilityActivation: `Im SPIELER-ZUG DEINER WAHL während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Mische die Spieler-Reihenfolgekarte 1 Spielers deiner 
           Wahl zurück in das Reihenfolgedeck und füge diesem 
           Spieler 1 Schaden zu.
@@ -158,9 +158,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'Mist',
     mageTitle: 'Kapitänin der Dolchspitze',
-    ability: `
-        <h2>Rat der Zukunft</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Rat der Zukunft`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 anderen Spieler, der 4 Karten zieht.</p>
       `,
     numberOfCharges: 5,
@@ -187,9 +187,9 @@ export const mages: Mage[] = [
     name: 'Phaedraxa',
     id: 'Phaedraxa',
     mageTitle: 'Riss-Magier-Seherin',
-    ability: `
-        <h2>Rune der Vorsicht</h2>
-        <p class="ability-activation">Direkt nachdem ihr eine REIHENFOLGEKARTE GEZOGEN habt:</p>
+    abilityName: `Rune der Vorsicht`,
+    abilityActivation: `Direkt nachdem ihr eine REIHENFOLGEKARTE GEZOGEN habt:`,
+    abilityEffect: `
         <p>Verhindere in diesem Zug allen Schaden, der den Spielern 
           wie auch der <i>Feste der letzten Ruhe</i> zugefügt wird.
         </p>
@@ -218,9 +218,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'Xaxos',
     mageTitle: 'Riss-Magier-Adept',
-    ability: `
-        <h2>Metaphysische Verbindung</h2>
-        <p class="ability-activation">Im SPIELER-ZUG DEINER WAHL während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Metaphysische Verbindung`,
+    abilityActivation: `Im SPIELER-ZUG DEINER WAHL während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Erhalte insgesamt 4 Energie und verteile sie auf andere Spieler deiner Wahl. 
           Decke alle noch verdeckten Reihenfolgekarten auf und lege sie in einer Reihenfolge 
           deiner Wahl verdeckt zurück.
diff --git a/src/aer-data/src/DE/intoTheWild/mages.ts b/src/aer-data/src/DE/intoTheWild/mages.ts
index 1d5b6497..c89a79b9 100644
--- a/src/aer-data/src/DE/intoTheWild/mages.ts
+++ b/src/aer-data/src/DE/intoTheWild/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Inco',
     id: 'Inco',
     mageTitle: 'Kind der Natur',
-    ability: `
-        <h2>Wucherndes Wachstum</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Wucherndes Wachstum`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         Wirke beliebig viele gebundene Rosendornen (bei 1 oder mehr Spielern) mit jeweils +2 Schaden.</p>`,
     numberOfCharges: 5,
     uniqueStarters: [
@@ -31,9 +31,9 @@ export const mages: Mage[] = [
     name: 'Razra',
     id: 'Razra',
     mageTitle: 'Riss-Magier-Bändigerin',
-    ability: `
-        <h2>Reißer abrichten</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Reißer abrichten`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Zerstöre 1 Reißer-Karte auf deiner Hand. Erwirb gratis 1 Reißer-Karte von deinem Reißer-Stapel, die
         bis zu 3 <span class="aether">&AElig;</span> mehr kostet. Nimm sie direkt auf die Hand.
         <span class="or">OR</span>
diff --git a/src/aer-data/src/DE/legacy/mages.ts b/src/aer-data/src/DE/legacy/mages.ts
index 21e8c426..d8f06122 100644
--- a/src/aer-data/src/DE/legacy/mages.ts
+++ b/src/aer-data/src/DE/legacy/mages.ts
@@ -5,7 +5,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Grün',
     id: 'LegacyGreen',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     mageTitle: 'Custom',
     uniqueStarters: [],
@@ -14,7 +16,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Gelb',
     id: 'LegacyYellow',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
@@ -23,7 +27,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Orange',
     id: 'LegacyOrange',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
@@ -32,7 +38,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Blau',
     id: 'LegacyBlue',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
diff --git a/src/aer-data/src/DE/outerDark/mages.ts b/src/aer-data/src/DE/outerDark/mages.ts
index a850987a..2faf4549 100644
--- a/src/aer-data/src/DE/outerDark/mages.ts
+++ b/src/aer-data/src/DE/outerDark/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Indira',
     id: 'Indira',
     mageTitle: 'Riss-Magier-Lehrling',
-    ability: `
-        <h2>List der Pyromanen</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Zauber wirken</i>:</p>
+    abilityName: `List der Pyromanen`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Zauber wirken</i>:`,
+    abilityEffect: `
         <p>Wirke eine Anzahl Zauber deiner Wahl direkt von deiner Hand. +1 Schaden für jeden so gewirkten
         Zauber. Dann darfst du 1 Karte deiner Wahl in deinem Ablagestapel zerstören.</p>
       `,
@@ -35,9 +35,9 @@ export const mages: Mage[] = [
     name: 'Reliquior',
     id: 'Remnant',
     mageTitle: 'Ätherisches Wesen',
-    ability: `
-        <h2>Hauch des Nichts</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Hauch des Nichts`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 anderen Spieler, der 2 Karten von seinem Ablagestapel zurück auf die Hand nimmt.
         <span class="or">ODER</span>
         Die <i>Feste der letzten Ruhe</i> heilt 5 Leben.</p>
diff --git a/src/aer-data/src/DE/shatteredDreams/mages.ts b/src/aer-data/src/DE/shatteredDreams/mages.ts
index 78e0a75f..b361a3b9 100644
--- a/src/aer-data/src/DE/shatteredDreams/mages.ts
+++ b/src/aer-data/src/DE/shatteredDreams/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Nook',
     id: 'Nook',
     mageTitle: 'Orb-Rufer',
-    ability: `
-        <h2>Ätherische Verdichtung</h2>
-        <p class="ability-activation">In deinem Spielzug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Ätherische Verdichtung`,
+    abilityActivation: `In deinem Spielzug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Du darfst 1 Karte auf deiner Hand oder in deinem Ablagestapel zerstören.<br/>
         Erhalte 4 <span class="aether">&AElig;</span>.<br/>
         Den nächsten Zauber, den du in diesem Zug erwirbst, darfst du direkt auf die Hand nehmen.</p>`,
diff --git a/src/aer-data/src/DE/theAncients/mages.ts b/src/aer-data/src/DE/theAncients/mages.ts
index 01267b35..a5be79a5 100644
--- a/src/aer-data/src/DE/theAncients/mages.ts
+++ b/src/aer-data/src/DE/theAncients/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Mazra',
     id: 'Mazra',
     mageTitle: 'Belesene Riss-Magierin',
-    ability: `
-        <h2>Nachforschungen</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Nachforschungen`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>
         Zerstöre 1 Mazra-Karte auf deiner Hand. Erwirb gratis 1 Mazra-Karte von deinem Forschungs-Stapel,
         die bis zu 3 <span class="aether">&AElig;</span> mehr kostet. Nimm sie direkt auf die Hand.
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Qu',
     id: 'Qu',
     mageTitle: 'Erbauer und Zerstörerin',
-    ability: `
-        <h2>Duale Realität</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Duale Realität`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>
         Bist du in <b>Zerstörerin</b>-Gestalt? Wirke bis zu 2 gebundene Zauber mit unterschiedlichen
         Namen von 1 oder mehr Spielern. Bist du in <b>Erbauerin</b>-Gestalt? Wähle 1 Spieler, der bis zu
diff --git a/src/aer-data/src/DE/theDepths/mages.ts b/src/aer-data/src/DE/theDepths/mages.ts
index 0d26703b..c76180ab 100644
--- a/src/aer-data/src/DE/theDepths/mages.ts
+++ b/src/aer-data/src/DE/theDepths/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Nym',
     id: 'Nym',
     mageTitle: 'Riss-Magier-Lehrling',
-    ability: `
-        <h2>Barriere</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Barriere`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Sieh dir die oberste Erzfeind-Karte an und wirf sie ab.</p>
         <p>Hast du einen ANGRIFF gesehen, wiederhole das (1x).</p>
       `,
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Reeve',
     id: 'Reeve',
     mageTitle: 'Riss-Magier-Elite',
-    ability: `
-        <h2>Quelling Blade</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Quelling Blade`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Füge 1 Monster 5 Schaden zu.</p>
         <p>Füge 1 anderen Monster 3 Schaden zu.</p>
       `,
@@ -65,9 +65,9 @@ export const mages: Mage[] = [
     name: "Z'hana",
     id: 'Zhana',
     mageTitle: 'Abtrünnige Riss-Magierin',
-    ability: `
-        <h2>Das Licht Der Welt, Die War</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Das Licht Der Welt, Die War`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Die <i>Feste der letzten Ruhe</i> heilt 7 Leben.</p>
       `,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/DE/theNameless/mages.ts b/src/aer-data/src/DE/theNameless/mages.ts
index 231dffe9..e6e6e825 100644
--- a/src/aer-data/src/DE/theNameless/mages.ts
+++ b/src/aer-data/src/DE/theNameless/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Malastar',
     id: 'Malastar',
     mageTitle: 'Riss-Magier-Mentor',
-    ability: `
-        <h2>Aetherium-Geschenk</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Aetherium-Geschenk`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>
           Erwirb 1 Zauber deiner Wahl gratis. Du darfst diesen Zauber sofort an den aktiven 
           Riss 1 Spielers deiner Wahl binden.
diff --git a/src/aer-data/src/DE/theNewAge/mages.ts b/src/aer-data/src/DE/theNewAge/mages.ts
index 6b2a1342..ea21b849 100644
--- a/src/aer-data/src/DE/theNewAge/mages.ts
+++ b/src/aer-data/src/DE/theNewAge/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Sahala',
     id: 'Sahala',
     mageTitle: 'Riss-Magier-Orakel',
-    ability: `
-        <h2>Sternenband</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Zauber wirken</i> oder <i>Aktionen ausführen</i>:</p>
+    abilityName: `Sternenband`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Zauber wirken</i> oder <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Sieh dir die obersten 3 Karten deines Decks an. Siehst du Zauber? Nimm 1 davon auf die Hand.
         Ist kein Zauber an deinen Gestirn-Riss gebunden? Binde bis zu 2 Zauber von deiner Hand an deinen aktiven Gestirn-Riss.</p>`,
     numberOfCharges: 4,
@@ -32,9 +32,9 @@ export const mages: Mage[] = [
     name: 'Gygar',
     id: 'Gygar',
     mageTitle: 'Herr der Gezeiten',
-    ability: `
-        <h2>Flutwelle</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Flutwelle`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Lege 1 Flut-Plättchen auf deinen Gezeiten-Riss.
         <span class="or">OR</span>
         Wirke 1 an deinen Gezeiten-Riss gebundenen Zauber. Erhalte 2 Energie.</p>`,
@@ -57,9 +57,9 @@ export const mages: Mage[] = [
     name: 'Soskel',
     id: 'Soskel',
     mageTitle: 'Riss-Magier-Aristokrat',
-    ability: `
-        <h2>Augeladenes Siegel</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Augeladenes Siegel`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 Spieler. Dann wähle:<br/>
         Lege 1 Aufladung auf einen seiner Risse ohne Aufladung.
         <span class="or">OR</span>
@@ -84,9 +84,9 @@ export const mages: Mage[] = [
     name: 'Taqren',
     id: 'Taqren',
     mageTitle: 'Der Schild',
-    ability: `
-        <h2>Essenz-Manipulation</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Essenz-Manipulation`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Bündele 1 Riss deiner Wahl (bei 1 Spieler deiner Wahl). Wähle 1 Spieler, der 1 Leben für jeden deiner aktiven Risse heilt.</p>`,
     numberOfCharges: 4,
     uniqueStarters: [
@@ -109,9 +109,9 @@ export const mages: Mage[] = [
     name: 'Talix',
     id: 'Talix',
     mageTitle: 'Die Kette',
-    ability: `
-        <h2>Aufsteigende Asche</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Aufsteigende Asche`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Die <i>Feste</i> heilt 5 Leben.
         <span class="or">OR</span>
         Zerstöre 2 Funken auf deiner Hand. Ist das passiert? Mische deine Reihenfolgekarte in
@@ -137,9 +137,9 @@ export const mages: Mage[] = [
     name: 'Rhia',
     id: 'Rhia',
     mageTitle: 'Riss-Magier-Schatzjägerin',
-    ability: `
-        <h2>Transformation</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Transformation`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Lege 1 Karte von deiner Hand oder deinem Ablagestapel zurück auf ihren Vorrat.
         War es ein Artefakt? Erwirb gratis 1 Karte, die bis zu 3 <span class="aether">&AElig;</span>
         mehr kostet. Andernfalls erwirb gratis 1 Karte, die bis zu 2 <span class="aether">&AElig;</span>
@@ -164,9 +164,9 @@ export const mages: Mage[] = [
     name: 'Claudia',
     id: 'Claudia',
     mageTitle: 'Riss-Magier-Prospektorin',
-    ability: `
-        <h2>Ätherplosion</h2>
-        <p class="ability-activation">Im Spieler-Zug eines anderen Spielers während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Ätherplosion`,
+    abilityActivation: `Im Spieler-Zug eines anderen Spielers während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Dieser Spieler erhält 2 <span class="aether">&AElig;</span>. Wenn er das nächste Mal in diesem Zug
         eine Karte erwirbt, erwirbst du gratis 1 Karte des gleichen Vorrats.
         <span class="or">OR</span>
@@ -192,9 +192,9 @@ export const mages: Mage[] = [
     name: 'Lost',
     id: 'Lost',
     mageTitle: 'Lebendige Schmiede',
-    ability: `
-        <h2>Hörnchens Stärke</h2>
-        <p class="ability-activation">In deinem Spieler-Zug während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Hörnchens Stärke`,
+    abilityActivation: `In deinem Spieler-Zug während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Nimm bis zu 4 Karten mit Kosten von 0 <span class="aether">&AElig;</span> aus deinem
         Ablagestapel zurück auf die Hand.</p>`,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/DE/theVoid/mages.ts b/src/aer-data/src/DE/theVoid/mages.ts
index dee6566c..3147178e 100644
--- a/src/aer-data/src/DE/theVoid/mages.ts
+++ b/src/aer-data/src/DE/theVoid/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Sparrow',
     id: 'Sparrow',
     mageTitle: 'Riss-Magier-Soldatin',
-    ability: `
-        <h2>Arkane Verbindung</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Arkane Verbindung`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 4x je 1 Spieler und bündele 1 seiner Risse.
         <span class="or">ODER</span>
         Wähle 1 anderen Spieler ohne dunkle Risse. Dieser Spieler zieht 3 Karten und bindet dann bis zu
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'XaxosTV',
     mageTitle: 'Herold der Leere',
-    ability: `
-        <h2>Schein der Praetorianer</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Schein der Praetorianer`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 anderen Spieler, der 1 Energie erhält und 1 zufällige Karte von seiner Hand abwirft.
         Bündele 1 deiner Risse. Heile 1 Leben. Zerstöre 1 Karte deiner Wahl auf deiner Hand oder in deinem
         Ablagestapel.</p>`,
diff --git a/src/aer-data/src/DE/warEternal/mages.ts b/src/aer-data/src/DE/warEternal/mages.ts
index 4509f754..7623668e 100644
--- a/src/aer-data/src/DE/warEternal/mages.ts
+++ b/src/aer-data/src/DE/warEternal/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Dezmodia',
     id: 'Dezmodia',
     mageTitle: 'Wunderkind der Leere',
-    ability: `
-        <h2>Sturmwind-Sigille</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Sturmwind-Sigille`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle 1 Spieler, der 1 seiner aktiven Risse I oder II mit 1 deiner entsprechenden
         Sigillen-Risse ersetzt. Gebundene Zauber kommen zurück auf die Hand. Dann darf dieser Spieler
         sofort 1 Zauber seiner Wahl von der Hand an seine Risse binden.</p>`,
@@ -35,9 +35,9 @@ export const mages: Mage[] = [
     name: 'Garu',
     id: 'Garu',
     mageTitle: 'Vereidigter Beschützer',
-    ability: `
-        <h2>Kolossale Kraft</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Kolossale Kraft`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wirf bis zu 4 deiner gebundenen Zauber ab.</p>
         <p>Füge 2 Schaden zu. +X Schaden. X = 4 pro gerade abgeworfenem Zauber. Dieser Schaden ist aufteilbar.</p>`,
     numberOfCharges: 5,
@@ -64,9 +64,9 @@ export const mages: Mage[] = [
     name: 'Gex',
     id: 'Gex',
     mageTitle: 'Riss-Magier-Beraterin',
-    ability: `
-        <h2>Vimkunst-Schwur</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Vimkunst-Schwur`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Wähle bis zu 2 Karten in deinem Ablagestapel mit <span class="aether">&AElig;</span>-Kosten von 0. Zerstöre sie.</p>
         <p>Wähle 1 anderen Spieler, der 1 Karte zieht und 2 Leben heilt.</p>`,
     numberOfCharges: 5,
@@ -92,9 +92,9 @@ export const mages: Mage[] = [
     name: 'Mazahaedron',
     id: 'Mazahaedron',
     mageTitle: 'Steinkreis-Mystiker',
-    ability: `
-        <h2>Untererde-Mantra</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Untererde-Mantra`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Du darfst gratis 1 Kristall mit <span class="aether">&AElig;</span>-Kosten von 4 oder weniger
         erwerben.</p>
         <p>Die <i>Feste der letzten Ruhe</i> heilt 4 Leben.</p>`,
@@ -123,9 +123,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'MistWE',
     mageTitle: 'Leeren-Schreiter',
-    ability: `
-        <h2>Gesegnetes Brandmal</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Zauber wirken</i>:</p>
+    abilityName: `Gesegnetes Brandmal`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Zauber wirken</i>:`,
+    abilityEffect: `
         <p>Wähle bis zu 3 gebundene Zauber auf den Rissen der Spieler. Wirke sie. Nach jedem Wirken
         dieser Zauber: Wähle 1 anderen Spieler, der diesen Zauber auf die Hand nimmt (das muss
         nicht der Spieler sein, bei dem er gebunden war).</p>`,
@@ -153,9 +153,9 @@ export const mages: Mage[] = [
     name: 'Quilius',
     id: 'Quilius',
     mageTitle: 'Riss-Magier-Assassine',
-    ability: `
-        <h2>Quietus-Gelübde</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Quietus-Gelübde`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Füge X Schaden zu. X = 2 pro Trophäe.</p>`,
     numberOfCharges: 5,
     uniqueStarters: [
@@ -180,9 +180,9 @@ export const mages: Mage[] = [
     name: 'Ulgimor',
     id: 'Ulgimor',
     mageTitle: 'Schattenhaut-Biest',
-    ability: `
-        <h2>Eidolon-Schleier</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Eidolon-Schleier`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Heile 6 Leben.</p>
         <p>Bist du ERSCHÖPFT? Wähle stattdessen 1 anderen Spieler, der 5 Leben heilt.</p>`,
     numberOfCharges: 6,
@@ -209,9 +209,9 @@ export const mages: Mage[] = [
     name: 'Yan Magda',
     id: 'YanMagda',
     mageTitle: 'Erleuchtete im Exil',
-    ability: `
-        <h2>Kaiserliches Ritual</h2>
-        <p class="ability-activation">In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:</p>
+    abilityName: `Kaiserliches Ritual`,
+    abilityActivation: `In DEINEM SPIELER-ZUG während <i>Aktionen ausführen</i>:`,
+    abilityEffect: `
         <p>Erwirb gratis 1 Karte von 1 Vorrat deiner Wahl. Hast du 4 aktive Risse? Wähle 1 anderen Spieler.
         Dieser Spieler erwirbt gratis 1 Karte von 1 Vorrat seiner Wahl, die er oben auf sein Deck legt.</p>`,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/ENG/aeonsEnd/mages.ts b/src/aer-data/src/ENG/aeonsEnd/mages.ts
index 1bca7b3f..d38ba9fe 100644
--- a/src/aer-data/src/ENG/aeonsEnd/mages.ts
+++ b/src/aer-data/src/ENG/aeonsEnd/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Adelheim',
     id: 'Adelheim',
     mageTitle: 'Breach Mage Weaponsmith',
-    ability: `
-        <h2>Aethereal Ward</h2>
-        <p class="ability-activation">Activate during the nemesis draw phase:</p>
+    abilityName: `Aethereal Ward`,
+    abilityActivation: `Activate during the nemesis draw phase:`,
+    abilityEffect: `
         <p>When a nemesis attack or power card is drawn but before it is resolved, 
         you may discard it. It has no effect.
         <span class="hint">(The nemesis does not draw a replacement card)</span></p>
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Brama',
     id: 'Brama',
     mageTitle: 'Breach Mage Elder',
-    ability: `
-        <h2>Brink Siphon</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Brink Siphon`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Any player gains 4 life.</p>
       `,
     numberOfCharges: 5,
@@ -64,9 +64,9 @@ export const mages: Mage[] = [
     name: 'Jian',
     id: 'Jian',
     mageTitle: 'Breach Mage Orphan',
-    ability: `
-        <h2>Black Mirror</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Black Mirror`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Cast any player's prepped spell without discarding it.</p>
         <p>Then cast that prepped spell again.
         <span class="hint">(Discard it afterward.)</span></p>
@@ -95,9 +95,9 @@ export const mages: Mage[] = [
     name: 'Kadir',
     id: 'Kadir',
     mageTitle: 'Breach Mage Delver',
-    ability: `
-        <h2>Otherworldly Gate</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Otherworldly Gate`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
         <p>That player may return up to three spells in their discard pile 
         to their hand. That player may prep up to two spells to each 
         of their opened breaches this turn.</p>
@@ -126,9 +126,9 @@ export const mages: Mage[] = [
     name: 'Lash',
     id: 'Lash',
     mageTitle: 'Breach Mage Scout',
-    ability: `
-        <h2>Quicken Thought</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Quicken Thought`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
         <p>Shuffle any player's turn order card into the turn order deck. 
         That player suffers 1 damage. <span class="hint">(You may not choose the 
         wildcard turn order card.)</span></p>
@@ -158,9 +158,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'Mist',
     mageTitle: 'Dagger Captain',
-    ability: `
-        <h2>Divine Augury</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Divine Augury`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Any ally draws 4 cards.</p>
       `,
     numberOfCharges: 5,
@@ -187,9 +187,9 @@ export const mages: Mage[] = [
     name: 'Phaedraxa',
     id: 'Phaedraxa',
     mageTitle: 'Breach Mage Seer',
-    ability: `
-        <h2>Auspex Rune</h2>
-        <p class="ability-activation">Activate immediately after a turn order card is drawn:</p>
+    abilityName: `Auspex Rune`,
+    abilityActivation: `Activate immediately after a turn order card is drawn:`,
+    abilityEffect: `
         <p>Prevent any damage that the players or Gravehold would suffer during that turn.</p>
       `,
     numberOfCharges: 5,
@@ -215,9 +215,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'Xaxos',
     mageTitle: 'Breach Mage Adept',
-    ability: `
-        <h2>Metaphysical Link</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Metaphysical Link`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
         <p>Allies collectively gain 4 charges. Reveal the turn order deck and return 
         the revealed cards in any order.</p>
       `,
diff --git a/src/aer-data/src/ENG/evolutions/mages.ts b/src/aer-data/src/ENG/evolutions/mages.ts
index 4db489f7..0e1f8a75 100644
--- a/src/aer-data/src/ENG/evolutions/mages.ts
+++ b/src/aer-data/src/ENG/evolutions/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Dorian',
     id: 'Dorian',
     mageTitle: 'Magic Theorist',
-    ability: `
-        <h2>Redesign</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Redesign`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain 3 <span class="aether">&AElig;</span>.<br/>
         The next time you gain a spell this turn,
         prep it to any player's opened breach.
diff --git a/src/aer-data/src/ENG/intoTheWild/mages.ts b/src/aer-data/src/ENG/intoTheWild/mages.ts
index 6cf8dbf4..0fa1e66e 100644
--- a/src/aer-data/src/ENG/intoTheWild/mages.ts
+++ b/src/aer-data/src/ENG/intoTheWild/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Inco',
     id: 'Inco',
     mageTitle: 'Child Of Green',
-    ability: `
-        <h2>Massive Growth</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Massive Growth`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Cast any number of Rose Thorns prepped by any number of players. 
         Those spells deal 2 additional damage.</p>`,
     numberOfCharges: 5,
@@ -33,9 +33,9 @@ export const mages: Mage[] = [
     name: 'Razra',
     id: 'Razra',
     mageTitle: 'The Trainer',
-    ability: `
-        <h2>Train Rip</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Train Rip`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Destroy a card with "Rip" in its name in your hand. 
         Gain a card with "Rip" in its name from the personal upgrade deck 
         that costs 3 <span class="aether">&AElig;</span> more than the destroyed card 
diff --git a/src/aer-data/src/ENG/legacy/mages.ts b/src/aer-data/src/ENG/legacy/mages.ts
index 15b66de0..edc1de02 100644
--- a/src/aer-data/src/ENG/legacy/mages.ts
+++ b/src/aer-data/src/ENG/legacy/mages.ts
@@ -5,7 +5,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Green',
     id: 'LegacyGreen',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Activate during your main phase:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     mageTitle: 'Custom',
     uniqueStarters: [],
@@ -14,7 +16,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Yellow',
     id: 'LegacyYellow',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Activate during your main phase:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
@@ -23,7 +27,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Orange',
     id: 'LegacyOrange',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Activate during your main phase:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
@@ -32,7 +38,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Blue',
     id: 'LegacyBlue',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Activate during your main phase:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
diff --git a/src/aer-data/src/ENG/legacyOfGravehold/mages.ts b/src/aer-data/src/ENG/legacyOfGravehold/mages.ts
index 8b0b2310..5352080c 100644
--- a/src/aer-data/src/ENG/legacyOfGravehold/mages.ts
+++ b/src/aer-data/src/ENG/legacyOfGravehold/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Arachnos',
     id: 'ArachnosLOG',
     mageTitle: 'Void Weaver',
-    ability: `
-      <h2>Weaver's Web</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Weaver's Web`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Return up to three cards that cost 4 <span class="aether">&AElig;</span> or
         less from your discard pile to your hand.
@@ -41,9 +41,9 @@ export const mages: Mage[] = [
     name: 'Claudia',
     id: 'ClaudiaLOG',
     mageTitle: 'Visionary',
-    ability: `
-      <h2>Aetherial Echo</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Aetherial Echo`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Any player gains 3 life.
         <span class="or">OR</span>
@@ -89,9 +89,9 @@ export const mages: Mage[] = [
     name: 'Dezmodia',
     id: 'DezmodiaLOG',
     mageTitle: 'Void Phantom',
-    ability: `
-      <h2>Void Tear</h2>
-      <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Void Tear`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
       <p>
         Return up to two spells from your discard pile to your hand.<br/>
         You may prep two additional spells to each of your opened breaches this turn.
@@ -137,9 +137,9 @@ export const mages: Mage[] = [
     name: 'Gygar',
     id: 'GygarLOG',
     mageTitle: 'Treasure Hunter',
-    ability: `
-      <h2>Contained Burst</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Contained Burst`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast two of your prepped spells without discarding them.
       </p>
@@ -169,9 +169,9 @@ export const mages: Mage[] = [
     name: 'Ilya',
     id: 'IlyaLOG',
     mageTitle: 'Force of Aether',
-    ability: `
-      <h2>Surge of Power</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Surge of Power`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Reveal the top four cards of your deck.
         Place any number of spells revealed this way into you hand.
@@ -219,9 +219,9 @@ export const mages: Mage[] = [
     name: 'Inco',
     id: 'IncoLOG',
     mageTitle: 'Growing Soul',
-    ability: `
-      <h2>Uproot</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Uproot`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Harvest up to two cards in your hand or discard pile.
         Resolve the Harvest effects of these cards twice.
@@ -382,9 +382,9 @@ export const mages: Mage[] = [
     name: 'Indira',
     id: 'IndiraLOG',
     mageTitle: 'Ascended Apprentice',
-    ability: `
-      <h2>Reanimate Magic</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Reanimate Magic`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast up to two spells from your discard pile.
         You may destroy a card in your discard pile.
@@ -415,9 +415,9 @@ export const mages: Mage[] = [
     name: 'Kadir',
     id: 'KadirLOG',
     mageTitle: 'Gemcrafter',
-    ability: `
-      <h2>Refine Prototype</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Refine Prototype`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Either choose a side of a path token that is not on your mat and place it on
         you mat, or flip over one of your path tokens on your mat.
@@ -449,9 +449,9 @@ export const mages: Mage[] = [
     name: 'Kel',
     id: 'KelLOG',
     mageTitle: 'Source of Aether',
-    ability: `
-      <h2>Absorb Aether</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Absorb Aether`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Any ally places up to two cards from their hand or discard pile
         into your discard pile. Then, if you have ten or more card in your discard pile,
@@ -498,9 +498,9 @@ export const mages: Mage[] = [
     name: 'Lost',
     id: 'LostLOG',
     mageTitle: 'Forgotten Forge',
-    ability: `
-      <h2>Encase in Steel</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Encase in Steel`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Deal damage equal to the number of spells in your discard pile.
       </p>
@@ -546,9 +546,9 @@ export const mages: Mage[] = [
     name: 'Malastar',
     id: 'MalastarLOG',
     mageTitle: 'Inventor',
-    ability: `
-      <h2>Burst of Inspiration</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Burst of Inspiration`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Draw a card from the top or bottom of the Inventions deck and place
         it into an ally's hand.
@@ -580,9 +580,9 @@ export const mages: Mage[] = [
     name: 'Mazra',
     id: 'MazraLOG',
     mageTitle: 'The Learned',
-    ability: `
-      <h2>Research</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Research`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Destroy a card with "Mazra" in its name in your hand.
         Gain a card with "Mazra" in its name from the personal upgrade deck
@@ -633,9 +633,9 @@ export const mages: Mage[] = [
     name: 'Nook',
     id: 'NookLOG',
     mageTitle: 'Timeless',
-    ability: `
-      <h2>Time Ripple</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Time Ripple`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Return up to three Crystals from your hand or discard pile
         to the Regularity deck. Place up to three Anomaly cards from the Regularity
@@ -727,9 +727,9 @@ export const mages: Mage[] = [
     name: 'Qu',
     id: 'QuLOG',
     mageTitle: 'Builder',
-    ability: `
-      <h2>Feed the Corruption</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Feed the Corruption`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Any ally draws two cards. Any player destroys up to two cards in hand or discard pile.
       </p>
@@ -770,9 +770,9 @@ export const mages: Mage[] = [
     name: 'Razra',
     id: 'RazraLOG',
     mageTitle: 'The Tamer',
-    ability: `
-      <h2>Train Rip</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Train Rip`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Destroy a card with "Rip" in its name in your hand.
         Gain a card with "Rip" in its name from the personal upgrade deck
@@ -811,9 +811,9 @@ export const mages: Mage[] = [
     name: 'Soskel',
     id: 'SoskelLOG',
     mageTitle: 'Tactician',
-    ability: `
-      <h2>Tactician's Gambit</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Tactician's Gambit`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Players collectively return up to two cards from their discard piles
         to their hands. Reveal the turn order deck and return it in any order.
@@ -859,9 +859,9 @@ export const mages: Mage[] = [
     name: 'Talix',
     id: 'TalixLOG',
     mageTitle: 'Heart of Flame',
-    ability: `
-      <h2>Soaring Ash</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Soaring Ash`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast any number of your prepped Sparks.<br/>
         Those spells deal 2 additional damage.<br/>
@@ -906,9 +906,9 @@ export const mages: Mage[] = [
     name: 'Taqren',
     id: 'TaqrenLOG',
     mageTitle: 'Reignited Guardian',
-    ability: `
-      <h2>Guardian's Strength</h2>
-      <p class="ability-activation">Activate during your turn:</p>
+    abilityName: `Guardian's Strength`,
+    abilityActivation: `Activate during your turn:`,
+    abilityEffect: `
       <p>
         Focus any player's breach or any ally preps a spell
         to one of their opened or closed breaches. Repeat this three times.
@@ -939,9 +939,9 @@ export const mages: Mage[] = [
     name: 'Thraxir',
     id: 'ThraxirLOG',
     mageTitle: 'The Returned',
-    ability: `
-      <h2>Sever Reality</h2>
-      <p class="ability-activation">Activate after the turn order deck is shuffled:</p>
+    abilityName: `Sever Reality`,
+    abilityActivation: `Activate after the turn order deck is shuffled:`,
+    abilityEffect: `
       <p>
         Reveal cards from the top of the turn order deck equal to the number of open breaches you have.
         Return those cards to the top of the turn order deck in any order.
@@ -974,9 +974,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'XaxosLOG',
     mageTitle: 'Reckoner',
-    ability: `
-      <h2>Expand Potential</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Expand Potential`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Look at and gain the top card of the Reckoning deck. Then, place it on top of your deck.
         <span class="or">OR</span>
@@ -1007,9 +1007,9 @@ export const mages: Mage[] = [
     name: 'Yan Magda',
     id: 'YanMagdaLOG',
     mageTitle: 'Recovered Exile',
-    ability: `
-      <h2>Devour Magic</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Devour Magic`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast a spell prepped to an opened Incanted breach three times,
         then reset that breach to its starting position.
diff --git a/src/aer-data/src/ENG/origins/mages.ts b/src/aer-data/src/ENG/origins/mages.ts
index 5803861f..3ab44f24 100644
--- a/src/aer-data/src/ENG/origins/mages.ts
+++ b/src/aer-data/src/ENG/origins/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Kiri and Phoenix',
     id: 'KiriAndPhoenix',
     mageTitle: 'The First Breach Mage',
-    ability: `
-        <h2>Rain Fire</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Rain Fire`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Prep the top card of the Phoenix deck to the Phoenix breach.
         Cast that spell. Repeat this once.</p>`,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/ENG/outcasts/mages.ts b/src/aer-data/src/ENG/outcasts/mages.ts
index 9a8d0840..d7900ccc 100644
--- a/src/aer-data/src/ENG/outcasts/mages.ts
+++ b/src/aer-data/src/ENG/outcasts/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Ilya',
     id: 'Ilya',
     mageTitle: '',
-    ability: `
-      <h2>Life Embrace</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Life Embrace`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast all of your prepped spells without discarding them. 
         Any ally returns a card in their discard pile to their hand.
@@ -82,9 +82,9 @@ export const mages: Mage[] = [
     name: 'Kel',
     id: 'Kel',
     mageTitle: '',
-    ability: `
-      <h2>Soul Invigoration</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Soul Invigoration`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Return up to two gems or relics you played this turn to your hand. 
         Any ally draws a card and may prep a spell in hand to an opened or closed breach.
@@ -158,9 +158,9 @@ export const mages: Mage[] = [
     name: "Z'hana",
     id: 'ZhanaO',
     mageTitle: '',
-    ability: `
-      <h2>Inscribe</h2>
-      <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Inscribe`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
       <p>
         Gravehold gains 5 life. Place two glyph tokens on top of any card in the supply.
       </p>
@@ -205,9 +205,9 @@ export const mages: Mage[] = [
     name: 'Taqren',
     id: 'TaqrenO',
     mageTitle: '',
-    ability: `
-      <h2>Sustain</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Sustain`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         If you are not exhausted, gain 3 life.<br />
         Otherwise, Gravehold gains 3 life.
@@ -237,9 +237,9 @@ export const mages: Mage[] = [
     name: 'Qu',
     id: 'QuO',
     mageTitle: '',
-    ability: `
-      <h2>Combust Aether</h2>
-      <p class="ability-activation">Activate at the end of your draw phase:</p>
+    abilityName: `Combust Aether`,
+    abilityActivation: `Activate at the end of your draw phase:`,
+    abilityEffect: `
       <p>
         Draw three cards.
       </p>
@@ -269,9 +269,9 @@ export const mages: Mage[] = [
     name: 'Thraxir',
     id: 'Thraxir',
     mageTitle: '',
-    ability: `
-      <h2>Shackles Unleashed</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Shackles Unleashed`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast up to three spells prepped by any players. If you have three opened breaches, 
         those spells deal 1 additional damage. If you have four opened breaches, 
@@ -303,9 +303,9 @@ export const mages: Mage[] = [
     name: 'Dezmodia',
     id: 'DezmodiaO',
     mageTitle: '',
-    ability: `
-      <h2>Void Vortex</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Void Vortex`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Any ally draws three cards. Then, place any number of cards in your hand into their hand. 
         Then, that ally places the same number of cards in their hand into your hand.
@@ -335,9 +335,9 @@ export const mages: Mage[] = [
     name: 'Arachnos',
     id: 'Arachnos',
     mageTitle: '',
-    ability: `
-      <h2>Expunge</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Expunge`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Cast any player's prepped spell. That spell deals 3 additional damage.
       </p>
diff --git a/src/aer-data/src/ENG/outerDark/mages.ts b/src/aer-data/src/ENG/outerDark/mages.ts
index f1966fde..1aa269d3 100644
--- a/src/aer-data/src/ENG/outerDark/mages.ts
+++ b/src/aer-data/src/ENG/outerDark/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Indira',
     id: 'Indira',
     mageTitle: 'Breach Apprentice',
-    ability: `
-        <h2>Pyromancer's Guile</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Pyromancer's Guile`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Cast any number of spells in hand. Those spells each 
         deal 1 additional damage.</p>
         <p>You may destroy a card in your discard pile.</p>
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Remnant',
     id: 'Remnant',
     mageTitle: 'Aethereal Entity',
-    ability: `
-        <h2>Ephemera Masque</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Ephemera Masque`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Any ally returns two cards in their discard pile to their hand.
         <span class="or">OR</span>
         Gravehold gains 5 life.</p>
diff --git a/src/aer-data/src/ENG/pastAndFuture/mages.ts b/src/aer-data/src/ENG/pastAndFuture/mages.ts
index 3333693e..2e8792ce 100644
--- a/src/aer-data/src/ENG/pastAndFuture/mages.ts
+++ b/src/aer-data/src/ENG/pastAndFuture/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Auren',
     id: 'Auren',
     mageTitle: 'Mechanic',
-    ability: `
-        <h2>Execute Program</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Execute Program`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Cast any number of spells prepped to breaches with relics attached to them without discarding those spells.</p>`,
     numberOfCharges: 5,
     uniqueStarters: [
@@ -60,9 +60,9 @@ export const mages: Mage[] = [
     name: 'Willow',
     id: 'Willow',
     mageTitle: 'Neophyte',
-    ability: `
-        <h2>Flash of Genius</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Flash of Genius`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain 5 Knowledge Cards you gain this turn may be placed on top of your deck.
         <span class="or">OR</span>
         Gravehold gains 5 life</p>`,
@@ -97,9 +97,9 @@ export const mages: Mage[] = [
     name: 'Ona',
     id: 'Ona',
     mageTitle: 'Wraithtouched Elder',
-    ability: `
-        <h2>Building Power</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Building Power`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Cast one of your prepped spells without discarding it.
         Then, resolve all effects on cards in the ability zone in any order.</p>`,
     numberOfCharges: 4,
@@ -145,9 +145,9 @@ export const mages: Mage[] = [
     name: 'Nadea',
     id: 'Nadea',
     mageTitle: 'Town Guard',
-    ability: `
-        <h2>Wall Off</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Wall Off`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Any player gains 3 life.<br/>
         If you have five or more cards that cost more than 0 <span class="aether">&AElig;</span> in your discard pile, any ally gains a spell and places it into their hand.</p>`,
     numberOfCharges: 5,
@@ -180,9 +180,9 @@ export const mages: Mage[] = [
     name: 'Kavoc',
     id: 'Kavoc',
     mageTitle: 'Breach Scholar',
-    ability: `
-        <h2>Experiment</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Experiment`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Any ally draws two cards. Gain 3 Knowledge.</p>`,
     numberOfCharges: 4,
     uniqueStarters: [
@@ -224,9 +224,9 @@ export const mages: Mage[] = [
     name: 'Bayli',
     id: 'Bayli',
     mageTitle: 'Beacon',
-    ability: `
-        <h2>Fusion Reaction</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Fusion Reaction`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Return up to two spells from your discard pile to your hand.
         Choose up to two of your prepped spells. Cast those spells.
         Then, cast one of your prepped spells.</p>`,
@@ -250,9 +250,9 @@ export const mages: Mage[] = [
     name: 'Shoshana',
     id: 'Shoshana',
     mageTitle: 'Ultimate Tether',
-    ability: `
-        <h2>Redirect Flow</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Redirect Flow`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>After the end of your turn, before another card is drawn from the turn order deck, your Tether takes a turn.</p>`,
     numberOfCharges: 6,
     uniqueStarters: [
@@ -286,9 +286,9 @@ export const mages: Mage[] = [
     name: 'Rhys',
     id: 'Rhys',
     mageTitle: 'Artificial Breach Mage',
-    ability: `
-        <h2>Loop Data</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Loop Data`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain up to two spells from the supply that cost 5 <span class="aether">&AElig;</span> or less.
         You may place up to two spells from your discard pile into your hand.</p>`,
     numberOfCharges: 6,
@@ -312,9 +312,9 @@ export const mages: Mage[] = [
     name: 'Naftir',
     id: 'Naftir',
     mageTitle: 'Void Inheritor',
-    ability: `
-        <h2>Amplify</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Amplify`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Place a Link token on any opened breach.
         <span class="or">OR</span>
         Cast all the spells prepped to one breach with a Link token on it.</p>`,
@@ -337,9 +337,9 @@ export const mages: Mage[] = [
     name: 'Lilly',
     id: 'Lilly',
     mageTitle: 'Beast Master',
-    ability: `
-        <h2>Pack Tactics</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Pack Tactics`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Return up to two minions from your discard pile to your hand. you may prep up to two spells to each of your opened breaches this turn.
         <span class="or">OR</span>
         Deal 3 damage to a minion. If you defeat a minion from the nemesis deck this way, place it into your discard pile.</p>`,
diff --git a/src/aer-data/src/ENG/returnToGravehold/mages.ts b/src/aer-data/src/ENG/returnToGravehold/mages.ts
index 8ea48443..81c3edcd 100644
--- a/src/aer-data/src/ENG/returnToGravehold/mages.ts
+++ b/src/aer-data/src/ENG/returnToGravehold/mages.ts
@@ -7,9 +7,9 @@ export const mages: Mage[] = [
     id: 'OhatAndUlgimor',
     aliases: ['Ulgimor'],
     mageTitle: '',
-    ability: `
-      <h2>Enrapture</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Enrapture`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Ohat mode: Suffer 2 damage. Any ally draws five cards and discards two cards in hand.<br />
         Ulgimor mode: Cast a spell prepped to Ulgimor's IV breach without discarding it.
@@ -41,9 +41,9 @@ export const mages: Mage[] = [
     name: 'Cairna',
     id: 'Cairna',
     mageTitle: '',
-    ability: `
-      <h2>Energize</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Energize`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Gain a spell that costs 5 <span class="aether">&AElig;</span> or less from a supply pile. 
         You may lose two charges to gain any spell from a supply pile instead. You may 
diff --git a/src/aer-data/src/ENG/shatteredDreams/mages.ts b/src/aer-data/src/ENG/shatteredDreams/mages.ts
index 446e63e9..a7c54107 100644
--- a/src/aer-data/src/ENG/shatteredDreams/mages.ts
+++ b/src/aer-data/src/ENG/shatteredDreams/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Nook',
     id: 'Nook',
     mageTitle: 'Orb Caller',
-    ability: `
-        <h2>Condense Aether</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Condense Aether`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>You my destroy a card in your hand or discard pile.
         Gain 4 <span class="aether">&AElig;</span>.<br/>
         You may place the next spell you gain this turn into your hand.</p>`,
diff --git a/src/aer-data/src/ENG/southernVillage/mages.ts b/src/aer-data/src/ENG/southernVillage/mages.ts
index c9d2e22f..e5133d2b 100644
--- a/src/aer-data/src/ENG/southernVillage/mages.ts
+++ b/src/aer-data/src/ENG/southernVillage/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Lucien',
     id: 'Lucien',
     mageTitle: '',
-    ability: `
-      <h2>Magnetism</h2>
-      <p class="ability-activation">Activate during your casting phase:</p>
+    abilityName: `Magnetism`,
+    abilityActivation: `Activate during your casting phase:`,
+    abilityEffect: `
       <p>
         Open all of your breaches. Prep any number of spells in hand to your opened breaches.
       </p>
@@ -38,9 +38,9 @@ export const mages: Mage[] = [
     name: 'Reth',
     id: 'Reth',
     mageTitle: '',
-    ability: `
-      <h2>Missing Half</h2>
-      <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Missing Half`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
       <p>
         Reveal your deck. Place up to two spells with the same name from your deck into 
         your hand, and up to two spells with that same name from your discard into 
diff --git a/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts b/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts
index f33f1bcf..58adee0b 100644
--- a/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts
+++ b/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Kain',
     id: 'Kain',
     mageTitle: 'The Dancer',
-    ability: `
-        <h2>Voild Waltz</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Voild Waltz`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>If Gravehold has 15 life or more, Gravehold
 		suffers 2 damage and any player gains 6 <span class="aether">&AElig;</span>
 		tokens. Otherwise, Gravehold gains 5 life.</p>`,
diff --git a/src/aer-data/src/ENG/theAbyss/mages.ts b/src/aer-data/src/ENG/theAbyss/mages.ts
index bc6fa8c3..c00c0b59 100644
--- a/src/aer-data/src/ENG/theAbyss/mages.ts
+++ b/src/aer-data/src/ENG/theAbyss/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'XaxosAB',
     mageTitle: 'The Fledgeling',
-    ability: `
-        <h2>Leech Power</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Leech Power`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain 3 <span class="aether">&AElig;</span>. You may place any cards
 		you gain this turn into your hand.<br/>
 		You may place a nemesis turn order card in the
diff --git a/src/aer-data/src/ENG/theAncients/mages.ts b/src/aer-data/src/ENG/theAncients/mages.ts
index 78d019a0..830e3124 100644
--- a/src/aer-data/src/ENG/theAncients/mages.ts
+++ b/src/aer-data/src/ENG/theAncients/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Mazra',
     id: 'Mazra',
     mageTitle: 'The Reader',
-    ability: `
-        <h2>Research</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Research`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Destroy a card with "Mazra" in its name in your hand. 
         Gain a card with "Mazra" in its name from the personal upgrade deck 
         that costs 3 <span class="aether">&AElig;</span> more than the destroyed card 
@@ -37,9 +37,9 @@ export const mages: Mage[] = [
     name: 'Qu',
     id: 'Qu',
     mageTitle: 'Builder And Destroyer',
-    ability: `
-        <h2>Duality Embrace</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Duality Embrace`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>If you are in Destroyer form, cast up to two different spells prepped 
         by any number of players, and then flip over the Form token. 
         Otherwise, any player preps up to two spells in their discard pile 
diff --git a/src/aer-data/src/ENG/theCaverns/mages.ts b/src/aer-data/src/ENG/theCaverns/mages.ts
index 14b7404b..99820a25 100644
--- a/src/aer-data/src/ENG/theCaverns/mages.ts
+++ b/src/aer-data/src/ENG/theCaverns/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Quilius',
     id: 'QuiliusTC',
     mageTitle: 'The Initiate',
-    ability: `
-        <h2>Acquire Target</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Acquire Target`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Place the top card of the Challenger deck on top of
 		the nemesis deck. Then, resolve any effects added
 		to your ability by minions in your ability zone.</p>`,
@@ -35,9 +35,9 @@ export const mages: Mage[] = [
     name: 'Alcheia',
     id: 'Alcheia',
     mageTitle: 'The Stonecarver',
-    ability: `
-        <h2>Restabilize</h2>
-        <p class="ability-activation">Activate during any ally's casting phase:</p>
+    abilityName: `Restabilize`,
+    abilityActivation: `Activate during any ally's casting phase:`,
+    abilityEffect: `
         <p>Destroy up to three cards in hand. Draw
 		a card for each card destroyed this way.<br/>
 		<span class="or">OR</span><br/>
diff --git a/src/aer-data/src/ENG/theDepths/mages.ts b/src/aer-data/src/ENG/theDepths/mages.ts
index ff8803f9..3bed3539 100644
--- a/src/aer-data/src/ENG/theDepths/mages.ts
+++ b/src/aer-data/src/ENG/theDepths/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Nym',
     id: 'Nym',
     mageTitle: 'Breach Mage Apprentice',
-    ability: `
-        <h2>Terminus Barrier</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Terminus Barrier`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Discard the top card of the nemesis deck.</p>
         <p>If you discarded an attack card, discard an additional card.</p>
       `,
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Reeve',
     id: 'Reeve',
     mageTitle: 'Breach Mage Elite',
-    ability: `
-        <h2>Quelling Blade</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Quelling Blade`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Deal 5 damage to a minion.</p>
         <p>Deal 3 damage to a different minion.</p>
       `,
@@ -65,9 +65,9 @@ export const mages: Mage[] = [
     name: "Z'hana",
     id: 'Zhana',
     mageTitle: 'Breach Mage Renegade',
-    ability: `
-        <h2>Sanctum Glyph</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Sanctum Glyph`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gravehold gains 7 life.</p>
       `,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/ENG/theDescent/mages.ts b/src/aer-data/src/ENG/theDescent/mages.ts
index 95cf64c8..20d934fc 100644
--- a/src/aer-data/src/ENG/theDescent/mages.ts
+++ b/src/aer-data/src/ENG/theDescent/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Brama',
     id: 'BramaATD',
     mageTitle: 'The Leader',
-    ability: `
-        <h2>Regenerate</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Regenerate`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
         <p>Gain 4 life.<br/>
         You may suffer 2 damage. If you do, Gravehold gains 4 life.</p>`,
     numberOfCharges: 5,
@@ -42,9 +42,9 @@ export const mages: Mage[] = [
     name: 'Janti',
     id: 'Janti',
     mageTitle: 'The Breachspeaker',
-    ability: `
-        <h2>Interlace</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Interlace`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain the top card of the Infusion dek and place it into your hand.
         <span class="or">OR</span>
         Destroy an Infusion in play. If you do, deal 8 damage.</p>`,
@@ -68,9 +68,9 @@ export const mages: Mage[] = [
     name: 'Leisan',
     id: 'Leisan',
     mageTitle: 'The Huntress',
-    ability: `
-        <h2>Manifest Monstrosity</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Manifest Monstrosity`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Place the Manifest token on your player mat so it covers this ability
         and resolve its &ldquo;<b>IMMEDIATELY</b>&rdquo; effects.
         You cannot activate this ability again this game.</p>`,
@@ -95,9 +95,9 @@ export const mages: Mage[] = [
     name: 'Mazahaedron',
     id: 'MazahaedronATD',
     mageTitle: 'The Monk',
-    ability: `
-        <h2>Mantra of Earth</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Mantra of Earth`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
         <p>Gain a card that costs 4 <span class="aether">&AElig;</span>
         or less from any supply pile. Any ally gains a destiny token.
         <span class="or">OR</span>
@@ -125,9 +125,9 @@ export const mages: Mage[] = [
     name: 'Raven',
     id: 'Raven',
     mageTitle: 'The Lone Survivor',
-    ability: `
-        <h2>Exhume</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Exhume`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain 4 knowledge. Reveal the top three cards of the Forgotten Ritual deck.
         You may gain any number of the revealed cards by paying their cost using Knowledge.
         Place the gained cards into your hand. Place the rest on the bottom of the Forgotten Ritual deck.</p>`,
@@ -163,9 +163,9 @@ export const mages: Mage[] = [
     name: 'Thraxir',
     id: 'ThraxirATD',
     mageTitle: 'The Commander',
-    ability: `
-        <h2>Reality Warp</h2>
-        <p class="ability-activation">Activate during any player's main phase:</p>
+    abilityName: `Reality Warp`,
+    abilityActivation: `Activate during any player's main phase:`,
+    abilityEffect: `
         <p>That player focuses a breach. Then, you gain a card from the supply that
         costs up to twice the focus cost of their opened breach with the highest focus cost.
         <span class="or">OR</span>
diff --git a/src/aer-data/src/ENG/theNameless/mages.ts b/src/aer-data/src/ENG/theNameless/mages.ts
index fc8b5b00..84e18220 100644
--- a/src/aer-data/src/ENG/theNameless/mages.ts
+++ b/src/aer-data/src/ENG/theNameless/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Malastar',
     id: 'Malastar',
     mageTitle: 'Breach Mage Mentor',
-    ability: `
-        <h2>Gift Of Aether</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Gift Of Aether`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain a spell from any supply pile. You may prep that spell to 
         any player's opened breach.</p>
       `,
diff --git a/src/aer-data/src/ENG/theNewAge/mages.ts b/src/aer-data/src/ENG/theNewAge/mages.ts
index 14af795a..f576acb0 100644
--- a/src/aer-data/src/ENG/theNewAge/mages.ts
+++ b/src/aer-data/src/ENG/theNewAge/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Sahala',
     id: 'Sahala',
     mageTitle: 'Oracle',
-    ability: `
-        <h2>Star Bind</h2>
-        <p class="ability-activation">Activate during your casting or main phase:</p>
+    abilityName: `Star Bind`,
+    abilityActivation: `Activate during your casting or main phase:`,
+    abilityEffect: `
         <p>Reveal the top three cards of your deck. 
         Place a spell revealed this way into your hand. 
         If there are no spells prepped to your Celestial Breach, 
@@ -34,9 +34,9 @@ export const mages: Mage[] = [
     name: 'Gygar',
     id: 'Gygar',
     mageTitle: 'Tide Master',
-    ability: `
-        <h2>High Tide</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `High Tide`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Place a Surge token on your Ancient Breach.
         <span class="or">OR</span>
         Cast a spell prepped to your Ancient Breach. Gain 2 charges.</p>`,
@@ -59,9 +59,9 @@ export const mages: Mage[] = [
     name: 'Soskel',
     id: 'Soskel',
     mageTitle: 'Aristocrat',
-    ability: `
-        <h2>Energized Sigil</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Energized Sigil`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Place an Energize token on any player's breach that doesn't have one.
         <span class="or">OR</span>
         Discard an Energize token on any player's breach. 
@@ -86,9 +86,9 @@ export const mages: Mage[] = [
     name: 'Taqren',
     id: 'Taqren',
     mageTitle: 'The Shield',
-    ability: `
-        <h2>Breach Siphon</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Breach Siphon`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Focus any player's breach. 
         Any player gains 1 life for each opened breach you have.</p>`,
     numberOfCharges: 4,
@@ -112,9 +112,9 @@ export const mages: Mage[] = [
     name: 'Talix',
     id: 'Talix',
     mageTitle: 'The Chain',
-    ability: `
-        <h2>Soaring Ash</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Soaring Ash`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Destroy two sparks in hand. If you do, 
         shuffle your turn order card into the turn order deck.
         <span class="or">OR</span>
@@ -141,9 +141,9 @@ export const mages: Mage[] = [
     name: 'Rhia',
     id: 'Rhia',
     mageTitle: 'Relic Hunter',
-    ability: `
-        <h2>Sublimate</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Sublimate`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Return a card in your hand or discard pile to its supply pile. 
         If you returned a relic, gain a card from any supply pile 
         that costs up to 3 <span class="aether">&AElig;</span> more than the returned card. 
@@ -170,9 +170,9 @@ export const mages: Mage[] = [
     name: 'Claudia',
     id: 'Claudia',
     mageTitle: 'Prospector',
-    ability: `
-        <h2>Aeplosion</h2>
-        <p class="ability-activation">Activate during any ally's main phase:</p>
+    abilityName: `Aeplosion`,
+    abilityActivation: `Activate during any ally's main phase:`,
+    abilityEffect: `
         <p>That ally gains 2 <span class="aether">&AElig;</span>. The next time that ally 
         gains a card from a supply pile this turn, 
         you gain a copy of that card from that supply pile.
@@ -199,9 +199,9 @@ export const mages: Mage[] = [
     name: 'Lost',
     id: 'Lost',
     mageTitle: 'Living Forge',
-    ability: `
-        <h2>Meek's Might</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Meek's Might`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Return up to four cards that cost 0 <span class="aether">&AElig;</span> 
         in your discard pile to your hand.</p>`,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/ENG/theVoid/mages.ts b/src/aer-data/src/ENG/theVoid/mages.ts
index 14070dba..8c601fb9 100644
--- a/src/aer-data/src/ENG/theVoid/mages.ts
+++ b/src/aer-data/src/ENG/theVoid/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Sparrow',
     id: 'Sparrow',
     mageTitle: 'Breach Mage Soldier',
-    ability: `
-        <h2>Eldritch Tether</h2>
-        <p class="ability-activation">Activate during your casting or main phase:</p>
+    abilityName: `Eldritch Tether`,
+    abilityActivation: `Activate during your casting or main phase:`,
+    abilityEffect: `
         <p>Focus any player's breach. Repeat this three additional times.
         <span class="or">OR</span>
         Any ally with no closed breaches draws three cards and then 
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'XaxosTV',
     mageTitle: 'Voidbringer',
-    ability: `
-        <h2>Praetorian Halo</h2>
-        <p class="ability-activation">Activate during your casting or main phase:</p>
+    abilityName: `Praetorian Halo`,
+    abilityActivation: `Activate during your casting or main phase:`,
+    abilityEffect: `
         <p>Any ally gains 1 charge and discards a random card in hand. Focus 
         one of your breaches. Gain 1 life. Destroy a card in your hand or 
         discard pile.</p>`,
diff --git a/src/aer-data/src/ENG/warEternal/mages.ts b/src/aer-data/src/ENG/warEternal/mages.ts
index cea47ff5..5725e9c7 100644
--- a/src/aer-data/src/ENG/warEternal/mages.ts
+++ b/src/aer-data/src/ENG/warEternal/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Dezmodia',
     id: 'Dezmodia',
     mageTitle: 'Voidborn Prodigy',
-    ability: `
-        <h2>Tempest Sigil</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Tempest Sigil`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Any player destroys an opened I or II breach and 
         returns any spells prepped to that breach to their hand. 
         That player gains a Sigil breach and places it where the destroyed 
@@ -37,9 +37,9 @@ export const mages: Mage[] = [
     name: 'Garu',
     id: 'Garu',
     mageTitle: 'Oathsworn Protector',
-    ability: `
-        <h2>Colossal Force</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Colossal Force`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Discard up to four of your prepped spells.</p>
         <p>Deal 2 damage plus 4 additional damage for each spell you 
         discarded divided however you choose to the nemesis or any 
@@ -68,9 +68,9 @@ export const mages: Mage[] = [
     name: 'Gex',
     id: 'Gex',
     mageTitle: 'Breach Mage Adviser',
-    ability: `
-        <h2>Vimcraft Oath</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Vimcraft Oath`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Destroy up to two cards in your discard pile that cost 
         0 <span class="aether">&AElig;</span>.</p>
         <p>Any ally draws one card and gains 2 life.</p>`,
@@ -97,9 +97,9 @@ export const mages: Mage[] = [
     name: 'Mazahaedron',
     id: 'Mazahaedron',
     mageTitle: 'Henge Mystic',
-    ability: `
-        <h2>Underearth Mantra</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Underearth Mantra`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>You may gain a gem that costs 4 <span class="aether">&AElig;</span> or 
         less from any supply pile.</p>
         <p>Gravehold gains 4 life.</p>`,
@@ -129,9 +129,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'MistWE',
     mageTitle: 'Voidwalker',
-    ability: `
-        <h2>Exalted Brand</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Exalted Brand`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Cast up to three different spells prepped by any number of players. 
         For each spell cast this way, place that spell into any ally's hand.</p>`,
     numberOfCharges: 6,
@@ -158,9 +158,9 @@ export const mages: Mage[] = [
     name: 'Quilius',
     id: 'Quilius',
     mageTitle: 'Breach Mage Assassin',
-    ability: `
-        <h2>Quietus Vow</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Quietus Vow`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Deal 2 damage for each Trophy token you have.</p>`,
     numberOfCharges: 5,
     uniqueStarters: [
@@ -186,9 +186,9 @@ export const mages: Mage[] = [
     name: 'Ulgimor',
     id: 'Ulgimor',
     mageTitle: 'Shadowkin Beast',
-    ability: `
-        <h2>Eidolon Shroud</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Eidolon Shroud`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain 6 life.</p>
         <p>If you are exhausted, any ally gains 5 life instead.</p>`,
     numberOfCharges: 6,
@@ -215,9 +215,9 @@ export const mages: Mage[] = [
     name: 'Yan Magda',
     id: 'YanMagda',
     mageTitle: 'Enlightened Exile',
-    ability: `
-        <h2>Imperium Ritual</h2>
-        <p class="ability-activation">Activate during your main phase:</p>
+    abilityName: `Imperium Ritual`,
+    abilityActivation: `Activate during your main phase:`,
+    abilityEffect: `
         <p>Gain a card from any supply pile. If you have four 
         opened breaches, any ally gains a card from any supply pile and 
         places it on top of their deck.</p>`,
diff --git a/src/aer-data/src/FR/aeonsEnd/mages.ts b/src/aer-data/src/FR/aeonsEnd/mages.ts
index e5cfb34f..0db895a0 100644
--- a/src/aer-data/src/FR/aeonsEnd/mages.ts
+++ b/src/aer-data/src/FR/aeonsEnd/mages.ts
@@ -6,8 +6,9 @@ export const mages: Mage[] = [
     name: 'Adelheim',
     id: 'Adelheim',
     mageTitle: 'Armurier',
-    ability:
-      '<h2>Gardien étherien</h2>\n<p class="ability-activation">S\'active durant la phase de pioche de la némésis :</p>\n<p>Après qu\'une carte Attaque ou Pouvoir a été piochée, mais avant qu\'elle soit résolue, vous pouvez la défausser sans appliquer son effet.\n<span class="hint">La némésis ne pioche pas de nouvelle carte à la place</span></p>',
+    abilityName: 'Gardien étherien',
+    abilityActivation: 'S\'active durant la phase de pioche de la némésis :',
+    abilityEffect: '<p>Après qu\'une carte Attaque ou Pouvoir a été piochée, mais avant qu\'elle soit résolue, vous pouvez la défausser sans appliquer son effet.\n<span class="hint">La némésis ne pioche pas de nouvelle carte à la place</span></p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -27,8 +28,9 @@ export const mages: Mage[] = [
     name: 'Brama',
     id: 'Brama',
     mageTitle: 'Ancienne',
-    ability:
-      '<h2>Siphon de la bordure</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Un joueur gagne 4 Vie.</p>',
+    abilityName: 'Siphon de la bordure',
+    abilityActivation: 'S\'active durant votre phase principale :',
+    abilityEffect: '<p>Un joueur gagne 4 Vie.</p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -48,8 +50,9 @@ export const mages: Mage[] = [
     name: 'Jian',
     id: 'Jian',
     mageTitle: 'Orpheline',
-    ability:
-      '<h2>Miroir noir</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Lancez le sort préparer d\'un joueur sans le défausser. Puis lancer ce sort à nouveau.\n<span class="hint">Défaussez-le ensuite.</span></p>',
+    abilityName: 'Miroir noir',
+    abilityActivation: 'S\'active durant votre phase principale :',
+    abilityEffect: '<p>Lancez le sort préparer d\'un joueur sans le défausser. Puis lancer ce sort à nouveau.\n<span class="hint">Défaussez-le ensuite.</span></p>',
     numberOfCharges: 4,
     uniqueStarters: [
       {
@@ -69,8 +72,9 @@ export const mages: Mage[] = [
     name: 'Kadir',
     id: 'Kadir',
     mageTitle: 'Chercheuse',
-    ability:
-      "<h2>Porte vers l'autre-monde</h2>\n<p class=\"ability-activation\">S'active durant la phase principale d'un joueur :</p>\n<p>Ce joueur peut reprendre en main jusqu'à trois sorts de sa défausse. Durant ce tour, ce joueur peut préparer jusqu'à deux sorts sur chacune de ses brèches ouvertes.</p>",
+    abilityName: "Porte vers l'autre-monde",
+    abilityActivation: "S'active durant la phase principale d'un joueur :",
+    abilityEffect: "<p>Ce joueur peut reprendre en main jusqu'à trois sorts de sa défausse. Durant ce tour, ce joueur peut préparer jusqu'à deux sorts sur chacune de ses brèches ouvertes.</p>",
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -90,8 +94,9 @@ export const mages: Mage[] = [
     name: 'Lash',
     id: 'Lash',
     mageTitle: 'Éclaireur',
-    ability:
-      '<h2>Accélération mentale</h2>\n<p class="ability-activation">S\'active durant la phase principale d\'un joueur :</p>\n<p>Mélangez la carte Ordre du tour d\'un joueur dans le paquet d\'ordre du tour. Ce joueur subit 1 dégât.\n<span class="hint">Vous ne pouvez pas choisir la carte Ordre du jour Joker.</span></p>',
+    abilityName: 'Accélération mentale',
+    abilityActivation: 'S\'active durant la phase principale d\'un joueur :',
+    abilityEffect: '<p>Mélangez la carte Ordre du tour d\'un joueur dans le paquet d\'ordre du tour. Ce joueur subit 1 dégât.\n<span class="hint">Vous ne pouvez pas choisir la carte Ordre du jour Joker.</span></p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -111,8 +116,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'Mist',
     mageTitle: 'Capitaine de la dague',
-    ability:
-      '<h2>Prédiciton divine</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Un allié pioche quatre cartes.</p>',
+    abilityName: 'Prédiciton divine',
+    abilityActivation: 'S\'active durant votre phase principale :',
+    abilityEffect: '<p>Un allié pioche quatre cartes.</p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -132,8 +138,9 @@ export const mages: Mage[] = [
     name: 'Phaedraxa',
     id: 'Phaedraxa',
     mageTitle: 'Voyante',
-    ability:
-      '<h2>Rune des oracles</h2>\n<p class="ability-activation">S\'active au moment où une carte Ordre du tour est révélée :</p>\n<p>Tous les dégâts que les joueurs ou Gravehold devraient subir ce tour-ci sont annulés.</p>',
+    abilityName: 'Rune des oracles',
+    abilityActivation: 'S\'active au moment où une carte Ordre du tour est révélée :',
+    abilityEffect: '<p>Tous les dégâts que les joueurs ou Gravehold devraient subir ce tour-ci sont annulés.</p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -153,8 +160,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'Xaxos',
     mageTitle: 'Adepte',
-    ability:
-      "<h2>Lien métaphysique</h2>\n<p class=\"ability-activation\">S'active durant la phase principale d'un joueur :</p>\n<p>Les alliés reçoivent collectivement 4 charges. Révélez puis replacez les cartes de la pioche d'Ordre du tour dans l'ordre de votre choix.</p>",
+    abilityName: "Lien métaphysique",
+    abilityActivation: "S'active durant la phase principale d'un joueur :",
+    abilityEffect: "<p>Les alliés reçoivent collectivement 4 charges. Révélez puis replacez les cartes de la pioche d'Ordre du tour dans l'ordre de votre choix.</p>",
     numberOfCharges: 5,
     uniqueStarters: [
       {
diff --git a/src/aer-data/src/FR/outerDark/mages.ts b/src/aer-data/src/FR/outerDark/mages.ts
index cd414185..d0275050 100644
--- a/src/aer-data/src/FR/outerDark/mages.ts
+++ b/src/aer-data/src/FR/outerDark/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Indira',
     id: 'Indira',
     mageTitle: 'Apprentie de la Brèche',
-    ability: `
-        <h2>Ruse du pyromancien</h2>
-        <p class="ability-activation">S'active durant votre phase principale:</p>
+    abilityName: `Ruse du pyromancien`,
+    abilityActivation: `S'active durant votre phase principale:`,
+    abilityEffect: `
         <p>Lancez autant de sorts que vous le voulez de votre main. Chacun de 
 		ces sorts inflige 1 de dégât supplémentaire.</p>
         <p>Vous pouvez détuire une carte de votre défausse.</p>
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Vestige',
     id: 'Remnant',
     mageTitle: 'Entité Étherienne',
-    ability: `
-        <h2>Masque éphémère</h2>
-        <p class="ability-activation">S'active durant votre phase principale:</p>
+    abilityName: `Masque éphémère`,
+    abilityActivation: `S'active durant votre phase principale:`,
+    abilityEffect: `
         <p>Un allié choisit deux cartes de sa défausse qu'il reprend en main.
         <span class="or">OU</span>
         Gravehold gagne 5 Vie.</p>
diff --git a/src/aer-data/src/FR/theDepths/mages.ts b/src/aer-data/src/FR/theDepths/mages.ts
index f91cf562..df0dfc03 100644
--- a/src/aer-data/src/FR/theDepths/mages.ts
+++ b/src/aer-data/src/FR/theDepths/mages.ts
@@ -6,8 +6,9 @@ export const mages: Mage[] = [
     name: 'Nym',
     id: 'Nym',
     mageTitle: 'Apprenti',
-    ability:
-      '<h2>Barrière définitive</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Défaussez la première carte de la pioche Némésis\n<span class="hint">S\'il s\'agit d\'une carte Attaque, défaussez une carte supplémentaire de la pioche Némésis</span></p>',
+    abilityName: 'Barrière définitive',
+    abilityActivation: 'S\'active durant votre phase principale :',
+    abilityEffect: '<p>Défaussez la première carte de la pioche Némésis\n<span class="hint">S\'il s\'agit d\'une carte Attaque, défaussez une carte supplémentaire de la pioche Némésis</span></p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
@@ -27,8 +28,9 @@ export const mages: Mage[] = [
     name: 'Reeve',
     id: 'Reeve',
     mageTitle: "Mage de la Brèche d'élite",
-    ability:
-      '<h2>Lame de répression</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Infligez 5 dégâts à un serviteur\n<span class="hint">Infligez 3 dégâts à un autre serviteur</span></p>',
+    abilityName: 'Lame de répression',
+    abilityActivation: 'S\'active durant votre phase principale :',
+    abilityEffect: '<p>Infligez 5 dégâts à un serviteur\n<span class="hint">Infligez 3 dégâts à un autre serviteur</span></p>',
     numberOfCharges: 4,
     uniqueStarters: [
       {
@@ -48,8 +50,9 @@ export const mages: Mage[] = [
     name: "Z'hana",
     id: 'Zhana',
     mageTitle: 'Renégate',
-    ability:
-      '<h2>Glyphe du Sanctum</h2>\n<p class="ability-activation">S\'active durant votre phase principale :</p>\n<p>Gravehold gagne 7 points de vie</p>',
+    abilityName: 'Glyphe du Sanctum',
+    abilityActivation: 'S\'active durant votre phase principale :',
+    abilityEffect: '<p>Gravehold gagne 7 points de vie</p>',
     numberOfCharges: 5,
     uniqueStarters: [
       {
diff --git a/src/aer-data/src/FR/theNameless/mages.ts b/src/aer-data/src/FR/theNameless/mages.ts
index 62d4a79b..9c2e4d67 100644
--- a/src/aer-data/src/FR/theNameless/mages.ts
+++ b/src/aer-data/src/FR/theNameless/mages.ts
@@ -6,8 +6,9 @@ export const mages: Mage[] = [
     name: 'Malastar',
     id: 'Malastar',
     mageTitle: 'Mentor',
-    ability:
-      "<h2>Don de l'éther</h2>\n<p class=\"ability-activation\">S'active durant votre phase principale :</p>\n<p>Gagnez un sort de n'importe quelle pile de la réserve. Vous pouvez préparer ce sort sur une brèche ouverte de n'importe quel joueur.</p>",
+    abilityName: "Don de l'éther",
+    abilityActivation: "S'active durant votre phase principale :",
+    abilityEffect: "<p>Gagnez un sort de n'importe quelle pile de la réserve. Vous pouvez préparer ce sort sur une brèche ouverte de n'importe quel joueur.</p>",
     numberOfCharges: 6,
     uniqueStarters: [
       {
diff --git a/src/aer-data/src/FR/theVoid/mages.ts b/src/aer-data/src/FR/theVoid/mages.ts
index 4d330682..cc2cd62f 100644
--- a/src/aer-data/src/FR/theVoid/mages.ts
+++ b/src/aer-data/src/FR/theVoid/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Moineau',
     id: 'Sparrow',
     mageTitle: 'Mage de la Brèche, Soldat',
-    ability: `
-        <h2>Entrave fantomatique</h2>
-        <p class="ability-activation">S'active durant votre phase principale:</p>
+    abilityName: `Entrave fantomatique`,
+    abilityActivation: `S'active durant votre phase principale:`,
+    abilityEffect: `
         <p>Stabilisez la brèche de n'importe quel joueur. Répétez ceci trois fois.
         <span class="or">OU</span>
         Un allié n'ayant aucune brèche fermée pioche trois  
@@ -37,9 +37,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'XaxosTV',
     mageTitle: 'Héraut du Vide',
-    ability: `
-        <h2>Halo prétorien</h2>
-        <p class="ability-activation">S'active durant votre phase principale:</p>
+    abilityName: `Halo prétorien`,
+    abilityActivation: `S'active durant votre phase principale:`,
+    abilityEffect: `
         <p>Un allié gagne 1 charge et défausse au hasard une carte de sa main. 
         Stabilisez une de vos brèches. Gagnez 1 Vie. Détruisez une carte de 
         votre main ou de votre défausse.</p>`,
diff --git a/src/aer-data/src/PL/aeonsEnd/mages.ts b/src/aer-data/src/PL/aeonsEnd/mages.ts
index 050d7e62..4402241e 100644
--- a/src/aer-data/src/PL/aeonsEnd/mages.ts
+++ b/src/aer-data/src/PL/aeonsEnd/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Adelheim',
     id: 'Adelheim',
     mageTitle: 'Kowal Magii Bram',
-    ability: `
-        <h2>Eteryczny Krąg</h2>
-        <p class="ability-activation">Użyj podczas fazy dobierania Nemezis:</p>
+    abilityName: `Eteryczny Krąg`,
+    abilityActivation: `Użyj podczas fazy dobierania Nemezis:`,
+    abilityEffect: `
         <p>Po dobraniu karty Mocy lub Ataku możesz ją odrzucić, bez rozpatrywania jej efektu.
         <span class="hint">(Nemezis nie dobiera karty zastępczej)</span></p>
       `,
@@ -35,9 +35,9 @@ export const mages: Mage[] = [
     name: 'Brima',
     id: 'Brama',
     mageTitle: 'Starsza Magini Bram',
-    ability: `
-        <h2>Skraj Wytrzymałości</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Skraj Wytrzymałości`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Dowolny gracz odzyskuje 4 życia.</p>
       `,
     numberOfCharges: 5,
@@ -63,9 +63,9 @@ export const mages: Mage[] = [
     name: 'Jian',
     id: 'Jian',
     mageTitle: 'Osierocona Magini Bram',
-    ability: `
-        <h2>Czarne Lustro</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Czarne Lustro`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Aktywuj przygotowane Zaklęcie dowolnego gracza, bez odrzucania go.</p>
         <p>Następnie, ponownie aktywuj to Zaklęcie.
         <span class="hint">(Po tym należy je odrzucić.)</span></p>
@@ -93,9 +93,9 @@ export const mages: Mage[] = [
     name: 'Kadir',
     id: 'Kadir',
     mageTitle: 'Poszukiwaczka Magów Bram',
-    ability: `
-        <h2>Pozaziemskie Wrota</h2>
-        <p class="ability-activation">Użyj podczas fazy głównej dowolnego gracza:</p>
+    abilityName: `Pozaziemskie Wrota`,
+    abilityActivation: `Użyj podczas fazy głównej dowolnego gracza:`,
+    abilityEffect: `
         <p>Ten gracz może przywrócić na rękę do trzech Zaklęć ze swojego stosu kart odrzuconych.
         Ponadto może podczas tej tury przygotować po dwa Zaklęcia na każdej otwartej Bramie.</p>
       `,
@@ -123,9 +123,9 @@ export const mages: Mage[] = [
     name: 'Lash',
     id: 'Lash',
     mageTitle: 'Zwiadowca Magów Bram',
-    ability: `
-        <h2>Przyspieszone Myśli</h2>
-        <p class="ability-activation">Użyj podczas fazy głównej dowolnego gracza:</p>
+    abilityName: `Przyspieszone Myśli`,
+    abilityActivation: `Użyj podczas fazy głównej dowolnego gracza:`,
+    abilityEffect: `
         <p>Wtasuj kartę tury dowolnego gracza do talii tur. Ten gracz otrzymuje 1 obrażenie. 
         <span class="hint">(Nie możesz wybrać karty tury oznaczonej symbolem "X").</span></p>
       `,
@@ -153,9 +153,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'Mist',
     mageTitle: 'Kapitan Magów Bram',
-    ability: `
-        <h2>Boska Przepowiednia</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Boska Przepowiednia`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Dowolny sojusznik dobiera cztery karty.</p>
       `,
     numberOfCharges: 5,
@@ -182,9 +182,9 @@ export const mages: Mage[] = [
     name: 'Phaedraxa',
     id: 'Phaedraxa',
     mageTitle: 'Prorokini Magii Bram',
-    ability: `
-        <h2>Runa Augura</h2>
-        <p class="ability-activation">Użyj natychmiast po tym jak zostanie dobrana karta tury:</p>
+    abilityName: `Runa Augura`,
+    abilityActivation: `Użyj natychmiast po tym jak zostanie dobrana karta tury:`,
+    abilityEffect: `
         <p>Anuluj obrażenia zadane graczom i Gravehold podczas tej tury.</p>
       `,
     numberOfCharges: 5,
@@ -210,9 +210,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'Xaxos',
     mageTitle: 'Uczeń Magii Bram',
-    ability: `
-        <h2>Metafizyczne Ogniwo</h2>
-        <p class="ability-activation">Użyj podczas fazy głównej dowolnego gracza:</p>
+    abilityName: `Metafizyczne Ogniwo`,
+    abilityActivation: `Użyj podczas fazy głównej dowolnego gracza:`,
+    abilityEffect: `
         <p>Sojusznicy otrzymują łącznie 4 Ładunki do podziału. Odkryj karty z talii tur, 
         a następnie ułóż z nich talię tur w dowolnej kolejności.</p>
       `,
diff --git a/src/aer-data/src/PL/intoTheWild/mages.ts b/src/aer-data/src/PL/intoTheWild/mages.ts
index 7d250eab..b0bf793f 100644
--- a/src/aer-data/src/PL/intoTheWild/mages.ts
+++ b/src/aer-data/src/PL/intoTheWild/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Inco',
     id: 'Inco',
     mageTitle: 'Dziecię Zieleni',
-    ability: `
-        <h2>Nagły Rozrost</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Nagły Rozrost`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Aktywuj dowolną liczbę Cierni Róży przygotowanych przez dowolną liczbę graczy.
         Każde z tych Zaklęć zadaje dodatkowo 2 obrażenia</p>`,
     numberOfCharges: 5,
@@ -33,9 +33,9 @@ export const mages: Mage[] = [
     name: 'Razra',
     id: 'Razra',
     mageTitle: 'Trenerka',
-    ability: `
-        <h2>Szkolenie Rip</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Szkolenie Rip`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Zniszcz z ręki kartę z "Rip" w nazwie. Z osobistej talii
         Ulepszeń dobierz na rękę kartę z "Rip" w nazwie, której koszt wynosi o 3 <span class="aether">&AElig;</span>
         więcej niż zniszczona karta.
diff --git a/src/aer-data/src/PL/legacy/mages.ts b/src/aer-data/src/PL/legacy/mages.ts
index 15b66de0..b242c95e 100644
--- a/src/aer-data/src/PL/legacy/mages.ts
+++ b/src/aer-data/src/PL/legacy/mages.ts
@@ -5,7 +5,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Green',
     id: 'LegacyGreen',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Użyj podczas swojej fazy głównej:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     mageTitle: 'Custom',
     uniqueStarters: [],
@@ -14,7 +16,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Yellow',
     id: 'LegacyYellow',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Użyj podczas swojej fazy głównej:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
@@ -23,7 +27,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Orange',
     id: 'LegacyOrange',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Użyj podczas swojej fazy głównej:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
@@ -32,7 +38,9 @@ export const mages: Mage[] = [
     expansion: 'Legacy',
     name: 'Legacy Blue',
     id: 'LegacyBlue',
-    ability: 'Custom',
+    abilityName: 'Custom',
+    abilityActivation: 'Użyj podczas swojej fazy głównej:',
+    abilityEffect: 'Custom',
     numberOfCharges: 'Custom',
     uniqueStarters: [],
     mageTitle: 'Custom',
diff --git a/src/aer-data/src/PL/outerDark/mages.ts b/src/aer-data/src/PL/outerDark/mages.ts
index a3f6ebb9..038f1b29 100644
--- a/src/aer-data/src/PL/outerDark/mages.ts
+++ b/src/aer-data/src/PL/outerDark/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Indira',
     id: 'Indira',
     mageTitle: 'Pomocnik Magów Bram',
-    ability: `
-        <h2>Podstęp Piromanty</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Podstęp Piromanty`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Aktywuj dowolną liczbę Zaklęć z ręki. Każde z tych Zaklęć zadaje 1 dodatkowe obrażenie.</p>
         <p>Możesz zniszczyć jedną kartę ze swojego stosu kart odrzuconych.</p>
       `,
@@ -35,9 +35,9 @@ export const mages: Mage[] = [
     name: 'Remnant',
     id: 'Remnant',
     mageTitle: 'Stworzenie z Eteru',
-    ability: `
-        <h2>Efemeryczna Maska</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Efemeryczna Maska`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Dowolny sojusznik bierze z powrotem na rękę dwie karty ze swojego stosu kart odrzuconych.
         <span class="or">ALBO</span>
         Gravehold otrzymuje 5 żywotności.</p>
diff --git a/src/aer-data/src/PL/shatteredDreams/mages.ts b/src/aer-data/src/PL/shatteredDreams/mages.ts
index 047c9aaa..aca632ba 100644
--- a/src/aer-data/src/PL/shatteredDreams/mages.ts
+++ b/src/aer-data/src/PL/shatteredDreams/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Nook',
     id: 'Nook',
     mageTitle: 'Zaklinacz Sfer',
-    ability: `
-        <h2>Eteryczna Kumulacja</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Eteryczna Kumulacja`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Możesz zniszczyć kartę z ręki albo twojego stosu kart odrzuconych.
         Otrzymujesz 4 <span class="aether">&AElig;</span>.<br/>
         Możesz wziąć na rękę następne Zaklęcie, które pozyskasz w tej turze.</p>`,
diff --git a/src/aer-data/src/PL/theAncients/mages.ts b/src/aer-data/src/PL/theAncients/mages.ts
index fa873bd3..faec8749 100644
--- a/src/aer-data/src/PL/theAncients/mages.ts
+++ b/src/aer-data/src/PL/theAncients/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Mazra',
     id: 'Mazra',
     mageTitle: 'Oczytana magini bram',
-    ability: `
-        <h2>Magiczny umysł</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Magiczny umysł`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Zniszcz z ręki kartę z Mazrą w nazwie. Z osobistej talii Ulepszeń dobierz na rękę kartę z Mazrą w nazwie, 
         której koszt wynosi 3 <span class="aether">&AElig;</span> więcej niż zniszczona karta
         <span class="or">ALBO</span>
@@ -34,9 +34,9 @@ export const mages: Mage[] = [
     name: 'Qu',
     id: 'Qu',
     mageTitle: 'Twórczyni i niszczycielka',
-    ability: `
-        <h2>Harmonia Przeciwieństw</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Harmonia Przeciwieństw`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Gdy znacznik Oblicza znajduje się stroną Niszczycielki ku górze, aktywuj do dwóch różnych Zaklęć
         przygotowanych przez dowolnych graczy, a następnie odwróć znacznik Oblicza.
         W innym przypadku dowolny gracz przygotowuje na swoich otwartych Bramach do 
diff --git a/src/aer-data/src/PL/theDepths/mages.ts b/src/aer-data/src/PL/theDepths/mages.ts
index 017ad293..eec30b83 100644
--- a/src/aer-data/src/PL/theDepths/mages.ts
+++ b/src/aer-data/src/PL/theDepths/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Nym',
     id: 'Nym',
     mageTitle: 'Nowicjusz Magii Bram',
-    ability: `
-        <h2>Ostateczna Bariera</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Ostateczna Bariera`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Odrzuć wierzchnią kartę z talii Nemezis.</p>
         <p>W przypadku odrzucenia karty Ataku, odrzuć dodatkową kartę.</p>
       `,
@@ -36,9 +36,9 @@ export const mages: Mage[] = [
     name: 'Reeve',
     id: 'Reeve',
     mageTitle: 'Elitarny Mag Bram',
-    ability: `
-        <h2>Rozrywające Ostrze</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Rozrywające Ostrze`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Zadaj 5 obrażeń Poplecznikowi.</p>
         <p>Zadaj 3 obrażenia innemu Poplecznikowi.</p>
       `,
@@ -65,9 +65,9 @@ export const mages: Mage[] = [
     name: "Z'hana",
     id: 'Zhana',
     mageTitle: 'Zbuntowana Magini Bram',
-    ability: `
-        <h2>Glif Strażniczy</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Glif Strażniczy`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Gravehold otrzymuje 7 żywotności.</p>
       `,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/PL/theNameless/mages.ts b/src/aer-data/src/PL/theNameless/mages.ts
index 158b3a9a..e158ef0e 100644
--- a/src/aer-data/src/PL/theNameless/mages.ts
+++ b/src/aer-data/src/PL/theNameless/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Malastar',
     id: 'Malastar',
     mageTitle: 'Mentor Magów Bram',
-    ability: `
-        <h2>Dar Eteru</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Dar Eteru`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Pozyskaj jedno Zaklęcie z dowolnego stosu zasobów. Możesz przygotować to Zaklęcie na otwartej Bramie dowolnego gracza.</p>
       `,
     numberOfCharges: 6,
diff --git a/src/aer-data/src/PL/theNewAge/mages.ts b/src/aer-data/src/PL/theNewAge/mages.ts
index 567848a3..bf3db4bd 100644
--- a/src/aer-data/src/PL/theNewAge/mages.ts
+++ b/src/aer-data/src/PL/theNewAge/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Sahala',
     id: 'Sahala',
     mageTitle: 'Wyrocznia Magów Bram',
-    ability: `
-        <h2>Gwiezdna Więź</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy aktywacji albo fazy głównej:</p>
+    abilityName: `Gwiezdna Więź`,
+    abilityActivation: `Użyj podczas swojej fazy aktywacji albo fazy głównej:`,
+    abilityEffect: `
         <p>Odkryj trzy wierzchnie karty ze swojej talii.
         Weź na rękę odkryte w ten sposób Zaklęcie.
         Jeśli na Niebiańskiej Bramie nie masz przygotowanych Zaklęć,
@@ -34,9 +34,9 @@ export const mages: Mage[] = [
     name: 'Gygar',
     id: 'Gygar',
     mageTitle: 'Mistrz Pływów',
-    ability: `
-        <h2>Wezbranie Mocy</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Wezbranie Mocy`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Umieść żeton Wezbrania na twojej Starożytnej Bramie.
         <span class="or">ALBO</span>
         Aktywuj Zaklęcie przygotowane na twojej Starożytnej Bramie. Otrzymujesz 2 Ładunki.</p>`,
@@ -59,9 +59,9 @@ export const mages: Mage[] = [
     name: 'Soskel',
     id: 'Soskel',
     mageTitle: 'Arystokrata',
-    ability: `
-        <h2>Pieczęć Energii</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Pieczęć Energii`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Umieść żeton Energii na Bramie dowolnego gracza, na której nie ma takiego żetonu.
         <span class="or">ALBO</span>
         Odrzuć żeton Energii z Bramy dowolnego gracza. Ten gracz odzyskuje 4 punkty życia.</p>`,
@@ -85,9 +85,9 @@ export const mages: Mage[] = [
     name: 'Taqren',
     id: 'Taqren',
     mageTitle: 'Tarcza Magów Bram',
-    ability: `
-        <h2>Ogniskowanie Bramy</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Ogniskowanie Bramy`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Wzmocnij Bramę dowolnego gracza.
         Dowolny gracz odzyskuje 1 punkt życia za każdą twoją Otwartą Bramę.</p>`,
     numberOfCharges: 4,
@@ -111,9 +111,9 @@ export const mages: Mage[] = [
     name: 'Talix',
     id: 'Talix',
     mageTitle: 'Sługa Gorejącego Łańcucha',
-    ability: `
-        <h2>Podniebny Popiół</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Podniebny Popiół`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Zniszcz dwie Iskry z ręki. Jeśli to zrobisz, wtasuj swoją kartę tury do talii tur.
         <span class="or">ALBO</span>
         Gravehold odzyskuje 5 żywotności.</p>`,
@@ -139,9 +139,9 @@ export const mages: Mage[] = [
     name: 'Rhia',
     id: 'Rhia',
     mageTitle: 'Łowczyni Artefaktów',
-    ability: `
-        <h2>Uszlachetnienie</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Uszlachetnienie`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Odłóż kartę z ręki albo stosu kart odrzuconych na odpowiedni stos zasobów. Jeśli odłożysz Artefakt,
         pozyskaj kartę z dowolnego stosu zasobów, której wartość jest o maksymalnie 
         3 <span class="aether">&AElig;</span> większa od wartości odłożonej karty. 
@@ -168,9 +168,9 @@ export const mages: Mage[] = [
     name: 'Claudia',
     id: 'Claudia',
     mageTitle: 'Rzeźbiąca w Eterze',
-    ability: `
-        <h2>Eteryczna Eksplozja</h2>
-        <p class="ability-activation">Użyj podczas fazy głównej dowolnego sojusznika:</p>
+    abilityName: `Eteryczna Eksplozja`,
+    abilityActivation: `Użyj podczas fazy głównej dowolnego sojusznika:`,
+    abilityEffect: `
         <p>Ten sojusznik otrzymuje 2 <span class="aether">&AElig;</span>. Następnym razem, gdy w tej turze
         ten sojusznik zdobędzie kartę ze stosu zasobów, otrzymasz kopię tej karty ze stosu zasobów.
         <span class="or">ALBO</span>
@@ -196,9 +196,9 @@ export const mages: Mage[] = [
     name: 'Zgubiony',
     id: 'Lost',
     mageTitle: 'Żywa Kuźnia',
-    ability: `
-        <h2>Moc Skrom'N'Ości</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Moc Skrom'N'Ości`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Dobierz na rękę do czterech kart o koszcie 0 <span class="aether">&AElig;</span> 
         ze stosu kart odrzuconych.</p>`,
     numberOfCharges: 5,
diff --git a/src/aer-data/src/PL/theVoid/mages.ts b/src/aer-data/src/PL/theVoid/mages.ts
index 796fb5c6..5eb5b59c 100644
--- a/src/aer-data/src/PL/theVoid/mages.ts
+++ b/src/aer-data/src/PL/theVoid/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Sparrow',
     id: 'Sparrow',
     mageTitle: 'Żołnierz Magów Bram',
-    ability: `
-        <h2>Niezwykła Więź</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Niezwykła Więź`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Wzmocnij Bramę dowolnego gracza. Powtórz to jeszcze trzy razy.
         <span class="or">ALBO</span>
         Dowolny sojusznik, który nie ma zamkniętych Bram, dobiera trzy karty, a następnie może przygotować do trzech Zaklęć ze swojej ręki.</p>`,
@@ -35,9 +35,9 @@ export const mages: Mage[] = [
     name: 'Xaxos',
     id: 'XaxosTV',
     mageTitle: 'Siewca Pustki',
-    ability: `
-        <h2>Ochrona Poświata</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Ochrona Poświata`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Dowolny sojusznik otrzymuje 1 Ładunek i odrzuca losową kartę z ręki. Wzmocnij jedną ze swoich Bram. Otrzymujesz 1 punkt życia. 
         Zniszcz kartę ze swojej ręki lub stosu kart odrzuconych.</p>`,
     numberOfCharges: 4,
diff --git a/src/aer-data/src/PL/warEternal/mages.ts b/src/aer-data/src/PL/warEternal/mages.ts
index 908a42f1..2feb30d4 100644
--- a/src/aer-data/src/PL/warEternal/mages.ts
+++ b/src/aer-data/src/PL/warEternal/mages.ts
@@ -6,9 +6,9 @@ export const mages: Mage[] = [
     name: 'Dezmodia',
     id: 'Dezmodia',
     mageTitle: 'Zrodzona z Otchłani',
-    ability: `
-        <h2>Runiczna Nawałnica</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Runiczna Nawałnica`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Dowolny gracz niszczy swoją otwartą Bramę I lub II i bierze z powrotem na rękę Zaklęcie lub Zaklęcia, 
         jeżeli były na niej przygotowane. Ten gracz otrzymuje Bramę Runiczną i umieszcza ją w miejscu zniszczonej Bramy. 
         Następnie może przygotować na dowolnej Bramie Zaklęcie z ręki.</p>`,
@@ -34,9 +34,9 @@ export const mages: Mage[] = [
     name: 'Garu',
     id: 'Garu',
     mageTitle: 'Zaprzysiężony Obrońca',
-    ability: `
-        <h2>Kolosalna Siła</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Kolosalna Siła`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Odrzuć do czterech ze swoich przygotowanych Zaklęć.</p>
         <p>Zadaj 2 obrażenia plus dodatkowe 4 obrażenia za każde odrzucone Zaklęcie. 
         Rozdziel te obrażenia dowolnie pomiędzy Nemezis i Popleczników.</p>
@@ -65,9 +65,9 @@ export const mages: Mage[] = [
     name: 'Gex',
     id: 'Gex',
     mageTitle: 'Doradca Magów Bram',
-    ability: `
-        <h2>Rzemieślniczy etos</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Rzemieślniczy etos`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Zniszcz do dwóch kart o koszcie 0 <span class="aether">&AElig;</span> ze swojego stosu kart odrzuconych.</p>
         <p>Dowolny sojusznik dobiera jedną kartę i otrzymuje 2 punkty życia.</p>`,
     numberOfCharges: 5,
@@ -93,9 +93,9 @@ export const mages: Mage[] = [
     name: 'Mazahaedron',
     id: 'Mazahaedron',
     mageTitle: 'Mistyk Kamiennego Kręgu',
-    ability: `
-        <h2>Podziemna Mantra</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Podziemna Mantra`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Możesz pozyskać Klejnot o koszcie 4 <span class="aether">&AElig;</span> lub 
         mniejszym z dowolnego stosu zasobów.</p>
         <p>Gravehold otrzymuje 4 żywotności.</p>`,
@@ -124,9 +124,9 @@ export const mages: Mage[] = [
     name: 'Mist',
     id: 'MistWE',
     mageTitle: 'Krocząca Przez Otchłań',
-    ability: `
-        <h2>Piętno odmienności</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Piętno odmienności`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Aktywuj do trzech różnych Zaklęć przygotowanych przez dowolnych graczy. 
         Każde z tych aktywowanych Zaklęć umieść na ręce dowolnego sojusznika lub sojuszników.</p>`,
     numberOfCharges: 6,
@@ -152,9 +152,9 @@ export const mages: Mage[] = [
     name: 'Quilius',
     id: 'Quilius',
     mageTitle: 'Zabójczyni Magów Bram',
-    ability: `
-        <h2>Śmiercionośna Przysięga</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Śmiercionośna Przysięga`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Zadaj 2 obrażenia za każdy żeton Trofeum, który posiadasz.</p>`,
     numberOfCharges: 5,
     uniqueStarters: [
@@ -179,9 +179,9 @@ export const mages: Mage[] = [
     name: 'Ulgimor',
     id: 'Ulgimor',
     mageTitle: 'Cienista Bestia',
-    ability: `
-        <h2>Upiorny Całun</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Upiorny Całun`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Odzyskujesz 6 punktów życia.</p>
         <p>Jeżeli jesteś wyczerpany, zamiast ciebie dowolny sojusznik odzyskuje 5 punktów życia.</p>`,
     numberOfCharges: 6,
@@ -207,9 +207,9 @@ export const mages: Mage[] = [
     name: 'Yan Magda',
     id: 'YanMagda',
     mageTitle: 'Oświecony Wygnaniec',
-    ability: `
-        <h2>Cesarski Rytuał</h2>
-        <p class="ability-activation">Użyj podczas swojej fazy głównej:</p>
+    abilityName: `Cesarski Rytuał`,
+    abilityActivation: `Użyj podczas swojej fazy głównej:`,
+    abilityEffect: `
         <p>Pozyskaj kartę z dowolnego stosu zasobów. Jeżeli masz cztery otwarte Bramy, dowolny sojusznik pozyskuje kartę 
         z dowolnego stosu zasobów i umieszcza ją na wierzchu swojej talii.</p>`,
     numberOfCharges: 5,
diff --git a/src/aer-types/types/data.ts b/src/aer-types/types/data.ts
index 321216ce..05ea2fc3 100644
--- a/src/aer-types/types/data.ts
+++ b/src/aer-types/types/data.ts
@@ -110,7 +110,9 @@ export type Mage = ICreature & {
   uniqueStarters: ICard[]
   mageTitle: string | 'Custom'
   aliases?: string[]
-  ability: string | 'Custom'
+  abilityName: string
+  abilityActivation: string
+  abilityEffect: string
   complexityRating?: number // keep this optional
   numberOfCharges: number | 'Custom'
   numberOfOvercharges?: number
diff --git a/src/components/atoms/Ability.tsx b/src/components/atoms/Ability.tsx
new file mode 100644
index 00000000..ac1c38e4
--- /dev/null
+++ b/src/components/atoms/Ability.tsx
@@ -0,0 +1,54 @@
+import React from 'react'
+import styled from 'styled-components'
+import { withTheme } from 'styled-components/macro'
+import Effect from './Effect'
+
+type Props = {
+  themeColor: string
+  theme: any
+  name: string
+  activation?: string
+  effect: string
+}
+
+const Ability = styled(({ theme, themeColor, name, activation = null, effect, ...rest}) => (
+  <div {...rest}>
+    <h2>{name}</h2>
+    {activation && <p className="ability-activation" dangerouslySetInnerHTML={{__html:activation}}></p>}
+    <Effect effect={effect} />
+  </div>
+))<Props>`
+  color: ${props => props.theme.colors.text.primary};
+  font-size: 0.875rem;
+  font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
+  font-weight: 400;
+  line-height: 1.5;
+  letter-spacing: 0.01071em;
+  position: relative;
+
+  border: 1px solid ${props => props.themeColor};
+  padding: 16px 24px;
+  border-radius: 4px;
+  margin: 24px 0 16px;
+
+  h2 {
+    position: absolute;
+    font-weight: 300;
+    font-size: 1.2rem;
+    margin-bottom: 0;
+    margin-top: 0;
+    background: #fff;
+    display: inline-block;
+    top: -14px;
+    color: ${props => props.themeColor};
+    padding: 0 8px;
+    margin-left: -8px;
+  }
+
+  .ability-activation {
+    text-decoration: underline;
+    margin-top: 0px;
+  }
+`
+
+export default withTheme(Ability)
diff --git a/src/components/atoms/AbilityText.tsx b/src/components/atoms/Effect.tsx
similarity index 57%
rename from src/components/atoms/AbilityText.tsx
rename to src/components/atoms/Effect.tsx
index f834eafb..3e5f66ad 100644
--- a/src/components/atoms/AbilityText.tsx
+++ b/src/components/atoms/Effect.tsx
@@ -6,10 +6,11 @@ type Props = {
   themeColor?: string
   isMage?: boolean
   theme: any
+  effect: string
 }
 
-const AbilityText = styled(({ themeColor, isMage, theme, ...rest }) => (
-  <div {...rest} />
+const Effect = styled(({ theme, effect, ...rest }) => (
+  <span {...rest} dangerouslySetInnerHTML={{__html: effect}} />
 ))<Props>`
   color: ${props => props.theme.colors.text.primary};
   font-size: 0.875rem;
@@ -18,35 +19,7 @@ const AbilityText = styled(({ themeColor, isMage, theme, ...rest }) => (
   line-height: 1.5;
   letter-spacing: 0.01071em;
   position: relative;
-
-  ${props =>
-    props.isMage
-      ? `
-    border: 1px solid ${props.themeColor};
-    padding: 16px 24px;
-    border-radius: 4px;
-    margin: 24px 0 16px;
-
-    h2 {
-      position: absolute;
-      font-weight: 300;
-      font-size: 1.2rem;
-      margin-bottom: 0;
-      margin-top: 0;
-      background: #fff;
-      display: inline-block;
-      top: -14px;
-      color: ${props.themeColor};
-      padding: 0 8px;
-      margin-left: -8px;
-    }
-
-    .ability-activation {
-      text-decoration: underline;
-      margin-top: 0px;
-    }
-    `
-      : null}
+  display: contents;
 
   .or {
     display: block;
@@ -76,4 +49,4 @@ const AbilityText = styled(({ themeColor, isMage, theme, ...rest }) => (
   }
 `
 
-export default withTheme(AbilityText)
+export default withTheme(Effect)
diff --git a/src/components/molecules/BasicNemesisCardInformation/index.tsx b/src/components/molecules/BasicNemesisCardInformation/index.tsx
index 6802e81f..d54647b9 100644
--- a/src/components/molecules/BasicNemesisCardInformation/index.tsx
+++ b/src/components/molecules/BasicNemesisCardInformation/index.tsx
@@ -7,7 +7,7 @@ import * as types from 'aer-types/types'
 import InfoItem from 'components/molecules/InfoItem'
 
 import SectionHeadline from 'components/atoms/SectionHeadline'
-import AbilityText from 'components/atoms/AbilityText'
+import Effect from 'components/atoms/Effect'
 
 type Props = {
   card: types.BasicNemesisCard | types.UpgradedBasicNemesisCard
@@ -29,11 +29,7 @@ const Body = ({ card, expansion, theme }: Props) => (
       Effect
     </SectionHeadline>
 
-    <AbilityText
-      dangerouslySetInnerHTML={{
-        __html: card.effect || '',
-      }}
-    />
+    <Effect effect={card.effect || ''} />
   </React.Fragment>
 )
 
diff --git a/src/components/molecules/FoeInformation/index.tsx b/src/components/molecules/FoeInformation/index.tsx
index 23f5f82c..d5672bd8 100644
--- a/src/components/molecules/FoeInformation/index.tsx
+++ b/src/components/molecules/FoeInformation/index.tsx
@@ -7,7 +7,7 @@ import { RootState, selectors } from 'Redux/Store'
 
 import InfoItem from '../InfoItem'
 
-import AbilityText from '../../atoms/AbilityText'
+import Ability from '../../atoms/Ability'
 import SectionHeadline from '../../atoms/SectionHeadline'
 
 import Grid from '@material-ui/core/Grid'
@@ -66,15 +66,7 @@ const FoeInformation = ({ foe, expansion, theme }: Props) => {
       info={foe.charges.toString()}
     />
 
-    <AbilityText
-      isMage={true}
-      themeColor={theme.colors.cards.foe.color}
-    >
-      <h2>{foe.abilityName}</h2>
-      <p dangerouslySetInnerHTML={{
-        __html: foe.abilityEffect,
-      }} />
-    </AbilityText>
+    <Ability themeColor={theme.colors.cards.foe.color} name={foe.abilityName} effect={foe.abilityEffect} />
 
     <SectionHeadline
       themeColor={theme.colors.cards.foe.color}
diff --git a/src/components/molecules/FriendInformation/index.tsx b/src/components/molecules/FriendInformation/index.tsx
index 60f73949..b3becbb6 100644
--- a/src/components/molecules/FriendInformation/index.tsx
+++ b/src/components/molecules/FriendInformation/index.tsx
@@ -7,7 +7,7 @@ import { RootState, selectors } from 'Redux/Store'
 
 import InfoItem from '../InfoItem'
 
-import AbilityText from '../../atoms/AbilityText'
+import Ability from '../../atoms/Ability'
 import SectionHeadline from '../../atoms/SectionHeadline'
 
 import Grid from '@material-ui/core/Grid'
@@ -65,15 +65,7 @@ const FriendInformation = ({ friend, expansion, theme }: Props) => {
       info={friend.charges.toString()}
     />
 
-    <AbilityText
-      isMage={true}
-      themeColor={theme.colors.cards.friend.color}
-    >
-      <h2>{friend.abilityName}</h2>
-      <p dangerouslySetInnerHTML={{
-        __html: friend.abilityEffect,
-      }} />
-    </AbilityText>
+    <Ability themeColor={theme.colors.cards.friend.color} name={friend.abilityName} effect={friend.abilityEffect} />
 
     <SectionHeadline
       themeColor={theme.colors.cards.friend.color}
diff --git a/src/components/molecules/FriendOrFoeAttackTile/Body.tsx b/src/components/molecules/FriendOrFoeAttackTile/Body.tsx
index a21f5a1a..c6ee464c 100644
--- a/src/components/molecules/FriendOrFoeAttackTile/Body.tsx
+++ b/src/components/molecules/FriendOrFoeAttackTile/Body.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 
 import { FriendOrFoeAttack } from 'aer-types/types'
-import AbilityText from '../../atoms/AbilityText'
+import Effect from '../../atoms/Effect'
 
 import Name from './Name'
 
@@ -12,11 +12,7 @@ type Props = {
 const Body = ({ card }: Props) => (
   <React.Fragment>
     <Name component="p">{card.name}</Name>
-    <AbilityText
-      dangerouslySetInnerHTML={{
-        __html: card.effect || '',
-      }}
-    />
+    <Effect effect={card.effect || ''} />
   </React.Fragment>
 )
 
diff --git a/src/components/molecules/MageInformation/index.tsx b/src/components/molecules/MageInformation/index.tsx
index 21f56c87..ebd50390 100644
--- a/src/components/molecules/MageInformation/index.tsx
+++ b/src/components/molecules/MageInformation/index.tsx
@@ -5,7 +5,7 @@ import { Mage, ICard, Expansion } from 'aer-types/types'
 
 import InfoItem from '../InfoItem'
 
-import AbilityText from '../../atoms/AbilityText'
+import Ability from '../../atoms/Ability'
 import SectionHeadline from '../../atoms/SectionHeadline'
 
 import UniqueStarter from '../UniqueStarter'
@@ -47,16 +47,15 @@ const MageInformation = ({ mage, player, expansion, theme }: Props) => (
       <InfoItem label="Complexity" info={mage.complexityRating.toString()} />
     ) : null}
 
-    <AbilityText
-      isMage={true}
+    <Ability
       themeColor={
         player
           ? theme.colors.playerColors[player].normal
           : theme.colors.playerColors['player1'].normal
       }
-      dangerouslySetInnerHTML={{
-        __html: mage.ability,
-      }}
+      name={mage.abilityName}
+      activation={mage.abilityActivation}
+      effect={mage.abilityEffect}
     />
 
     <SectionHeadline
diff --git a/src/components/molecules/NemesisCardTile/Body.tsx b/src/components/molecules/NemesisCardTile/Body.tsx
index 9686e301..981f554f 100644
--- a/src/components/molecules/NemesisCardTile/Body.tsx
+++ b/src/components/molecules/NemesisCardTile/Body.tsx
@@ -6,7 +6,7 @@ import { INemesisCard, BasicNemesisCard } from 'aer-types/types'
 import InfoItem from 'components/molecules/InfoItem'
 
 import Name from './Name'
-import AbilityText from 'components/atoms/AbilityText'
+import Effect from 'components/atoms/Effect'
 
 type Props = {
   nemesisCard: INemesisCard | BasicNemesisCard
@@ -23,11 +23,7 @@ const Body = ({ nemesisCard, inline = false }: Props) => (
       {nemesisCard.type === 'Minion' && (
         <InfoItem label="Hp" info={nemesisCard.hp.toString()} />
       )}
-      {inline && <AbilityText
-        dangerouslySetInnerHTML={{
-          __html: nemesisCard.effect || '',
-        }}
-      />}
+      {inline && <Effect effect={nemesisCard.effect || ''} />}
     </List>
   </React.Fragment>
 )
diff --git a/src/components/molecules/SupplyCardInformation/index.tsx b/src/components/molecules/SupplyCardInformation/index.tsx
index 76ff151a..017e01ca 100644
--- a/src/components/molecules/SupplyCardInformation/index.tsx
+++ b/src/components/molecules/SupplyCardInformation/index.tsx
@@ -9,7 +9,7 @@ import InfoItem from '../InfoItem'
 import SectionHeadline from '../../atoms/SectionHeadline'
 import Keywords from '../../atoms/Keywords'
 import Keyword from '../../atoms/Keyword'
-import AbilityText from '../../atoms/AbilityText'
+import Effect from '../../atoms/Effect'
 
 type Props = {
   card: {
@@ -42,11 +42,7 @@ const Body = ({ card, expansion, theme }: Props) => (
       Effect
     </SectionHeadline>
 
-    <AbilityText
-      dangerouslySetInnerHTML={{
-        __html: card.effect || '',
-      }}
-    />
+    <Effect effect={card.effect || ''} />
     {card.keywords ? (
       <Keywords>
         {card.keywords.map((keyword) => (
diff --git a/src/components/molecules/TreasureInformation/index.tsx b/src/components/molecules/TreasureInformation/index.tsx
index ba30177a..4d85a10a 100644
--- a/src/components/molecules/TreasureInformation/index.tsx
+++ b/src/components/molecules/TreasureInformation/index.tsx
@@ -7,7 +7,7 @@ import * as types from 'aer-types/types'
 import InfoItem from 'components/molecules/InfoItem'
 
 import SectionHeadline from 'components/atoms/SectionHeadline'
-import AbilityText from 'components/atoms/AbilityText'
+import Effect from 'components/atoms/Effect'
 
 type Props = {
   card: types.Treasure
@@ -25,11 +25,7 @@ const Body = ({ card, expansionName, theme }: Props) => (
       Effect
     </SectionHeadline>
 
-    <AbilityText
-      dangerouslySetInnerHTML={{
-        __html: card.effect || '',
-      }}
-    />
+    <Effect effect={card.effect || ''} />
   </React.Fragment>
 )
 
diff --git a/src/components/molecules/TreasureList/TreasureTile/Body.tsx b/src/components/molecules/TreasureList/TreasureTile/Body.tsx
index 2217a3fa..bb56a6d1 100644
--- a/src/components/molecules/TreasureList/TreasureTile/Body.tsx
+++ b/src/components/molecules/TreasureList/TreasureTile/Body.tsx
@@ -5,7 +5,7 @@ import List from '@material-ui/core/List'
 import { Treasure } from 'aer-types/types'
 import { RootState, selectors } from 'Redux/Store'
 
-import AbilityText from 'components/atoms/AbilityText'
+import Effect from 'components/atoms/Effect'
 
 import InfoItem from '../../InfoItem'
 
@@ -38,7 +38,7 @@ const Body = ({ treasure, expansions }: Props) => (
       <InfoItem label="Treasure Level" info={treasure.level.toString()} />
       {treasure.subtype && <InfoItem label="Subtype" info={treasure.subtype} />}
     </List>
-    <AbilityText dangerouslySetInnerHTML={{ __html: treasure.effect }} />
+    <Effect effect={treasure.effect} />
   </React.Fragment>
 )
 
diff --git a/src/components/molecules/UniqueStarter/Body.tsx b/src/components/molecules/UniqueStarter/Body.tsx
index 6f63adaa..54dc4c89 100644
--- a/src/components/molecules/UniqueStarter/Body.tsx
+++ b/src/components/molecules/UniqueStarter/Body.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 
 import { ICard } from 'aer-types/types'
 
-import AbilityText from '../../atoms/AbilityText'
+import Effect from '../../atoms/Effect'
 import InfoItem from '../../molecules/InfoItem'
 
 import Name from './Name'
@@ -21,11 +21,7 @@ const Body = ({ card }: Props) => (
       <InfoItem label="Cost" info={card.cost.toString()} />
     </List>
 
-    <AbilityText
-      dangerouslySetInnerHTML={{
-        __html: card.effect || '',
-      }}
-    />
+    <Effect effect={card.effect || ''} />
     {card.keywords ? card.keywords.map((keyword: string) => keyword) : null}
   </React.Fragment>
 )