diff --git a/layouts/datengarten/single.html b/layouts/datengarten/single.html
index aac49dc..6edd0d7 100644
--- a/layouts/datengarten/single.html
+++ b/layouts/datengarten/single.html
@@ -4,14 +4,12 @@
     <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
       <article role="main" class="blog-post">
         <article class="max-w-prose mx-auto">
-          <h1 class="text-2xl font-bold">{{ .Title }}</h1>
+          <h1 class="mt-5 text-4xl font-extrabold text-neutral-900 dark:text-neutral pb-4">{{ .Title }}</h1>
           {{ if .Params.subtitle }}
-          <h2 class="text-xl">{{ .Params.subtitle }}</h2>
+          <h2 class="text-xl opacity-70">{{ .Params.subtitle }}</h2>
           {{ end }}
           
-          <div class="mt-4 border p-4 bg-secondary-bg rounded">
-            {{ partial "talk-infobox" . }}
-          </div>
+          {{ partial "talk-infobox" . }}
           
           <div class="mt-4 content">
             {{ .Content }}
@@ -19,11 +17,18 @@
         </article>
 
         {{ if .Params.tags }}
-          <div class="blog-tags">
-            {{ range .Params.tags }}
-              <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
-            {{ end }}
-          </div><!--/.blog-tags-->
+        <div class="blog-tags max-w-prose mx-auto mt-4 flex flex-wrap gap-4 border-2 p-5 pt-7 mt-6 rounded-lg opacity-75 drop-shadow-md">
+          <p class="opacity-50">Tags:</p>
+          <br>
+          {{ range .Params.tags }}  
+          <a 
+              href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/"
+              class="inline-block px-3 py-1 rounded-lg text-sm font-semibold border-2 dark:bg-neutral-700 border-dotted shadow-lg shadow-blue-500/50"
+            >
+              {{ . }}
+            </a>
+          {{ end }}
+        </div>
         {{ end }}
 
         {{ if .Site.Params.socialShare }}
@@ -37,18 +42,31 @@
       </article><!--/.blog-post-->
 
       {{ if ne .Type "page" }}
-        <ul class="pager blog-pager">
-          {{ if .PrevInSection }}
-            <li class="previous">
-              <a href="{{ .PrevInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title }}">&larr; {{ i18n "previousPost" }}</a>
-            </li><!--/.previous-->
-          {{ end }}
-          {{ if .NextInSection }}
-            <li class="next">
-              <a href="{{ .NextInSection.Permalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title }}">{{ i18n "nextPost" }} &rarr;</a>
-            </li><!--/.next-->
-          {{ end }}
-        </ul><!--/.pager .blog-pager-->
+      <ul class="pager blog-pager flex justify-between items-center mt-6 list-none p-0">
+        {{ if .PrevInSection }}
+          <li class="previous">
+            <a 
+              href="{{ .PrevInSection.Permalink }}" 
+              class="inline-block px-4 py-2 text-lg font-semibold bg-neutral-200 dark:bg-neutral-700 rounded hover:bg-neutral-300 dark:hover:bg-neutral-600 transition-colors"
+              title="{{ .PrevInSection.Title }}"
+            >
+              &larr; {{ i18n "previousPost" }}
+            </a>
+          </li>
+        {{ end }}
+      
+        {{ if .NextInSection }}
+          <li class="next">
+            <a 
+              href="{{ .NextInSection.Permalink }}" 
+              class="inline-block px-4 py-2 text-lg font-semibold bg-neutral-200 dark:bg-neutral-700 rounded hover:bg-neutral-300 dark:hover:bg-neutral-600 transition-colors"
+              title="{{ .NextInSection.Title }}"
+            >
+              {{ i18n "nextPost" }} &rarr;
+            </a>
+          </li>
+        {{ end }}
+      </ul>
       {{ end }}
 
 
diff --git a/layouts/partials/talk-infobox.html b/layouts/partials/talk-infobox.html
index ea71a4b..e479722 100644
--- a/layouts/partials/talk-infobox.html
+++ b/layouts/partials/talk-infobox.html
@@ -1,4 +1,4 @@
-<p>
+<p class="mt-4 gap-4 border-2 p-5 pt-7 mt-6 rounded-lg shadow-lg opacity-75 drop-shadow-md">
 {{ if isset .Page.Params "speaker_url" }}
 <strong><i class="far fa-user fa-fw"></i></strong> <a href="{{ .Page.Params.Speaker_url }}">{{ .Page.Params.Speaker }}</a><br/>
 {{ else }}
@@ -11,14 +11,14 @@
 {{ with (eq $.Page.Params.Language "en") }}
 <strong><i class="fa fa-language fa-fw"></i>🌐 Language:</strong> Englisch/English<br/>
 {{ end }}
-<strong><i class="fa fa-map-marker fa-fw"></i>📍 Location:</strong> {{ partial "location" .Page.Params.Location }}
-</p>
+<strong><i class="fa fa-map-marker fa-fw"></i>📍 Location:</strong> {{ partial "location" .Page.Params.Location }}<br/>
 {{ if isset .Page.Params "recording" }}
-  <p><strong><i class="fa fa-video fa-fw"></i>📹 Livestream: </strong> <a href="{{ .Page.Params.Recording }}">{{ .Page.Params.Recording }}</a></p>
+  <strong><i class="hover:underline hover:decoration-primary-400 hover:text-primary-500"></i>📹 Livestream: </strong> <a href="{{ .Page.Params.Recording }}">{{ .Page.Params.Recording }}</a></p>
 {{ else }}
   {{ if and (eq .Page.Params.Streaming true) (not (isset .Page.Params "recording" )) }}
-    <p><strong>Stream:</strong> <a href="https://streaming.media.ccc.de/datengarten">streaming.media.ccc.de/datengarten</a></p>
+    <p><strong>Stream:</strong> <a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" href="https://streaming.media.ccc.de/datengarten">streaming.media.ccc.de/datengarten</a></p>
   {{ else }}
     <p><strong><i class="fa fa-exclamation-triangle fa-fw"></i></strong> Dieser Vortrag wird <strong>nicht</strong> gestreamed</a>! / This talk will <strong>not</strong> be streamed!</p>
   {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
+</p>
\ No newline at end of file