diff --git a/2-perception/xr-perception/2-method.tex b/2-perception/xr-perception/2-method.tex
index 3d87dd2..60eb727 100644
--- a/2-perception/xr-perception/2-method.tex
+++ b/2-perception/xr-perception/2-method.tex
@@ -54,10 +54,10 @@ The system is composed of three main components: the pose estimation of the trac
         (c) User exploring a virtual vibrotactile texture on a tangible sheet of paper.
     }
     \hidesubcaption
-    \subfig[0.325][]{method/device}
-    \subfig[0.65][]{method/headset}
+    \subfig[0.325]{method/device}[]
+    \subfig[0.65]{method/headset}[]
     \par\vspace{2.5pt}
-    \subfig[0.992][]{method/apparatus}
+    \subfig[0.992]{method/apparatus}[]
 \end{subfigs}
 
 A fiducial marker (AprilTag) is glued to the top of the actuator (see \figref{method/device}) to track the finger pose with a camera (StreamCam, Logitech) which is placed above the experimental setup and capturing \qtyproduct{1280 x 720}{px} images at \qty{60}{\hertz} (see \figref{method/apparatus}).
diff --git a/2-perception/xr-perception/3-experiment.tex b/2-perception/xr-perception/3-experiment.tex
index ea34509..eb922cb 100644
--- a/2-perception/xr-perception/3-experiment.tex
+++ b/2-perception/xr-perception/3-experiment.tex
@@ -17,9 +17,9 @@
         %The pictures are captured directly from the Microsoft HoloLens 2 headset.
     }
     \hidesubcaption
-    \subfig[0.32][]{experiment/real}
-    \subfig[0.32][]{experiment/mixed}
-    \subfig[0.32][]{experiment/virtual}
+    \subfig[0.32]{experiment/real}[]
+    \subfig[0.32]{experiment/mixed}[]
+    \subfig[0.32]{experiment/virtual}[]
 \end{subfigswide}
 
 Our visuo-haptic rendering system, described in \secref{method}, allows free exploration of virtual vibrotactile textures on tangible surfaces directly touched with the bare finger to simulate roughness augmentation, while the visual rendering of the hand and environment can be controlled to be in AR or VR.
diff --git a/2-perception/xr-perception/4-results.tex b/2-perception/xr-perception/4-results.tex
index 91b33ca..4ed775d 100644
--- a/2-perception/xr-perception/4-results.tex
+++ b/2-perception/xr-perception/4-results.tex
@@ -47,9 +47,9 @@ All pairwise differences were statistically significant.
         (c) Estimated just-noticeable difference (JND) of each visual rendering.
         %, defined as the minimum perceptual amplitude difference, \ie the sensitivity to vibrotactile roughness differences.
     }
-    \subfig[0.85][]{results/trial_predictions}\\
-    \subfig[0.45][]{results/trial_pses}
-    \subfig[0.45][]{results/trial_jnds}
+    \subfig[0.85]{results/trial_predictions}[]\\
+    \subfig[0.45]{results/trial_pses}[]
+    \subfig[0.45]{results/trial_jnds}[]
 \end{subfigs}
 
 
@@ -89,9 +89,9 @@ All pairwise differences were statistically significant: \level{Real} \vs \level
         %
         (b) Speed of the finger in a trial.
     }
-    \subfig[0.32][]{results/trial_response_times}
-    \subfig[0.32][]{results/trial_distances}
-    \subfig[0.32][]{results/trial_speeds}
+    \subfig[0.32]{results/trial_response_times}[]
+    \subfig[0.32]{results/trial_distances}[]
+    \subfig[0.32]{results/trial_speeds}[]
 \end{subfigs}
 
 
@@ -135,8 +135,8 @@ The vibrations were felt a slightly weak overall (\response{Vibration Strength},
 \begin{subfigs}{question_plots}{%
         Boxplots of responses to questions with significant differences and pairwise Wilcoxon signed-rank tests with Holm-Bonferroni adjustment: * is \pinf{0.05}, ** is \pinf{0.01} and *** is \pinf{0.001}.
     }
-    \subfig[0.24][]{results/questions_hand_ownership}
-    \subfig[0.24][]{results/questions_hand_latency}
-    \subfig[0.24][]{results/questions_hand_reference}
-    \subfig[0.24][]{results/questions_hand_distraction}
+    \subfig[0.24]{results/questions_hand_ownership}[]
+    \subfig[0.24]{results/questions_hand_latency}[]
+    \subfig[0.24]{results/questions_hand_reference}[]
+    \subfig[0.24]{results/questions_hand_distraction}[]
 \end{subfigs}
diff --git a/utils/commands.tex b/utils/commands.tex
index e0461cd..ac16289 100644
--- a/utils/commands.tex
+++ b/utils/commands.tex
@@ -49,8 +49,8 @@
 %% Sub-figures
 % example:
 % \begin{subfigs}{label}{Title}[Short title for list of figures]
-%   \subfig[1]{hands-none}[None]%
-%   \subfig[1]{hands-occlusion}[Occlusion]%
+%   \subfig{subfig1}%
+%   \subfig[1][htbp]{subfig2}[caption]%
 % \end{subfigs}
 % reference later with: \figref{label}
 \NewDocumentEnvironment{subfigs}{O{htbp} m m O{#3}}{%
@@ -71,11 +71,11 @@
     \end{figure*}%
 }
 
-\NewDocumentCommand{\subfig}{O{0.2} o O{b} m}{%
-    \IfValueTF{#2}{%
-        \subfloat[#2\label{fig:#4}]{\includegraphics[width=#1\linewidth,valign=#3]{#4}}%
+\NewDocumentCommand{\subfig}{O{0.2} O{b} m o}{%
+    \IfValueTF{#4}{%
+        \subfloat[#4\label{fig:#3}]{\includegraphics[width=#1\linewidth,valign=#2]{#3}}%
     }{%
-        \subfloat{\includegraphics[width=#1\linewidth,valign=#3]{#4}}%
+        \subfloat{\includegraphics[width=#1\linewidth,valign=#2]{#3}}%
     }%
     \hfill%
 }