diff --git a/actions.tex b/actions.tex
index 50ab6674242707fbc304ef0ea0e2c83e7f2973f2..1858a48793fe501aa05e78b454aa6224926b9bd1 100644
--- a/actions.tex
+++ b/actions.tex
@@ -11,7 +11,7 @@
 \newcommand{\TNChart}{
 
   \noindent
-  \begin{tabularx}{\linewidth}{cY}
+  \begin{boxtable}
 
     \textbf{\glsentrytext{tn}} & \textbf{Task} \\\hline
 
@@ -35,7 +35,7 @@
 
     20 & Implausible \\
 
-  \end{tabularx}
+  \end{boxtable}
 }
 
 \subsection{Basic Actions}
@@ -97,9 +97,9 @@ When many characters are trying to do the same task, a single roll is made, and
   Everyone wants to kick in the door, the \gls{tn} is 10, and the roll uses Strength + Crafts.
     \begin{itemize}
     \item
-    Alicia's player rolls the dice. Her Strength + Crafts Bonus is 0, so she fails.
+    Pikerudd's player rolls the dice. Her Strength + Crafts Bonus is 0, so she fails.
     \item
-    Snowstorm's Strength + Crafts total is +2, so his total is 9, and he also fails.
+    Snowblight's Strength + Crafts total is +2, so his total is 9, and he also fails.
     \item
     Chatrik's Strength + Crafts total is +4, so her total is 11 -- she succeeds.
     \end{itemize}
@@ -110,9 +110,9 @@ When many characters are trying to do the same task, a single roll is made, and
     \item
     Water is filling the area, so time will be lost if they get muddled.
     \item
-    Everyone rolls, and the highest result is Kraal's -- but he only equals the \gls{tn}.
+    Everyone rolls, and the highest result is Dzo's -- but he only equals the \gls{tn}.
     \item
-    Kraal's player decides to guess left, rather let his companions think about the song for another moment.
+    Dzo's player decides to guess left, rather let his companions think about the song for another moment.
     They fail, but avoid wasting time.
     \end{itemize}
 \end{itemize}
@@ -216,15 +216,15 @@ Convincing the townsfolk that they need to rebel against the baron, and could ea
 
 \noindent%
 \begin{footnotesize}%
-  \begin{tabularx}{\linewidth}{Y |cccc}
-                      & Alicia & Snowstorm & Chatrik & Drake \\
+  \begin{boxtable}[Y |cccc]
+                      & Pikerudd & Snowblight & Chatrik & Drake \\
   \hline
   Charisma + Tactics: &  +3     & $+\frac{3}{2}$      & $+\frac{2}{4}$      & $+\frac{1}{8}$    \\
   Roll Bonus:         &  +3     &     +2               &       +1             &  0 \\
   \hline
   Running Total:      &  +3     &     +5              &  +6     & +6    \\
     \multicolumn{4}{l}{\textbf{6}} \\
-  \end{tabularx}
+  \end{boxtable}
 \end{footnotesize}
 
 \subsection{Margins}
diff --git a/systems.tex b/systems.tex
index 75c461d828ecac5be325d79c113bd685eaafee34..afff8950999f9e20519a9563651a4fabb24cfae0 100644
--- a/systems.tex
+++ b/systems.tex
@@ -239,7 +239,7 @@ And speaking of rolls, let's start with dice stats, and why `7' is the magic num
 \vspace{10pt}
 \noindent
 \begin{scriptsize}%
-\begin{tabularx}{\linewidth}{clXX}
+\begin{boxtable}[clXX]
 
   \hline
   \textbf{Roll} & \textbf{Combinations} & \textbf{Chance} & \textbf{or Greater} \\\hline
@@ -255,7 +255,7 @@ And speaking of rolls, let's start with dice stats, and why `7' is the magic num
   11 & \epsdice{5}\epsdice{6} \epsdice{6}\epsdice{5} & 5.56\% & 8.33\% \\
   12 & \epsdice{6}\epsdice{6} & 2.78\% & 2.78\% \\
 
-\end{tabularx}
+\end{boxtable}
 \end{scriptsize}
 
 \paragraph{Always round up} -- whether someone is helping another character with half their Bonus, or combat calls for half Damage, or just any time someone divides a number, they round up at 0.5.
@@ -324,11 +324,11 @@ Mechanically, the same roll has occurred in each instance.
 
 \end{multicols}
 
-\begin{tabularx}{\linewidth}{Lccccccccccc}
+\begin{boxtable}[Lccccccccccc]
   \roll{Speed}{Athletics}, \tn[9] & Fail & Fail & Fail & Fail & Draw & Win & Win & Win & Win & Win & Win \\
   & \rollDice{2} & \rollDice{3} & \rollDice{4} & \rollDice{5} & \rollDice{6} & \rollDice{7} & \rollDice{8} & \rollDice{9} & \rollDice{10} & \rollDice{11} & \rollDice{12} \\
   \roll{Dexterity}{Projectiles}, \tn[10] & Fail & Fail & Fail & Fail & Fail & Fail & Draw & Win & Win & Win & Win \\
-\end{tabularx}
+\end{boxtable}
 
 \section[Social Rolls]{Roll Before You Roleplay}
 
diff --git a/traits.tex b/traits.tex
index 160815aa1ef8a0eca4fdfb7f2baf5ff99c67faf1..37928a07f73de536f9849cd876b026bbd1b47b7f 100644
--- a/traits.tex
+++ b/traits.tex
@@ -79,13 +79,7 @@ Charisma also covers characters' luck, and therefore some measure of their abili
 
 \begin{figure*}[t]
 
-\begin{tcolorbox}[
-  tabularx={>{\small}c||>{\small}X|>{\small}X|>{\small}X|>{\small}X|>{\small}X|>{\small}X},
-  ornamented,
-  top=10pt,
-  bottom=10pt
-  ]
-\tiny\raggedright
+\begin{boxtable}[L||L|L|L|L|L|L]
 
 & Strength & Dexterity & Speed & Intelligence & Wits & Charisma \\\hline\hline
 Academics & Orating to a massive crowd & Forgery & Courier Runs & Recalling facts & Resisting an enchantment spell & Storytelling \\\hline
@@ -95,7 +89,7 @@ Stealth & Hiding in a hay bail & Moving quietly & Escaping into a crowd & Identi
 Vigilance & Keeping watch all night & Feeling for an exit in the dark & Searching a full forest for a particular tree & Investigating a crime scene & Spotting an illusion spell & Finding the best con target at a banquet \\
 Wyldcrafting & Wrestling a~boar & Untying a~horse's bridle & Fleeing a stampede & Planning a new, hidden trail & Foraging for a quick meal & Selling vegetables \\\hline
 
-\end{tcolorbox}
+\end{boxtable}
 
 \end{figure*}
 
@@ -181,7 +175,7 @@ Academics study history, architecture, local politics, literature, and (very com
 This `study of study', can involve reading, mnemonics, and teaching.
 
 \sidebox{
-  \begin{tabularx}{\linewidth}{Yc}
+  \begin{boxtable}
 
     \hline
     \textbf{\glsentrytext{tn}} & \textbf{Question} \\\hline
@@ -196,8 +190,7 @@ This `study of study', can involve reading, mnemonics, and teaching.
 
     17 & Dangerous \\
 
-  \end{tabularx}
-
+  \end{boxtable}
 }
 
 \begin{description}