diff --git a/spells/air1.tex b/spells/air1.tex
index 8679ab7a9c43f054ece354c06b71c7a473161033..9548efe74f7927cdba41d83e377bfc189d9885c3 100644
--- a/spells/air1.tex
+++ b/spells/air1.tex
@@ -2,7 +2,7 @@
   {\mAir}% Spheres
   {Wax}% Action
   {}% Enhancements
-  {\roll{Strength}{Athletics}}% Skill
+  {\roll{Strength}{Athletics}}% Resist with
   {targets lose \arabic{spelllevel} \gls{ap} and get pushed back \arabic{spelllevel}~\glspl{ap} minus Strength}% Description
   {
     The mage blasts the target with chilled wind, draining them of \arabic{spelllevel} \gls{ap}.
@@ -13,7 +13,7 @@
   {\mAir}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {the wind speed}% Skill
+  {the wind speed}% Resist with
   {a pocket of foul air inflicts \arabic{spellPotency}~\glspl{fatigue} each round}% Description
   {
     The caster pollutes the air, making it stink, and caustic to breath.
@@ -27,7 +27,7 @@
   {\mAir}% Spheres
   {Warp}% Action
   {}% Enhancements
-  {the density of the liquid}% Skill
+  {the density of the liquid}% Resist with
   {a small bubble surrounds the caster}% Description
   {
     A bubble, around 1 metre in diameter, gains a wobbly `shell', which holds it in place.
diff --git a/spells/air2.tex b/spells/air2.tex
index 3c818d6e9871061bc45f1b9972654d9ad267ccd6..b1faebe9b655f514ac13091572aec71965144617 100644
--- a/spells/air2.tex
+++ b/spells/air2.tex
@@ -3,7 +3,7 @@
   {\mAir}% Spheres
   {Wax}% Action
   {\duplicated}% Enhancements
-  {\roll{Strength}{Athletics}}% Skill
+  {\roll{Strength}{Athletics}}% Resist with
   {targets lose \arabic{spelllevel} \glspl{ap} and get pushed back \arabic{spelllevel}~\glspl{ap} minus Strength}% Description
   {
     \spellArea\ targets within \spellRange\ receive a blast of wind, and lose \arabic{spelllevel}~\glspl{ap}.
diff --git a/spells/air3.tex b/spells/air3.tex
index affcfcdec53f1b81d8c01585ac7b3f2b4d8b6363..8230d94167522de563a8a2e011de813a45abaa4b 100644
--- a/spells/air3.tex
+++ b/spells/air3.tex
@@ -2,7 +2,7 @@
   {\mWater}% Spheres
   {Wane}% Action
   {\detailed, \duplicated}% Enhancements
-  {Deceit}% Skill
+  {wind speed}% Resist with
   {Stinking cloud covers \spellArea, inflicting \arabic{spelllevel}~\glspl{fatigue} to anyone in the area}% Description
   {
     The air pollutes, growing dark and smoggy, in the exact shape of the caster's face with a maniacal grin.
diff --git a/spells/airFire3.tex b/spells/airFire3.tex
index 28b81eafcc7aae30fe280326048864dc4f8046af..86a8bec5fcdcfa0e1d784d437b12d6a0812a733f 100644
--- a/spells/airFire3.tex
+++ b/spells/airFire3.tex
@@ -2,7 +2,7 @@
   {\mAir\ and \mFire}% Spheres
   {Wax}% Action
   {\divergent, \duplicated}% Enhancements
-  {Crafts}% Skill
+  {the size of the fire}% Resist with
   {A fire explodes over \spellArea\ targets who lose \arabic{spelllevel}~\glspl{ap} and take \arabic{spelllevel} Damage}% Description
   {
     The caster encourages a fire to burn to explosion, knocking back the nearest \spellArea\ targets.
diff --git a/spells/airFire4.tex b/spells/airFire4.tex
index facae9b2d1334874fd1fb8384a42b1c09da4082c..bdcafc2ad078ed526d3d5fa8cb827602624b311d 100644
--- a/spells/airFire4.tex
+++ b/spells/airFire4.tex
@@ -2,7 +2,7 @@
   {\mAir\ and \mFire}% Spheres
   {Wax}% Action
   {\detailed, \divergent, \duplicated}% Enhancements
-  {Seafaring}% Skill
+  {the storm's ferocity}% Resist with
   {\spellArea\ targets lose \arabic{spelllevel} \glspl{ap} while lightning hits them for \arabic{spelllevel} Damage}% Description
   {
     During any \gls{interval} where lightning flashes, the caster can seize the ambient fire in the air, and channel it into a powerful blast of lightning and wind.
diff --git a/spells/death1.tex b/spells/death1.tex
index 8a48725d7a813b12f62c7b83f32dcd526397d79e..df48852cebd5590a2aeff74de555a6428c862f62 100644
--- a/spells/death1.tex
+++ b/spells/death1.tex
@@ -2,7 +2,7 @@
   {\mFate, \mAir}% Spheres
   {Wax}% Action
   {}% Enhancements
-  {Medicine}% Skill
+  {\roll{Strength}{Athletics}}% Resist with
   {target gains 1 \glsentrytext{fatigue}}% Description
   {
     The caster makes uncomfortable statements about the target's organs, who then feels sickly and possibly retches.
@@ -13,7 +13,7 @@
   {\mFate, \mAir}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {Medicine}% Skill
+  {target's \glsentrytext{fatigue} penalty}% Resist with
   {target ignores all \glsentrytext{fatigue} penalties for \pgls{interval}}% Description
   {
     This spell preserves someone's natural bodily functions in the face of decay, tiredness, or poison.
@@ -25,7 +25,7 @@
   {\mFate, \mAir}% Spheres
   {Warp}% Action
   {}% Enhancements
-  {Medicine}% Skill
+  {target's \glsentrytext{fatigue} penalty}% Resist with
   {target's gains \glsentrytext{dr} 1}% Description
   {
     The spell places a target in a state of semi-undeath.
diff --git a/spells/death2.tex b/spells/death2.tex
index 2a1663c5b039f44d44fd688fcf99921acc5759f0..0eb391ca63738db103b1515508710f640458fea2 100644
--- a/spells/death2.tex
+++ b/spells/death2.tex
@@ -2,7 +2,7 @@
   {\mFate, \mAir}% Spheres
   {Wax}% Action
   {\detailed}% Enhancements
-  {Medicine}% Skill
+  {\roll{Strength}{Athletics}}% Resist with
   {target loses \arabic{spelllevel} \glspl{hp}}% Description
   {
     The caster insists the target has taken a wound and they begin to feel it as internal bleeding accompanies a headache.
@@ -13,7 +13,7 @@
   {\mFate, \mAir}% Spheres
   {Wax}% Action
   {\duplicated}% Enhancements
-  {Medicine}% Skill
+  {\roll{Strength}{Athletics}}% Resist with
   {\spellArea\ targets lose \arabic{spelllevel} \glspl{fatigue}}% Description
   {
     \spellArea\ targets within \spellRange\ each take \arabic{spelllevel} \glspl{fatigue}.
@@ -23,7 +23,7 @@
   {\mFate, \mAir}% Spheres
   {Witness}% Action
   {\distant}% Enhancements
-  {Medicine}% Skill
+  {time since death}% Resist with
   {Detect any close corpses}% Description
   {
     Sniffing at the wind, the caster identifies any corpses within \spellRange.
@@ -34,7 +34,7 @@
   {\mFate, \mAir}% Spheres
   {Wane}% Action
   {\detailed}% Enhancements
-  {Medicine}% Skill
+  {target's current \glsentrytext{fatigue} penalty}% Resist with
   {Stop \glspl{fatigue}, poisons, venom or rot}% Description
   {
     The caster removes one type of death from the target -- \glspl{fatigue}, poison, venom, rot, or anything else they can think of.
@@ -47,7 +47,7 @@
   {\mFate, \mAir}% Spheres
   {Warp}% Action
   {\detailed}% Enhancements
-  {Vigilance}% Skill
+  {Vigilance}% Resist with
   {Gain \gls{dr} 2, ignore up to \arabic{spelllevel}~\gls{fatigue} penalties, and see as the dead see}% Description
   {
     The caster stares into a middle distance continuously, until they find a special state of de-focussing their eyes which lets them (or a target) see as the dead see.
diff --git a/spells/death3.tex b/spells/death3.tex
index e170fb8426e7d4d30d8db820f93b5bf442ba4d1e..d7f5f4e26a7ce642b222273bbc416a883b31f3a1 100644
--- a/spells/death3.tex
+++ b/spells/death3.tex
@@ -2,7 +2,7 @@
   {\mFate, \mAir}% Spheres
   {Witness}% Action
   {\distant, \detailed}% Enhancements
-  {Medicine}% Skill
+  {time since death}% Resist with
   {Detect the corpse of a named species within \spellRange}% Description
   {
     Sniffing at the wind, the caster identifies any corpses from a particular species within \spellRange.
@@ -13,7 +13,7 @@
   {\mFate, \mAir}% Spheres
   {Warp}% Action
   {\distant, \detailed}% Enhancements
-  {Vigilance}% Skill
+  {current \glsentrytext{fatigue} penalty}% Resist with
   {Gain \gls{dr} 2, ignore up to \arabic{spelllevel}~\gls{fatigue} penalties, and see as the dead see}% Description
   {
     The target no longer sees normal light, but instead only the light of souls.
diff --git a/spells/fate1.tex b/spells/fate1.tex
index 804efdc817d3c7d6689645504c7e84b44d6b0094..b9d593b79c59a400572d766fe8e8327c775f1651 100644
--- a/spells/fate1.tex
+++ b/spells/fate1.tex
@@ -2,8 +2,8 @@
   {\mFate}% Spheres
   {Wax}% Action
   {}% Enhancements
-  {\tn}% Skill
-  {target gains $1D6$ \glspl{fp}}% Description
+  {the target's Charisma}% Resist with
+  {\spellArea~target gains \rollConv~\glspl{fp}}% Description
   {
     The mage blesses the target with high hopes for their future, bestowing $1D6$ \glspl{fp} immediately.
   }
@@ -12,7 +12,7 @@
   {\mFate}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {Deceit}% Skill
+  {the target's Charisma}% Resist with
   {lose $1D6$ \glspl{fp}}% Description
   {
     The caster notes the worst of someone's possible futures -- the most unpleasant thing which is reasonably likely.
@@ -24,7 +24,7 @@ The target then loses $1D6$~\glspl{fp}.
   {\mFate}% Spheres
   {Warp}% Action
   {}% Enhancements
-  {Tactics}% Skill
+  {\roll{Charisma}{Tactics}}% Resist with
   {target gains 1 monster encounter}% Description
   {
     The caster hexes the target with death on the road, hoping they will not meet their destination.
@@ -39,7 +39,7 @@ The target then loses $1D6$~\glspl{fp}.
   {\mFate}% Spheres
   {Witness}% Action
   {}% Enhancements
-  {Empathy}% Skill
+  {}% Resist with
   {check if target carries \glspl{fp}}% Description
   {
     With a short interaction, and some questions about family, the caster discerns if the target has any special fate.
diff --git a/spells/fate2.tex b/spells/fate2.tex
index f5c96db6780e5b281bb86582c42ffd3a1ce9aebf..c00d74ef4e23472973c32e7eb651f75631260e43 100644
--- a/spells/fate2.tex
+++ b/spells/fate2.tex
@@ -3,7 +3,7 @@
   {\mFate}% Spheres
   {Wax}% Action
   {\duplicated}% Enhancements
-  {Empathy}% Skill
+  {target's Charisma}% Resist with
   {\spellArea{} targets gain \arabic{spelllevel} \glspl{fp}}% Description
   {}
 
@@ -11,7 +11,7 @@
   {\mFate}% Spheres
   {Wane}% Action
   {\duplicated}% Enhancements
-  {Deceit}% Skill
+  {target's Charisma}% Resist with
   {\spellArea{} targets lose \arabic{spelllevel} \glspl{fp}}% Description
   {}
 
@@ -19,9 +19,9 @@
   {Fate}% Spheres
   {Wane}% Action
   {\distant}% Enhancements
-  {Deceit}% Skill
-  {target loses 1D6+\arabic{spelllevel} \glspl{fp}}% Description
+  {target's Charisma}% Resist with
+  {target loses \rollConv~\glspl{fp}}% Description
   {
-    One target at \spellRange{} loses \dmg{spelllevel}~\glspl{fp}.
+    One target at \spellRange{} loses \rollConv~\glspl{fp}.
   }
 
diff --git a/spells/fire1.tex b/spells/fire1.tex
index 6e31171be8e02be42f306e2146b81a02f0efecc6..67adc38b7486dc6344c842e33de5fa65b832ebe9 100644
--- a/spells/fire1.tex
+++ b/spells/fire1.tex
@@ -2,8 +2,8 @@
   {\mFire}% Spheres
   {Wax}% Action
   {}% Enhancements
-  {\roll{Wits}{Athletics}}% Skill
-  {target fire flares, inflicting \arabic{spellPotency} Damage on all around}% Description
+  {\roll{Wits}{Athletics}}% Resist with
+  {target fire flares, inflicting \rollConv\ Damage on all around}% Description
   {
     A fire-source roars, growing loud, aggressive, and large enough to damage anyone next to it.
 
@@ -17,7 +17,7 @@
   {\mFire}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {Wyldcrafting}% Skill
+  {size of the flame}% Resist with
   {target fire goes out}% Description
   {
     The target fire flickers, then goes out.
diff --git a/spells/fire2.tex b/spells/fire2.tex
index e4178373bde0e07649e580e2602a5c92d8fb2672..472abaa3a420dc843367bcd1a8dfb5508d55200a 100644
--- a/spells/fire2.tex
+++ b/spells/fire2.tex
@@ -3,7 +3,7 @@
   {\mFire}% Spheres
   {Warp}% Action
   {\duplicated}% Enhancements
-  {Wyldcrafting}% Skill
+  {intensity of the flame}% Resist with
   {target fire stops consuming a certain type of material}% Description
   {
     This spell changes the basic nature of a fire, so it can no longer burn a certain type of material.
diff --git a/spells/light1.tex b/spells/light1.tex
index 6e1b9a87236c947a0ef3a9539e5ac15e62a1c053..0757ed693bfe2f52f76038fcf9b0c497df17a7d0 100644
--- a/spells/light1.tex
+++ b/spells/light1.tex
@@ -2,18 +2,17 @@
   {\mFire, \mAir}% Spheres
   {Wax}% Action
   {}% Enhancements
-  {Academics}% Skill
+  {surrounding darkness}% Resist with
   {any spark blooms into a warm light}% Description
   {
     Arcanists of light can make any source of light -- even a candle flame or starlight -- bloom into the light of a healthy torch.
-    When the light springs up suddenly in the dark, anyone looking towards it makes a Wits + Vigilance test (\tn{8}) or loses 1~\gls{ap}.
   }
 
 \spell{Shadow}% Name
   {\mFire, \mAir}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {Stealth}% Skill
+  {\roll{Wits}{Vigilance}}% Resist with
   {create a patch of darkness}% Description
   {
     A single patch of darkness, the length of a step, forms anywhere within range.
@@ -29,7 +28,7 @@
   {\mFire, \mAir}% Spheres
   {Warp}% Action
   {}% Enhancements
-  {Academics}% Skill
+  {\roll{Wits}{Vigilance}}% Resist with
   {single item contorts like a funhouse mirror}% Description
   {
     When light contorts, it can make something seem larger or smaller (or oscillate between the two).
diff --git a/spells/light2.tex b/spells/light2.tex
index 5e1f6e36adcd083eac62581a18fe7f07faf472df..846c6df9e699233209c458403f7cba1e56e1dd10 100644
--- a/spells/light2.tex
+++ b/spells/light2.tex
@@ -2,7 +2,7 @@
   {\mFire, \mAir}% Spheres
   {Wax}% Action
   {\duplicated}% Enhancements
-  {Academics}% Skill
+  {\roll{Wits}{Vigilance}}% Resist with
   {Room fills with light}% Description
   {
     The caster grows any source of light into a painful glare, covering a massive area.%
@@ -14,7 +14,7 @@
   {\mFire, \mAir}% Spheres
   {Wax}% Action
   {\detailed}% Enhancements
-  {Empathy}% Skill
+  {\roll{Wits}{Vigilance}}% Resist with
   {any spark blooms into a warm light}% Description
   {
     This light attaches to a target, hovering around them like sparkling oil-stain.
@@ -27,7 +27,7 @@
   {\mFire, \mAir}% Spheres
   {Wane}% Action
   {\detailed}% Enhancements
-  {Performance}% Skill
+  {\roll{Wits}{Vigilance}}% Resist with
   {A shadow forms a silhouette}% Description
   {
     One target shadow forms a detailed silhouette, and may even stand up and away from the ground.
diff --git a/spells/light3.tex b/spells/light3.tex
index 1857636317dd96314511ab9dc47a4af4127da139..cf0bbdca50d677e3452c1da72762cfed49097e10 100644
--- a/spells/light3.tex
+++ b/spells/light3.tex
@@ -2,7 +2,7 @@
   {\mFire, \mAir}% Spheres
   {Wane}% Action
   {\detailed, \duplicated}% Enhancements
-  {Performance}% Skill
+  {\roll{Wits}{Vigilance}}% Resist with
   {\spellArea\ shadows form a silhouette}% Description
   {
     Shadows covering \spellArea\ steps animate and stand, then form any shape the caster can clearly imagine.
diff --git a/spells/mind1.tex b/spells/mind1.tex
index 82e8153af29f0b5429c1f8de4de03f5ca0cd9df8..06252a0d5cbd17349f8f7986ab80a4bccdf0865c 100644
--- a/spells/mind1.tex
+++ b/spells/mind1.tex
@@ -2,7 +2,7 @@
   {\mFate, \mWater}% Spheres
   {Wax}% Action
   {}% Enhancements
-  {Empathy}% Skill
+  {\roll{Wits}{Academics}}% Resist with
   {target becomes enamoured with their current action, and finds it hard to stop}% Description
   {
     The target finds sudden joy and fascination with their current task.
@@ -18,7 +18,7 @@
   {\mFate, \mWater}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {Deceit}% Skill
+  {\roll{Wits}{Academics}}% Resist with
   {the target becomes listless and distractable}% Description
   {
     The target loses their train of thought.
@@ -30,7 +30,7 @@
   {\mFate, \mWater}% Spheres
   {Witness}% Action
   {}% Enhancements
-  {Empathy}% Skill
+  {}% Resist with
   {the caster checks if something has a mind}% Description
   {
     Shadows, statues, or suspicious bushes can all hide all manner of things.
diff --git a/spells/mind2.tex b/spells/mind2.tex
index d455cbcfdfa558d546f434c91e58b3c55d5aa5f8..0e9d81d1202c30854f137ef8209fef2b728446d2 100644
--- a/spells/mind2.tex
+++ b/spells/mind2.tex
@@ -2,7 +2,7 @@
   {\mWater, \mFate}% Spheres
   {Wane}% Action
   {\duplicated}% Enhancements
-  {\roll{Wits}{Academics}}% Skill
+  {\roll{Wits}{Academics}}% Resist with
   {\spellArea\ targets suffer -\arabic{spelllevel}~\glspl{ap}}% Description
   {
     \spellArea\ targets within \spellRange\ become confused about what they're doing, and suffer a minus \arabic{spelllevel} penalty to all actions based on Mental Attributes.
@@ -16,8 +16,8 @@
   {\mWater, \mFate}% Spheres
   {Wane}% Action
   {\divergent}% Enhancements
-  {\roll{Wits}{Academics}}% Skill
-  {the target loses -\arabic{spelllevel}~\glspl{ap} and $1D6 + 1$ \glspl{fp}}% Description
+  {\roll{Wits}{Academics}}% Resist with
+  {the target loses \arabic{spelllevel}~\glspl{ap} and \rollConv~\glspl{fp}}% Description
   {
     The caster explains to the target their imminent death.
     The target immediately loses $1D6+1$ \glspl{fp} and takes on a persistent -\arabic{spelllevel} penalty to Mind Attributes and \glspl{ap}.
diff --git a/spells/mind3.tex b/spells/mind3.tex
index 0bec2963e2364baf1f251489c1392145a0f2352e..6b670b222b3f761f3074e3034dc3c28ab6309909 100644
--- a/spells/mind3.tex
+++ b/spells/mind3.tex
@@ -2,7 +2,7 @@
   {\mWater, \mFate}% Spheres
   {Wane}% Action
   {\distant, \duplicated}% Enhancements
-  {Deceit}% Skill
+  {\roll{Wits}{Academics}}% Resist with
   {\spellArea\ targets \spellRange\ away suffer -\arabic{spelllevel}~\glspl{ap}}% Description
   {
     The caster waves to people in the distance and calls out a confusing greeting.
diff --git a/spells/water1.tex b/spells/water1.tex
index c0fe0d94e1dbd9554da73dd1119cd8abe82805f7..7d197e25d2fd4f97def38953753d246313a1f6de 100644
--- a/spells/water1.tex
+++ b/spells/water1.tex
@@ -2,13 +2,13 @@
   {\mWater}% Spheres
   {Wane}% Action
   {}% Enhancements
-  {Seafaring}% Skill
+  {ambient temperature}% Resist with
   {up to a barrel of water turns into mist}% Description
   {
     Some body of liquid -- up to a barrel's worth -- instantly turns to mist, then quickly coalesces, soaking anything in the area.
 
     Torches struggle to keep aflame as an entire room can become soaked.
 
-    When cast on a mostly-liquid creature, such as oozes, this spell deals $1D6$ Damage.
+    When cast on a mostly-liquid creature, such as oozes, this spell deals \rollConv~Damage.
   }
 
diff --git a/spells/water2.tex b/spells/water2.tex
index 20c79b71b084858cb33b7e7ea79032407180ac76..32e6c1dd01d1a728437a86d37ed13c47df3552b9 100644
--- a/spells/water2.tex
+++ b/spells/water2.tex
@@ -2,7 +2,7 @@
   {\mWater}% Spheres
   {Warp}% Action
   {\duplicated}% Enhancements
-  {Academics}% Skill
+  {water's speed}% Resist with
   {\spellArea\ \arabic{spellArea} barrels' worth of water become acidic (2 Damage per round contact)}% Description
   {
     Up to \spellArea\ barrels' worth of water become acidic.
@@ -18,7 +18,7 @@
   {\mWater}% Spheres
   {Witness}% Action
   {\distant}% Enhancements
-  {Wyldcrafting}% Skill
+  {}% Resist with
   {caster detects liquid within \spellRange}% Description
   {
     The caster detects liquid within \spellRange, but nothing within a few steps of the caster.
diff --git a/stats.sty b/stats.sty
index d1c50e3378b2b762051c070778924df48ecc5eca..3de221b081bdeb61173494836b36bb7024ea3a16 100644
--- a/stats.sty
+++ b/stats.sty
@@ -60,6 +60,7 @@
 \newcommand{\equipment}{}
 \newcommand{\mods}{}
 
+
 % we calculate damage here because we can't display 1d6+6 damage - it has to turn into 2d6+2 damage.
 \newcommand{\dmg}[1]{%
   \ifnum\value{#1}<1 0\else%
diff --git a/test.tex b/test.tex
index 3ed5b29fc0a4712f7e4a42266869d923c73d7ce8..e0c03b100474124f49956c90f0ca7c8610029dbd 100644
--- a/test.tex
+++ b/test.tex
@@ -168,13 +168,13 @@ This section is non-verbose, so only basic stats are shown.
 
 \gnollshaman
 
-\shortSpells{fire1}
+\creatureSpells{fire1}
 
 \gnollshaman
 
-\shortSpells{fate1}
+\creatureSpells{fate1}
 
-\shortSpells{fate2}
+\creatureSpells{fate2}
 
 \end{multicols}