diff --git a/themes/piratecare/layouts/_default/_markup/render-image.html b/themes/piratecare/layouts/_default/_markup/render-image.html
index fea1987..a590de9 100644
--- a/themes/piratecare/layouts/_default/_markup/render-image.html
+++ b/themes/piratecare/layouts/_default/_markup/render-image.html
@@ -16,24 +16,24 @@
     {{ if $.Page.Site.GetPage $s_destination }}
         {{ $session := $.Page.Site.GetPage $s_destination }}
         {{ if not $text_link }}
-            <a href="/session/{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $session.Title}} title="{{ $session.Title }}"{{ end }}>{{ $session.Title }}</a>
+            <a href="{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $session.Title}} title="{{ $session.Title }}"{{ end }}>{{ $session.Title }}</a>
         {{ else }}
-            <a href="/session/{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
+            <a href="{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
         {{ end }}
     {{ else }}
-            <a href="/session/{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $text_link }}⦚<span class="text-xs font-bold p-1 bg-AuChico text-CoconutCream">session:{{ $s_destination }} not found</span></a>
+            <a href="{{ $s_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $text_link }}⦚<span class="text-xs font-bold p-1 bg-AuChico text-CoconutCream">session:{{ $s_destination }} not found</span></a>
     {{ end }}
 {{ else if strings.HasPrefix .Destination "topic:" }}
     {{ $t_destination := printf "/topic/%s" (substr .Destination 6) }}
     {{ if $.Page.Site.GetPage $t_destination }}
         {{ $topic := $.Page.Site.GetPage $t_destination }}
         {{ if not $text_link }}
-            <a href="/topic/{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $topic.Title}} title="{{ $topic.Title }}"{{ end }}>{{ $topic.Title }}</a>
+            <a href="{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with $topic.Title}} title="{{ $topic.Title }}"{{ end }}>{{ $topic.Title }}</a>
         {{ else }}
-            <a href="/topic/{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
+            <a href="{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}"{{ with .Title}} title="{{ . }}"{{ end }}>{{ $text_link }}</a>
         {{ end }}
     {{ else }}
-            <a href="/topic/{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $text_link }}⦚<span class="text-xs font-bold p-1 bg-AuChico text-CoconutCream">topic:{{ $t_destination }} not found</span></a>
+            <a href="{{ $t_destination }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $text_link }}⦚<span class="text-xs font-bold p-1 bg-AuChico text-CoconutCream">topic:{{ $t_destination }} not found</span></a>
     {{ end }}
 {{ else if findRE "^.*static" .Destination }}
   <img src="{{ (replaceRE "^.*static" "" .Destination ) | safeURL }}" alt="{{ .Text }}" {{ with .Title}} title="{{ . }}"{{ end }} />
diff --git a/themes/piratecare/layouts/partials/head.html b/themes/piratecare/layouts/partials/head.html
index 2f174df..fff194a 100644
--- a/themes/piratecare/layouts/partials/head.html
+++ b/themes/piratecare/layouts/partials/head.html
@@ -1,25 +1,28 @@
-<title>{{ block "title" . }}
-    {{- .Title }} - {{ .Site.Title -}}
-    {{ end }}</title>
+<head>
+    <meta charset="utf-8" />
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="theme-color" content="#ffffff">
 
-<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-<link rel="manifest" href="/site.webmanifest">
-<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
-<meta name="msapplication-TileColor" content="#da532c">
-<meta name="theme-color" content="#ffffff">
+    {{ if .Description }}
+    <meta name="description" content="{{ .Description }}" />
+    {{ end }}
+    {{ if .Keywords }}
+    <meta name="keywords" content="{{ delimit .Keywords "," }}" />
+    {{ end }}
+    {{ if .Params.Author }}
+    <meta name="author" content="{{ .Params.Author}}" />
+    {{ end }}
 
-<meta charset="utf-8" />
-{{ if .Description }}
-<meta name="description" content="{{ .Description }}" />
-{{ end }}
-{{ if .Keywords }}
-<meta name="keywords" content="{{ delimit .Keywords "," }}" />
-{{ end }}
-{{ if .Params.Author }}
-<meta name="author" content="{{ .Params.Author}}" />
-{{ end }}
-{{ template "_internal/opengraph.html" . }}
-{{ template "_internal/twitter_cards.html" . }}
-{{ hugo.Generator }}
+    {{ template "_internal/opengraph.html" . }}
+    {{ template "_internal/twitter_cards.html" . }}
+
+    {{ hugo.Generator }}
+
+    <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#996561">
+
+    <title>{{ block "title" . }}{{- .Title }} - {{ .Site.Title -}}{{ end }}</title>
+</head>
