diff --git a/monsters.sty b/monsters.sty
index 8eb5950bb6ffc0b3dd1bfb1027b6fd4f75e56de6..5759f7e27fe2cb044fa91c5c0ea4c304f708ce99 100644
--- a/monsters.sty
+++ b/monsters.sty
@@ -2041,39 +2041,46 @@ Academics~1, \ifodd\value{r12} Crafts~\arabic{r2}, \else \fi Deceit~1, \ifodd\va
 }
 
 \newcommand{\archmage}[1][\npc{\E}{Archmage}]{
-  #1
-  \randomtwo
-  \addtocounter{enc}{3}
-  \randomtwoB
-    \addtocounter{r2b}{1}
-  \randomtwoD
-  \randomthree
-    \addtocounter{age}{1}
-  \randomthreeB
-  \randomthreeC
-  \randomfour 
-\person{-5}% STRENGTH
-{-2}% DEXTERITY 
-{0}% SPEED
-{{\arabic{enc}}% INTELLIGENCE
-{4}% WITS
-{-5}}% CHARISMA
-{0}% DR
-{0}% AGGRESSION
-{Projectiles~\arabic{r3}, Academics~3, Deceit~\arabic{r2}, Tactics~\arabic{r3b}, Xenomology~\arabic{r2b}
-  \Spheres{
-    Air~\arabic{r3}, Fate~\arabic{r3b}, Fire~\arabic{r3c}, %
-    \ifodd\value{r4}%
-      Earth~1, 
-    \else%
-      Water~\arabic{r2d}, %
-    \fi%
-  }}% SKILLS
-{None}% ABILITIES
-{
-  \setcounter{gold}{\value{age}}\multiply\value{gold} by 3\addtocounter{gold}{\value{Intelligence}}\setcounter{sp}{\value{gold}}%
-  \knacks{\snapcaster}
-}
+    #1
+    \randomtwo
+    \addtocounter{enc}{3}
+    \randomtwoB
+      \addtocounter{r2b}{1}
+    \randomtwoC
+      \setcounter{track}{\value{r2c}}
+      \stepcounter{track}
+    \randomtwoD
+    \randomthree
+      \addtocounter{age}{1}
+    \randomthreeB
+    \randomthreeC
+    \randomfour
+    \randomfourB
+  \person{-5}% STRENGTH
+  {-2}% DEXTERITY 
+  {0}% SPEED
+  {{\arabic{enc}}% INTELLIGENCE
+  {\arabic{r2b}}% WITS
+  {-4}}% CHARISMA
+  {0}% DR
+  {0}% AGGRESSION
+  {}% SKILLS
+  {None}% ABILITIES
+  {
+    \knacks{\snapcaster}
+
+    \setcounter{Deceit}{\value{r2b}}
+    \randomtwoC
+    \setcounter{Tactics}{\value{r2c}}
+    \setcounter{Xenomology}{\value{track}}
+
+    \multiply\value{track} by 2
+    \addtocounter{track}{-2}
+    \setcounter{Air}{\value{r2b}}
+    \setcounter{Fire}{\value{age}}
+    \setcounter{Water}{\value{track}}
+    \setcounter{Earth}{\value{r4b}}
+  }
 }
 
 \newcommand{\watcher}[1][\npc{\A}{Watcher}]{