diff --git a/static/css/site.css b/static/css/site.css
index 75e0c0e..5de9564 100644
--- a/static/css/site.css
+++ b/static/css/site.css
@@ -386,23 +386,6 @@ ul.menuitems {
   content: "Translations: ";
 }
 
-html[lang="de"] {
-  #pages:before {
-    content: "Seiten:";
-  }
-
-  #recent-articles:before {
-    content: "Neueste Artikel:";
-  }
-
-  #categories:before {
-    content: "Kategorien:";
-  }
-
-  #translations:before {
-    content: "Übersetzungen:";
-  }
-}
 
 .menuitems {
   list-style: none;
@@ -617,13 +600,16 @@ svg.injected-svg tspan {
   cursor: zoom-in;
 }
 
-.entry-content img~em{
+.entry-content img~em,
+.entry-content svg.injected-svg~em{
   display: block;
   margin: 0 auto 0 auto;
   text-align: center;
   font-style: normal;
 }
-.entry-content img~em:before {
+
+.entry-content img~em:before,
+.entry-content svg.injected-svg~em:before {
   content: 'Figure ' counter(figures) ': ';
   font-weight: bold;
 }
@@ -682,6 +668,10 @@ svg.injected-svg tspan {
   font-weight: bold;
 }
 
+.lightbox-overlay #lightbox-caption .fig-number:before {
+  content: 'Figure ' attr(data-num) ': ';
+}
+
 /* Fallback: Systemeinstellung, nur falls kein manueller Override gesetzt ist */
 @media (prefers-color-scheme: dark) {
   :root:not([data-theme]) .lightbox-overlay {
@@ -838,3 +828,39 @@ svg.injected-svg tspan {
 .footnotes {
   border-top: 1px solid hsl(0, 0%, 39%);
 }
+
+html[lang="de"] {
+  #pages:before {
+    content: "Seiten:";
+  }
+
+  #recent-articles:before {
+    content: "Neueste Artikel:";
+  }
+
+  #categories:before {
+    content: "Kategorien:";
+  }
+
+  #translations:before {
+    content: "Übersetzungen:";
+  }
+
+  .entry-content img~em:before,
+  .entry-content svg.injected-svg~em:before {
+    content: 'Abbildung ' counter(figures) ': ';
+  }
+
+  .entry-content table~p > em:before {
+    content: 'Tabelle ' counter(tables) ': ';
+  }
+
+  .entry-content table.highlighttable~p > em:before,
+  .entry-content div.highlight~p > em:before {
+    content: 'Liste ' counter(listings) ': ';
+  }
+
+  .lightbox-overlay #lightbox-caption .fig-number:before {
+    content: 'Abbildung ' attr(data-num) ': ';
+  }
+}
diff --git a/static/js/lightbox.js b/static/js/lightbox.js
index a1ad40d..76c9759 100644
--- a/static/js/lightbox.js
+++ b/static/js/lightbox.js
@@ -23,7 +23,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
   function setCaption(figureNumber, captionText) {
     overlayCaption.innerHTML = captionText
-      ? '<span class="fig-number">Figure ' + figureNumber + ':</span> ' + captionText
+      ? '<span class="fig-number" data-num="' + figureNumber + '"></span> ' + captionText
       : '';
   }
 
diff --git a/templates/base.html b/templates/base.html
index b8670d5..da0e4e5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,6 +11,9 @@
 
     <link rel="stylesheet" type="text/css" href="{{ main_siteurl | default(SITEURL) }}/theme/css/site.css" />
 
+    {% if EXTRA_HEAD %}
+      {{ EXTRA_HEAD | safe }}
+    {% endif %}
     {% if FEED_ALL_ATOM %}
     <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
     {% endif %}