diff --git a/charts.tex b/charts.tex
index cfc2de6a076781f95750b36f8073e5000cc35cbf..f9b3ef25d7e92691b24ffd6a1b7396c146444141 100644
--- a/charts.tex
+++ b/charts.tex
@@ -59,31 +59,30 @@
 
   \textbf{Name} & \textbf{Attack Bonus} & \textbf{Damage Bonus} & \textbf{\Glsfmtshort{ap} Cost} & \textbf{\Gls{weight}} \\\hline
 
-  \boulder \\
+  \showWeapon{\boulder} \\
 
-  \chair \\
+  \showWeapon{\chair} \\
 
-  \club \\
+  \showWeapon{\club} \\
 
-  \cudgel \\
+  \showWeapon{\cudgel} \\
 
-  \firepoker \\
+  \showWeapon{\firepoker} \\
 
-  \skillet \\
+  \showWeapon{\skillet} \\
 
-  \knife \\
+  \showWeapon{\knife} \\
 
-  \Log \\
+  \showWeapon{\Log} \\
 
-  \rock \\
+  \showWeapon{\rock} \\
 
-  \stick \\
+  \showWeapon{\stick} \\
 
-  \woodaxe \\
+  \showWeapon{\woodaxe} \\
 
   \end{nametable}
 
-
 }
 
 \newcommand{\weaponsChart}{
@@ -91,27 +90,27 @@
 
   \textbf{Name} & \textbf{Attack Bonus} & \textbf{Damage Bonus} & \textbf{\Glsfmtshort{ap} Cost} & \textbf{\Gls{weight}} \\\hline
 
-  \Dagger \\
+  \showWeapon{\Dagger} \\
 
-  \glaive \\
+  \showWeapon{\glaive} \\
 
-  \greataxe \\
+  \showWeapon{\greataxe} \\
 
-  \greatsword \\
+  \showWeapon{\greatsword} \\
 
-  \javelin \\
+  \showWeapon{\javelin} \\
 
-  \longsword \\
+  \showWeapon{\longsword} \\
 
-  \maul \\
+  \showWeapon{\maul} \\
 
-  \poleaxe \\
+  \showWeapon{\poleaxe} \\
 
-  \quarterstaff \\
+  \showWeapon{\quarterstaff} \\
 
-  \shortsword \\
+  \showWeapon{\shortsword} \\
 
-  \spear \\
+  \showWeapon{\spear} \\
 
   \end{nametable}
 }
@@ -121,15 +120,15 @@
 
   \textbf{Name} & \textbf{Attack Bonus} & \textbf{Damage Bonus} & \textbf{\Glsfmtshort{ap} Cost} & \textbf{\Gls{weight}} \\\hline
 
-  \greatclub \\
+  \showWeapon{\greatclub} \\
 
-  \giantsword \\
+  \showWeapon{\giantsword} \\
 
-  \rapier \\
+  \showWeapon{\rapier} \\
 
-  \warhammer \\
+  \showWeapon{\warhammer} \\
 
-  \whip \\
+  \showWeapon{\whip} \\
 
   \end{nametable}
 }
@@ -156,19 +155,19 @@
     \armour[\addtocounter{weight}{-1}]{Elvish Ceramic}{2}{2} & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
   \fi
 
-  \armour[\addtocounter{weight}{1}]{Padded Armour}{2}{2} & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour[\addtocounter{weight}{1}]{Padded Armour}{2}{2}} \\
 
-  \armour{Partial Leather}{3}{2} & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour{Partial Leather}{3}{2}} \\
 
-  \armour{Complete Leather}{3}{4}  & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour{Complete Leather}{3}{4}} \\
 
-  \armour{Partial Chain}{4}{2}  & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour{Partial Chain}{4}{2}}  \\
 
-  \armour{Complete Chain}{4}{4}  & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour{Complete Chain}{4}{4}} \\
 
-  \armour{Partial Plate}{5}{2}  & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour{Partial Plate}{5}{2}} \\
 
-  \armour{Complete Plate}{5}{4}  & \arabic{armourDR} & \arabic{covering} &  \arabic{weight} \\
+  \showArmour{\armour{Complete Plate}{5}{4}} \\
 
   \end{boxtable}
 
diff --git a/config b/config
index c812f3953e873381ab3386987fa5f663f09ccfd1..2d7c173142a79a0ed1b67c98dbb7c2c7cc1d983a 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit c812f3953e873381ab3386987fa5f663f09ccfd1
+Subproject commit 2d7c173142a79a0ed1b67c98dbb7c2c7cc1d983a
diff --git a/main.tex b/main.tex
index aff2b20b201fb4b81f25dd22851cd8f8139ddafd..009a4ff2621850cc1035d4a7374873b7bb75203a 100644
--- a/main.tex
+++ b/main.tex
@@ -3,7 +3,6 @@
 \date{}
 
 \usepackage{config/bind}
-\input{config/commands.tex}
 \input{charts.tex}
 
 \hypersetup{pdfinfo={