diff --git a/dist/full.tex b/dist/full.tex
index 36e67ae..74f6558 100644
--- a/dist/full.tex
+++ b/dist/full.tex
@@ -633,14 +633,14 @@
 % │               Counter numbering                │
 % └                                                ┘
 \newcommand{\preTableAndFigHook}[1]{%
-    \ifnum\value{numberingConfig}>1
-        \ifnum\value{numberSubsections}=1
-            \stepcounter{allss}
+    \ifnum\value{numberingConfig}>1%
+        \ifnum\value{numberSubsections}=1%
+            \stepcounter{allss}%
         \else
-            \ifnum\value{numberSubsections}=2
-                \stepcounter{allsss}
-            \else
-                \stepcounter{all}
+            \ifnum\value{numberSubsections}=2%
+                \stepcounter{allsss}%
+            \else%
+                \stepcounter{all}%
             \fi
         \fi
     \fi
@@ -651,8 +651,8 @@
 \newcommand{\applyTableAndFigureNumbering}{
     % Tables & Figures
     \ifnum\value{numberingConfig}=0
-        \renewcommand{\thetable}{}
-        \renewcommand{\thefigure}{}
+        \renewcommand{\thetable}{\arabic{table}}
+        \renewcommand{\thefigure}{\arabic{figure}}
     \else
         \ifnum\value{numberingConfig}=1
             \renewcommand{\thetable}{\sectionNumbering.\arabic{table}}
diff --git a/dist/most.tex b/dist/most.tex
index c02252b..ffc0485 100644
--- a/dist/most.tex
+++ b/dist/most.tex
@@ -633,14 +633,14 @@
 % │               Counter numbering                │
 % └                                                ┘
 \newcommand{\preTableAndFigHook}[1]{%
-    \ifnum\value{numberingConfig}>1
-        \ifnum\value{numberSubsections}=1
-            \stepcounter{allss}
+    \ifnum\value{numberingConfig}>1%
+        \ifnum\value{numberSubsections}=1%
+            \stepcounter{allss}%
         \else
-            \ifnum\value{numberSubsections}=2
-                \stepcounter{allsss}
-            \else
-                \stepcounter{all}
+            \ifnum\value{numberSubsections}=2%
+                \stepcounter{allsss}%
+            \else%
+                \stepcounter{all}%
             \fi
         \fi
     \fi
@@ -651,8 +651,8 @@
 \newcommand{\applyTableAndFigureNumbering}{
     % Tables & Figures
     \ifnum\value{numberingConfig}=0
-        \renewcommand{\thetable}{}
-        \renewcommand{\thefigure}{}
+        \renewcommand{\thetable}{\arabic{table}}
+        \renewcommand{\thefigure}{\arabic{figure}}
     \else
         \ifnum\value{numberingConfig}=1
             \renewcommand{\thetable}{\sectionNumbering.\arabic{table}}
diff --git a/dist/recommended.tex b/dist/recommended.tex
index 5a48388..47d85a9 100644
--- a/dist/recommended.tex
+++ b/dist/recommended.tex
@@ -633,14 +633,14 @@
 % │               Counter numbering                │
 % └                                                ┘
 \newcommand{\preTableAndFigHook}[1]{%
-    \ifnum\value{numberingConfig}>1
-        \ifnum\value{numberSubsections}=1
-            \stepcounter{allss}
+    \ifnum\value{numberingConfig}>1%
+        \ifnum\value{numberSubsections}=1%
+            \stepcounter{allss}%
         \else
-            \ifnum\value{numberSubsections}=2
-                \stepcounter{allsss}
-            \else
-                \stepcounter{all}
+            \ifnum\value{numberSubsections}=2%
+                \stepcounter{allsss}%
+            \else%
+                \stepcounter{all}%
             \fi
         \fi
     \fi
@@ -651,8 +651,8 @@
 \newcommand{\applyTableAndFigureNumbering}{
     % Tables & Figures
     \ifnum\value{numberingConfig}=0
-        \renewcommand{\thetable}{}
-        \renewcommand{\thefigure}{}
+        \renewcommand{\thetable}{\arabic{table}}
+        \renewcommand{\thefigure}{\arabic{figure}}
     \else
         \ifnum\value{numberingConfig}=1
             \renewcommand{\thetable}{\sectionNumbering.\arabic{table}}
diff --git a/main/style/counters.tex b/main/style/counters.tex
index b6524ac..8dc70ee 100644
--- a/main/style/counters.tex
+++ b/main/style/counters.tex
@@ -71,14 +71,14 @@
 % │               Counter numbering                │
 % └                                                ┘
 \newcommand{\preTableAndFigHook}[1]{%
-    \ifnum\value{numberingConfig}>1
-        \ifnum\value{numberSubsections}=1
-            \stepcounter{allss}
+    \ifnum\value{numberingConfig}>1%
+        \ifnum\value{numberSubsections}=1%
+            \stepcounter{allss}%
         \else
-            \ifnum\value{numberSubsections}=2
-                \stepcounter{allsss}
-            \else
-                \stepcounter{all}
+            \ifnum\value{numberSubsections}=2%
+                \stepcounter{allsss}%
+            \else%
+                \stepcounter{all}%
             \fi
         \fi
     \fi
@@ -89,8 +89,8 @@
 \newcommand{\applyTableAndFigureNumbering}{
     % Tables & Figures
     \ifnum\value{numberingConfig}=0
-        \renewcommand{\thetable}{}
-        \renewcommand{\thefigure}{}
+        \renewcommand{\thetable}{\arabic{table}}
+        \renewcommand{\thefigure}{\arabic{figure}}
     \else
         \ifnum\value{numberingConfig}=1
             \renewcommand{\thetable}{\sectionNumbering.\arabic{table}}