diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2c8976e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "themes/after-dark"]
+	path = themes/after-dark
+	url = https://git.habd.as/comfusion/after-dark.git
diff --git a/Caddyfile b/Caddyfile
deleted file mode 100644
index 43b3438..0000000
--- a/Caddyfile
+++ /dev/null
@@ -1,6 +0,0 @@
-:80
-
-root * /data
-file_server {
-	precompressed gzip
-}
diff --git a/Dockerfile b/Dockerfile
index 07f5f4e..e01b642 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-FROM klakegg/hugo:alpine as build
-# FROM klakegg/hugo:0.56.3-alpine as build
+FROM klakegg/hugo:0.56.3-alpine as build
 WORKDIR /usr/src/build
 COPY ./ ./
 RUN apk --no-cache add --update make
@@ -21,10 +20,8 @@ RUN hugo && \
 
 # Stage: Run
 
-FROM caddy
-# FROM nginx:alpine
-# RUN rm /usr/share/nginx/html/*
-COPY Caddyfile /etc/caddy/Caddyfile
-COPY ./.well-known/ /data/.well-known
-COPY --from=build /usr/src/build/public /data
+FROM nginx:alpine
+RUN rm /usr/share/nginx/html/*
+COPY --from=build /usr/src/build/public /usr/share/nginx/html/
+COPY ./.well-known/ /usr/share/nginx/html/.well-known
 EXPOSE 80
diff --git a/layouts/archive/single.html b/layouts/archive/single.html
index 82171a1..046ac2f 100644
--- a/layouts/archive/single.html
+++ b/layouts/archive/single.html
@@ -14,7 +14,7 @@
    {{ range .Pages }}
       <li>
         <span>{{ .Date.Format "02 Jan" }}</span>
-        <a href="{{ .Permalink }}" id="{{ .File.UniqueID }}" alt="{{ .Title }}">{{ .Title | markdownify }}</a>
+        <a href="{{ .Permalink }}" id="{{ .UniqueID }}" alt="{{ .Title }}">{{ .Title | markdownify }}</a>
       </li>
    {{ end }}
   </ul>
diff --git a/themes/after-dark b/themes/after-dark
index d20464c..93f4dea 160000
--- a/themes/after-dark
+++ b/themes/after-dark
@@ -1 +1 @@
-Subproject commit d20464c5c8ee00297f46ab729bfca4a12aaf4ba3
+Subproject commit 93f4deab3ab201856577ed2cc95cd6eb98e42ba2