diff --git a/.gitignore b/.gitignore
index 6e5b2b8..daa8953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,9 @@
 
 # Deploy script
 !deploy
+
+# Themes directory
+!themes/
+
+# Static directory
+!static/
diff --git a/.gitmodules b/.gitmodules
index 61a4db6..25ca8a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "themes/risotto"]
-	path = themes/risotto
-	url = https://github.com/joeroe/risotto.git
 [submodule "static/images/logo"]
 	path = static/images/logo
 	url = https://git.thurstylark.com/logo.git
+[submodule "themes/tlwiki"]
+	path = themes/tlwiki
+	url = gitea@git.thurstylark.com:thurstylark/tlwiki-hugo-theme.git
diff --git a/config.toml b/config.toml
index 8f64809..2121e7d 100644
--- a/config.toml
+++ b/config.toml
@@ -1,7 +1,7 @@
 baseURL = 'https://wiki.thurstylark.com/'
 languageCode = 'en-us'
 title = "TL Wiki"
-theme = "risotto"
+theme = "tlwiki"
 
 #sectionPagesMenu = "main"
 
diff --git a/themes/tlwiki b/themes/tlwiki
new file mode 160000
index 0000000..9ea510e
--- /dev/null
+++ b/themes/tlwiki
@@ -0,0 +1 @@
+Subproject commit 9ea510e1068431fec024716bfb4b3f848840683c