diff --git a/archetypes/default.md b/archetypes/default.md
deleted file mode 100644
index 00e77bd..0000000
--- a/archetypes/default.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "{{ replace .Name "-" " " | title }}"
-date: {{ .Date }}
-draft: true
----
-
diff --git a/themes/hugo-sustain/images/screenshot.png b/themes/hugo-sustain/images/screenshot.png
deleted file mode 100644
index 2f72814..0000000
Binary files a/themes/hugo-sustain/images/screenshot.png and /dev/null differ
diff --git a/themes/hugo-sustain/images/tn.png b/themes/hugo-sustain/images/tn.png
deleted file mode 100644
index e401ec3..0000000
Binary files a/themes/hugo-sustain/images/tn.png and /dev/null differ
diff --git a/layouts/partials/matomo.html b/themes/hugo-sustain/layouts/partials/matomo.html
similarity index 100%
rename from layouts/partials/matomo.html
rename to themes/hugo-sustain/layouts/partials/matomo.html
diff --git a/layouts/shortcodes/links.html b/themes/hugo-sustain/layouts/shortcodes/links.html
similarity index 100%
rename from layouts/shortcodes/links.html
rename to themes/hugo-sustain/layouts/shortcodes/links.html
diff --git a/layouts/sitemap.xml b/themes/hugo-sustain/layouts/sitemap.xml
similarity index 100%
rename from layouts/sitemap.xml
rename to themes/hugo-sustain/layouts/sitemap.xml
diff --git a/static/css/bootstrap-3.3.7.min.css b/themes/hugo-sustain/static/css/bootstrap-3.3.7.min.css
similarity index 100%
rename from static/css/bootstrap-3.3.7.min.css
rename to themes/hugo-sustain/static/css/bootstrap-3.3.7.min.css
diff --git a/static/css/custom.css b/themes/hugo-sustain/static/css/custom.css
similarity index 100%
rename from static/css/custom.css
rename to themes/hugo-sustain/static/css/custom.css
diff --git a/static/css/fontawesome/css/all.min.css b/themes/hugo-sustain/static/css/fontawesome/css/all.min.css
similarity index 100%
rename from static/css/fontawesome/css/all.min.css
rename to themes/hugo-sustain/static/css/fontawesome/css/all.min.css
diff --git a/static/css/fontawesome/webfonts/fa-brands-400.eot b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.eot
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-brands-400.eot
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.eot
diff --git a/static/css/fontawesome/webfonts/fa-brands-400.svg b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.svg
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-brands-400.svg
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.svg
diff --git a/static/css/fontawesome/webfonts/fa-brands-400.ttf b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.ttf
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-brands-400.ttf
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.ttf
diff --git a/static/css/fontawesome/webfonts/fa-brands-400.woff b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.woff
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-brands-400.woff
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.woff
diff --git a/static/css/fontawesome/webfonts/fa-brands-400.woff2 b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.woff2
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-brands-400.woff2
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-brands-400.woff2
diff --git a/static/css/fontawesome/webfonts/fa-regular-400.eot b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.eot
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-regular-400.eot
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.eot
diff --git a/static/css/fontawesome/webfonts/fa-regular-400.svg b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.svg
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-regular-400.svg
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.svg
diff --git a/static/css/fontawesome/webfonts/fa-regular-400.ttf b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.ttf
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-regular-400.ttf
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.ttf
diff --git a/static/css/fontawesome/webfonts/fa-regular-400.woff b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.woff
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-regular-400.woff
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.woff
diff --git a/static/css/fontawesome/webfonts/fa-regular-400.woff2 b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.woff2
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-regular-400.woff2
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-regular-400.woff2
diff --git a/static/css/fontawesome/webfonts/fa-solid-900.eot b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.eot
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-solid-900.eot
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.eot
diff --git a/static/css/fontawesome/webfonts/fa-solid-900.svg b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.svg
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-solid-900.svg
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.svg
diff --git a/static/css/fontawesome/webfonts/fa-solid-900.ttf b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.ttf
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-solid-900.ttf
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.ttf
diff --git a/static/css/fontawesome/webfonts/fa-solid-900.woff b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.woff
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-solid-900.woff
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.woff
diff --git a/static/css/fontawesome/webfonts/fa-solid-900.woff2 b/themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.woff2
similarity index 100%
rename from static/css/fontawesome/webfonts/fa-solid-900.woff2
rename to themes/hugo-sustain/static/css/fontawesome/webfonts/fa-solid-900.woff2
diff --git a/static/css/fonts.css b/themes/hugo-sustain/static/css/fonts.css
similarity index 100%
rename from static/css/fonts.css
rename to themes/hugo-sustain/static/css/fonts.css
diff --git a/static/css/tomorrow-9.7.0.min.css b/themes/hugo-sustain/static/css/tomorrow-9.7.0.min.css
similarity index 100%
rename from static/css/tomorrow-9.7.0.min.css
rename to themes/hugo-sustain/static/css/tomorrow-9.7.0.min.css
diff --git a/static/fonts/source-sans-pro-v11-latin-200.eot b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.eot
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-200.eot
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.eot
diff --git a/static/fonts/source-sans-pro-v11-latin-200.svg b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.svg
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-200.svg
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.svg
diff --git a/static/fonts/source-sans-pro-v11-latin-200.ttf b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.ttf
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-200.ttf
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.ttf
diff --git a/static/fonts/source-sans-pro-v11-latin-200.woff b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.woff
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-200.woff
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.woff
diff --git a/static/fonts/source-sans-pro-v11-latin-200.woff2 b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.woff2
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-200.woff2
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-200.woff2
diff --git a/static/fonts/source-sans-pro-v11-latin-regular.eot b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.eot
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-regular.eot
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.eot
diff --git a/static/fonts/source-sans-pro-v11-latin-regular.svg b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.svg
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-regular.svg
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.svg
diff --git a/static/fonts/source-sans-pro-v11-latin-regular.ttf b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.ttf
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-regular.ttf
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.ttf
diff --git a/static/fonts/source-sans-pro-v11-latin-regular.woff b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.woff
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-regular.woff
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.woff
diff --git a/static/fonts/source-sans-pro-v11-latin-regular.woff2 b/themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.woff2
similarity index 100%
rename from static/fonts/source-sans-pro-v11-latin-regular.woff2
rename to themes/hugo-sustain/static/fonts/source-sans-pro-v11-latin-regular.woff2
diff --git a/static/js/bootstrap-3.3.7.min.js b/themes/hugo-sustain/static/js/bootstrap-3.3.7.min.js
similarity index 100%
rename from static/js/bootstrap-3.3.7.min.js
rename to themes/hugo-sustain/static/js/bootstrap-3.3.7.min.js
diff --git a/static/js/highlight-9.7.0.min.js b/themes/hugo-sustain/static/js/highlight-9.7.0.min.js
similarity index 100%
rename from static/js/highlight-9.7.0.min.js
rename to themes/hugo-sustain/static/js/highlight-9.7.0.min.js
diff --git a/static/js/jquery-1.11.3.min.js b/themes/hugo-sustain/static/js/jquery-1.11.3.min.js
similarity index 100%
rename from static/js/jquery-1.11.3.min.js
rename to themes/hugo-sustain/static/js/jquery-1.11.3.min.js