diff --git a/static/css/styles.css b/static/css/styles.css
index 593611f..082e198 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -15,4 +15,5 @@
     font-family: 'VG5000-Regular';
 
     content: "▒▒ 🐟 ▒ ▒▒▒ 🐙  ▒▒▒🏃  ▒▒☄▒ PAGE: " counter(page) " ▒ ▒▒▒▒ ⚡ ▒🔍▒  ☠ ▒ ▒▒▒";
-  }}@media print{body{background-color:#f2f6d5}.runningTopic{position:running(topic)}.topic{-webkit-column-break-before:page;-moz-column-break-before:page;break-before:page}.title-text{font-family:playfairdisplay regular,sans;font-size:4rem;color:#996561;margin-bottom:5rem}.title-pretext{font-family:vg5000-regular,sans;font-size:1.5rem;color:#996561}.topic-text{font-family:playfairdisplay regular,sans;font-size:2.25rem;color:#996561;margin-bottom:5rem}.topic-pretext{font-family:vg5000-regular,sans;font-size:1.5rem;color:#996561}.ddmenu{padding-top:4rem}article ul li:before{content:""}}@media(max-width:767px){.md\:flex-row{-webkit-box-orient:horizontal;-webkit-box-direction:normal;flex-direction:row}.md\:w-full{width:100%}}@media(min-width:768px){.lg\:flex{display:-webkit-box;display:flex}.lg\:static{position:static}.lg\:sticky{position:-webkit-sticky;position:sticky}.lg\:top-0{top:0}.lg\:w-2\/5{width:40%}.lg\:w-3\/5{width:60%}}
\ No newline at end of file
+  }}@page topic:first{@top{content: none;
+  }}@media print{body{background-color:#f2f6d5;color:#29102f}.runningTopic{position:running(topic)}.topic{-webkit-column-break-before:page;-moz-column-break-before:page;break-before:page;page:topic}.title-text{font-family:playfairdisplay regular,sans;font-size:4rem;color:#996561;margin-bottom:5rem}.title-pretext{font-family:vg5000-regular,sans;font-size:1.5rem;color:#996561}.topic-text{font-family:playfairdisplay regular,sans;font-size:2.25rem;color:#996561;margin-bottom:5rem}.topic-pretext{font-family:vg5000-regular,sans;font-size:1.5rem;color:#996561}.ddmenu{padding-top:4rem}article ul li:before{content:""}.toc::after{text-align:right;float:right;content:target-counter(attr(href url),page,decimal-leading-zero)}}@media(max-width:767px){.md\:flex-row{-webkit-box-orient:horizontal;-webkit-box-direction:normal;flex-direction:row}.md\:w-full{width:100%}}@media(min-width:768px){.lg\:flex{display:-webkit-box;display:flex}.lg\:static{position:static}.lg\:sticky{position:-webkit-sticky;position:sticky}.lg\:top-0{top:0}.lg\:w-2\/5{width:40%}.lg\:w-3\/5{width:60%}}
\ No newline at end of file
diff --git a/themes/piratecare/assets/css/print.css b/themes/piratecare/assets/css/print.css
index 68d73c6..a316c17 100644
--- a/themes/piratecare/assets/css/print.css
+++ b/themes/piratecare/assets/css/print.css
@@ -27,10 +27,15 @@
     }
 }
 
+@page topic:first {
+    @top {
+        content: none;
+    }
+}
 
 @media print {
     body {
-        @apply bg-CoconutCream;
+        @apply bg-CoconutCream text-Revolver;
     }
 
     .runningTopic {
@@ -39,6 +44,7 @@
 
     .topic {
         break-before: page;
+        page: topic;
     }
 
     .title-text {
@@ -63,4 +69,10 @@
     article ul li:before {
         content: "";
     }
+
+    .toc::after {
+        text-align: right;
+        float: right;
+        content: target-counter(attr(href url), page, decimal-leading-zero);
+    }
 }
diff --git a/themes/piratecare/layouts/print/list.html b/themes/piratecare/layouts/print/list.html
index 9b02b1b..a28e592 100644
--- a/themes/piratecare/layouts/print/list.html
+++ b/themes/piratecare/layouts/print/list.html
@@ -9,7 +9,7 @@
             <ul class="mt-4">
                 {{ range .Site.Home.Params.has_topics }}
                 {{ with $.GetPage (printf "%s%s" "/topic/" . ) }}
-                <li><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></li>
+                <li><a class="sidebar-list text-base toc" href="#{{ .File.BaseFileName }}">> {{ .Title }}</a></li>
                 {{ end }}
                 {{ end }}
             </ul>
@@ -19,10 +19,8 @@
 
 
 {{ range .Site.Home.Params.has_topics }}
-
-
 {{ with $.GetPage (printf "%s%s" "/topic/" . ) }}
-<div class="topic"><div class="runningTopic">topic ⦚ {{ .Title }}</div>
+<div class="topic" id="{{ .File.BaseFileName }}"><div class="runningTopic">topic ⦚ {{ .Title }}</div>
     <span class="topic-pretext">topic ⦚ </span><span class="topic-text pt-6">{{ .Title }}</span>
     <div class="ddmenu">
         <input id="toggly" type="checkbox">
@@ -31,7 +29,7 @@
             <ul class="mt-4">
                 {{ range .Params.has_sessions }}
                 {{ with $.GetPage (printf "%s%s" "/session/" . ) }}
-                <li><a class="sidebar-list text-base" href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">> {{ .Title }}</a></li>
+                <li><a class="sidebar-list text-base toc" href="#{{ .File.BaseFileName }}">> {{ .Title }}</a></li>
                 {{ end }}
                 {{ end }}
             </ul>
@@ -39,7 +37,16 @@
     </div>
 
 
-    <div>{{ .Content }} </div>
+    <div>{{ .Content }}</div>
+
+    {{ range .Params.has_sessions }}
+    {{ with $.GetPage (printf "%s%s" "/session/" . ) }}
+    <div class="topic" id="{{ .File.BaseFileName }}"><div class="runningTopic">session ⦚  {{ .Title }}</div>
+        <span class="topic-pretext">session ⦚ </span><span class="topic-text pt-6">{{ .Title }}</span>
+     <div>{{ .Content }} </div>
+    {{ end }}
+    {{ end }}
+
 {{ end }}
 
 {{ end }}