3 files changed, 80 insertions, 20 deletions

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 69be8f7..aa39a42 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,13 +1,20 @@
 <!DOCTYPE html>
-<html lang="{{ .Site.LanguageCode | default `en` }}" class="scroll-smooth">
-    <head>
-    {{- partial "head.html" . -}}
-    </head>
-    <body class="max-w-screen-md px-10 mx-auto">
-        {{ partial "header.html" . }}
-        <main id="content">
-        {{- block "main" . }}{{- end }}
-        </main>
-        {{- partial "footer.html" . -}}
-    </body>
+<html lang="{{ .Site.LanguageCode | default `en` }}" class="scroll-smooth dark">
+  <head>
+    {{- partial "head/index" . -}}
+  </head>
+
+  <body class="max-w-screen-md mx-auto px-2.5">
+    <div class="header">
+      {{ partial "header/index" . }}
+      {{ partial "header/theme-button" . }}
+    </div>
+
+    <main id="content">
+      {{- block "main" . -}}
+      {{- end }}
+    </main>
+
+    {{- partial "footer/index" . -}}
+  </body>
 </html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 577852f..d366d53 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,17 +1,30 @@
 {{ define "main" }}
+
 {{ $pages := .Pages }}
-{{ $paginator := .Paginate $pages  }}
+{{ $paginator := .Paginate $pages }}
+
 <div class="flex flex-col gap-1">
-<h1 class="text-2xl font-extrabold">{{ if .Params.header }}{{ .Params.header }}{{ else }}{{ .Title }}{{ end }}</h1>
-{{ if .Content }}<p class="content text-lg text-gray-900">{{ .Content }}</p>{{ end }}
+  <h1 class="text-2xl font-extrabold">
+    {{ if .Params.header }}
+      {{ .Params.header }}
+    {{ else }}
+      {{ .Title }}
+      {{ end }}
+    </h1>
+  
+  {{ with .Content }}
+    {{ . }}
+  {{ end }}
 </div>
 
-<section class="py-10 flex flex-col gap-10 ">
-{{ range $index, $pages := $paginator.Pages }}
+<section class="flex flex-col gap-10">
+  {{ range $index, $pages := $paginator.Pages }}
     {{ partial "list/default" . }}
-{{ end }}
+  {{ end }}
 </section>
 
-{{ partial "list/components/pagination" . }}
+{{ if gt $paginator.TotalPages 1 }}
+  {{ partial "list/pagination" . }}
+{{ end }}
 
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 13aa7d0..80c3bee 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,3 +1,43 @@
 {{ define "main" }}
-{{ partial "single/default" . }}
-{{ end }}
\ No newline at end of file
+
+<article class="flex flex-col gap-10">
+  <header class="flex flex-col gap-2">
+    <h2 class="title-large">{{ .Title }}</h2>
+
+    <div class="meta">
+      {{/* Publish date */}}
+      <time datetime="{{ .PublishDate }}" title='{{ .PublishDate.Format "Mon, Jan 2, 2006, 3:04 PM MST" }}'>
+        {{ .PublishDate.Format "02/01/2006" }} - {{ printf (i18n "estimatedReadingTime") .ReadingTime }}
+      </time>
+
+      {{/* Categories */}} 
+      {{ with (.GetTerms "categories") }} — 
+        {{ range . }}
+          <a class="categories" href="{{ .RelPermalink }}" alt="{{ .LinkTitle }}">
+            {{ .LinkTitle }}
+          </a>
+        {{ end }} 
+      {{ end }}
+    </div>
+  </header>
+
+  {{ partial "single/table-of-contents" . }}
+
+  <section>{{ .Content | emojify }}</section>
+
+  {{ partial "single/comments/index" . }}
+
+  <footer>
+    {{ with (.GetTerms "tags") }}
+      <div class="pb-14 taxonomy-list tags-list">
+      {{ range . }}
+        <a href="{{ .RelPermalink }}" alt="{{ .LinkTitle }}">
+          {{ .LinkTitle }}
+        </a>
+      {{ end }}
+      </div>
+    {{ end }}
+  </footer>
+</article>
+
+{{ end }}