diff --git a/theme/templates/includes/macros.html b/theme/templates/includes/macros.html
index cd09261..459087c 100644
--- a/theme/templates/includes/macros.html
+++ b/theme/templates/includes/macros.html
@@ -2,8 +2,8 @@
 {% macro fi(pic, link='', alt='', title='', credit='', credit_link='') %}
 <div class="featured-image">
   <figure>
-    {% if link %}<a href="{{ link }}"{% if title %} title="{{ title }}"{% endif %}>{% endif %}<img class="image-process-featured" src="{{ pic }}"{% if alt %} alt="{{ alt }}"{% endif %}/>{% if link %}</a>{% endif %}
-    {% if credit %}<figcaption>Bild: {% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
+    {% if link %}<a href="{{ link }}"{% if title %} title="{{ title | escape }}"{% endif %}>{% endif %}<img class="image-process-featured" src="{{ pic }}"{% if alt %} alt="{{ alt | escape}}"{% endif %}/>{% if link %}</a>{% endif %}
+    {% if credit %}<figcaption>Bild: {% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit | escape }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
   </figure>
 </div>
 {% endmacro %}
@@ -12,8 +12,8 @@
 {% macro ci(pic, link='', alt='', title='', credit='', credit_link='') %}
 <div class="card-image">
   <figure>
-    {% if link %}<a href="{{ link }}"{% if title %} title="{{ title }}"{% endif %}>{% endif %}<img class="image-process-card" src="{{ pic }}"{% if alt %} alt="{{ alt }}"{% endif %}/>{% if link %}</a>{% endif %}
-    {% if credit %}<figcaption>Bild: {% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
+    {% if link %}<a href="{{ link }}"{% if title %} title="{{ title | escape }}"{% endif %}>{% endif %}<img class="image-process-card" src="{{ pic }}"{% if alt %} alt="{{ alt | escape }}"{% endif %}/>{% if link %}</a>{% endif %}
+    {% if credit %}<figcaption>Bild: {% if credit_link %}<a href="{{ credit_link }}" alt="Bildquelle: {{ credit | escape }}" target="_blank">{% endif %}{{ credit }}{% if credit_link %}</a>{% endif %}</figcaption>{% endif %}
   </figure>
 </div>
 {% endmacro %}
diff --git a/theme/templates/includes/timestamp.html b/theme/templates/includes/timestamp.html
index 6cc740e..1e52f86 100644
--- a/theme/templates/includes/timestamp.html
+++ b/theme/templates/includes/timestamp.html
@@ -1,2 +1,2 @@
 {% set t = [ pages | map(attribute="modified") | list | max , articles | map(attribute="modified") | list | max ] | max %}
-<p>Letzte Aktualisierung dieser Webseite: {{ t.strftime("%d.%m.%Y") }}</p>
+<p>Letzte Aktualisierung dieser Webseite: {{ t.strftime("%d.%m.%Y um %H:%M") }}</p>