diff --git a/cc.tex b/cc.tex
index c4e6bb39eef430c1eae95dc1a7dd4b243fc7935b..e273598230f4168356483e2ececbaff6fb96697e 100644
--- a/cc.tex
+++ b/cc.tex
@@ -60,15 +60,10 @@ Otherwise, you fail.
 \noindent
 Character creation is random by default -- it helps new players get started quickly.
 
-\begin{table*}[t]
-
 \iftoggle{verbose}{
-\includegraphics[width=\textwidth]{images/Roch_Hercka/five_races.jpg}
-\label{roch:races}
+	\toppic{Roch_Hercka/five_races}{\label{roch:races}}
 }{}
 
-\end{table*}
-
 \racechart
 
 \iftoggle{verbose}{
diff --git a/combat.tex b/combat.tex
index bf1be2a024f9c787cf20f7960739283240f8c517..9dadb6f60ca8ad8032d5597c298fbc6d3c0a4e37 100644
--- a/combat.tex
+++ b/combat.tex
@@ -1440,10 +1440,7 @@ In all cases there is an optimal configuration which will itself depend upon the
 }{}
 
 \iftoggle{verbose}{
-\begin{figure*}[t]
-	\noindent\includegraphics[width=\linewidth]{images/Roch_Hercka/stances.jpg}
-	\label{roch:stances}
-\end{figure*}
+	\toppic{Roch_Hercka/stances}{\label{roch:stances}}
 }{}
 
 \end{multicols}
diff --git a/gods.tex b/gods.tex
index 9044e1917b5ca3f9ea24b4c887e43de20c9e7c6e..db5ef4b210318862e0e4b55e048a5c454a99a50f 100644
--- a/gods.tex
+++ b/gods.tex
@@ -530,8 +530,7 @@ The world is here to be lived, to be known, to be connected with. You want all t
 	
 	As luck would have it, she was a proficient medic, and helped patch Hugi back up, safely removing the arrow.
 	
-\includegraphics[width=\linewidth]{images/Boris_Pecikozic/dwarves_meet.jpg}
-\label{boris:meet}
+\pic{Boris_Pecikozic/dwarves_meet}{\label{boris:meet}}
 
 While all the players are thinking about the next move, the \gls{gm} adds up their \gls{xp}. They defeated 6 hobgoblins and 1 ogre. Hobgoblins and ogres are worth 7 each. There were seven in total, so that means 49 \gls{xp} in total, minus one \gls{xp} per member of the group. The final result is that each character receives 15 \gls{xp} and one more \gls{xp} is left in the pot for later (because 46 cannot evenly be divided by 3). After that, each player wants a little additional \gls{xp} for following their own God or codes.
 
diff --git a/rules.tex b/rules.tex
index 87b5a7a0b3c7305bdf897abdf9529c75d84a7b75..08c5743293abcdc3ac7e4cc8fb0f936563ea6b17 100644
--- a/rules.tex
+++ b/rules.tex
@@ -228,12 +228,7 @@ Someone attempting to impress a noble court might roll Charisma with the Tactics
 
 	The thatched roof on the nearby cottage rustled and Arneson instinctively drew his companions back. They turned and ran before their adversary could make his leap down to meet them with his axe. They ran as swiftly as they could into the safety of the darkness surrounding Casarenna but the hobgoblins stampeded fast behind them, running as swiftly as they could with guttural cries and war songs which Thenton could only guess translated to something about dinner.
 
-	\begin{wrapfigure}{r}{.3\textwidth}
-
-		\includegraphics[width=\linewidth]{images/Boris_Pecikozic/nura_jump.jpg}
-		\label{boris:jump}
-
-	\end{wrapfigure}
+	\sidepic{Boris_Pecikozic/nura_jump}{\label{boris:jump}}
 
 	A scurrying of agile, hungry feet filled the little muddy rows between houses. The trio looked about for an escape route. Unknown to them, one of the hobgoblins was meant to be keeping a lookout from the roof of the cottage on the edge of town. He observed them for a brief moment and then jumped off, axe in hand, ready to make up for all the meals he had missed while pretending to keep guard.
 	It was twenty long minutes of running before they were confident they were safe. Hugi and Thenton tenderly tried to regain their own breath while Arneson went to gather wood for a temporary shelter. Despite their distance from the village, they were kept awake by the wind bringing faint yet deep and reverberating songs from the village over to them all through the night.
@@ -603,8 +598,7 @@ Characters have a \gls{weightrating} equal to their \gls{hp}, so elves tend to h
 Items work similarly, with \gls{weightrating} between -4 (for very light items) and +11 (for wardrobes, carts, and boulders).
 
 \iftoggle{verbose}{
-	\noindent\includegraphics[width=\linewidth]{images/Roch_Hercka/dwarf_encumbrance.jpg}
-	\label{roch:dwarf}
+	\pic{Roch_Hercka/dwarf_encumbrance}{\label{roch:dwarf}}
 }{} 
 
 If an item's \gls{weightrating} is equal or below your character's Strength, you can lift it easily.
diff --git a/stories.tex b/stories.tex
index f4a991a27dc4ee37a8154c9d6f194c73bb9752a9..f404eb658c2bace6f7fe8804fdc7ad41fc60754d 100644
--- a/stories.tex
+++ b/stories.tex
@@ -1,15 +1,10 @@
 \chapter{Stories}\label{stories}\index{Stories}
 
 
-\begin{figure*}[b]
-
 \iftoggle{verbose}{
-\includesvg{images/Vladimir_Arabadzhi/escape}
-\label{vlad:stories}
+	\bottompic{Vladimir_Arabadzhi/escape}{\label{vlad:stories}}
 }{}
 
-\end{figure*}
-
 \begin{multicols}{2}
 
 \noindent