diff --git a/.gitmodules b/.gitmodules
index f9bc3ce..7da0ca1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "themes/hugo.386"]
 	path = themes/hugo.386
 	url = https://gitlab.com/jmfergeau/hugo.386
+[submodule "themes/poison"]
+	path = themes/poison
+	url = https://github.com/lukeorth/poison.git
diff --git a/archetypes/default.md b/archetypes/default.md
index c6f3fce..f358619 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,5 +1,12 @@
-+++
-title = '{{ replace .File.ContentBaseName "-" " " | title }}'
-date = {{ .Date }}
-draft = true
-+++
+---
+title: '{{ replace .File.ContentBaseName "-" " " | title }}'
+date: {{ .Date }}
+draft: true
+series: "Series name"
+categories:
+- Category A
+- Category B
+tags:
+- Tag A
+- Tag B
+---
diff --git a/content/post/HelloWorld.md b/content/posts/HelloWorld.md
similarity index 100%
rename from content/post/HelloWorld.md
rename to content/posts/HelloWorld.md
diff --git a/content/post/beercall/2023.md b/content/posts/beercall/2023.md
similarity index 100%
rename from content/post/beercall/2023.md
rename to content/posts/beercall/2023.md
diff --git a/content/post/beercall/2024.md b/content/posts/beercall/2024.md
similarity index 100%
rename from content/post/beercall/2024.md
rename to content/posts/beercall/2024.md
diff --git a/hugo.toml b/hugo-386.toml
similarity index 100%
rename from hugo.toml
rename to hugo-386.toml
diff --git a/hugo.yml b/hugo.yml
new file mode 100644
index 0000000..662d8dd
--- /dev/null
+++ b/hugo.yml
@@ -0,0 +1,78 @@
+---
+baseURL: https://mnw.sdf.org/blog/
+title: mnw.sdf.org
+languageCode: en
+DefaultContentLanguage: en
+theme: poison
+publishDir: /sdf/arpa/gm/m/mnw/html/blog
+preserveTaxonomyNames: true
+paginate: 10
+pluralizelisttitles: false
+params:
+  brand: Double Lunch Dispatch
+  brand_image: images/circular-me.png
+  description: There's still time to blog ...
+  dark_mode: true
+  favicon: favicon.ico
+  menu:
+    - Name: About
+      URL: /about
+      HasChildren: false
+    - Name: Posts
+      URL: /posts/
+      Pre: Recent
+      HasChildren: true
+      Limit: 5
+    - Name: Movies
+      URL: /movies/
+      Pre: Recent
+      HasChildren: true
+      Limit: 5
+    - Name: Beers
+      URL: /beers/
+      Pre: Recent
+      HasChildren: true
+      Limit: 5
+  email_url: https://keys.openpgp.org/search?q=mnw%40sdf.org
+  gitlab_url: https://git.sdf.org/mnw
+  mastodon_url: https://tilde.zone/@mnw
+  matrix_url: https://matrix.to/#/@mnw:envs.net
+  xmpp_url: xmpp:mnw@disroot.org?message;body=hi
+  rss_icon: true
+  rss_section: posts
+  moon_sun_background_color: "#515151"
+  moon_sun_color: "#FFF"
+  sidebar_a_color: "#FFF"
+  sidebar_bg_color: "#202020"
+  sidebar_h1_color: "#FFF"
+  sidebar_img_border_color: "#515151"
+  sidebar_p_color: "#909090"
+  sidebar_socials_color: "#FFF"
+  code_color: "#000"
+  code_background_color: "#E5E5E5"
+  code_block_color: "#FFF"
+  code_block_background_color: "#272822"
+  content_bg_color: "#FAF9F6"
+  date_color: "#515151"
+  link_color: "#268BD2"
+  list_color: "#5A5A5A"
+  post_title_color: "#303030"
+  table_border_color: "#E5E5E5"
+  table_stripe_color: "#F9F9F9"
+  text_color: "#222"
+  code_color_dark: "#FFF"
+  code_background_color_dark: "#515151"
+  code_block_color_dark: "#FFF"
+  code_block_background_color_dark: "#272822"
+  content_bg_color_dark: "#121212"
+  date_color_dark: "#9A9A9A"
+  link_color_dark: "#268BD2"
+  list_color_dark: "#9D9D9D"
+  post_title_color_dark: "#DBE2E9"
+  table_border_color_dark: "#515151"
+  table_stripe_color_dark: "#202020"
+  text_color_dark: "#EEE"
+taxonomies:
+  series: series
+  tags: tags
+
diff --git a/layouts/index.html b/stash/index.html
similarity index 100%
rename from layouts/index.html
rename to stash/index.html
diff --git a/static/images/circular-me.png b/static/images/circular-me.png
new file mode 100644
index 0000000..cc8d76b
Binary files /dev/null and b/static/images/circular-me.png differ
diff --git a/static/images/favion.ico b/static/images/favion.ico
new file mode 100644
index 0000000..f80a1b5
Binary files /dev/null and b/static/images/favion.ico differ
diff --git a/themes/poison b/themes/poison
new file mode 160000
index 0000000..07485e8
--- /dev/null
+++ b/themes/poison
@@ -0,0 +1 @@
+Subproject commit 07485e85f0247518bc64ed0cc6fd6b39abe3d90d