diff --git a/.gitmodules b/.gitmodules
index 1abf123..90d5b0b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "themes/huell"]
-	path = themes/huell
-	url = https://git.karaolidis.com/karaolidis/huell.git
+[submodule "themes/caldwell"]
+	path = themes/caldwell
+	url = https://git.karaolidis.com/karaolidis/caldwell.git
diff --git a/Makefile b/Makefile
index 293e132..11cd5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,18 @@
-THEME := themes/huell
+.PHONY: all theme hugo dev clean
 
-.PHONY: all theme hugo
+THEME := themes/caldwell
 
-all: theme hugo
+all: hugo
 
 theme:
 	cd $(THEME) && \
 	nix develop --command make
 
-hugo:
+hugo: theme
 	hugo
+
+dev: theme
+	hugo server -D --disableFastRender
+
+clean:
+	rm -rf public resources/_gen assets/jsconfig.json hugo_stats.json .hugo_build.lock
diff --git a/hugo.toml b/hugo.toml
index 2963fb6..6c78cef 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -1,21 +1,24 @@
 baseURL = 'https://www.karaolidis.com/'
 languageCode = 'en-us'
 title = 'Jupiter Lab'
-theme = 'huell'
+theme = 'caldwell'
 
-[params]
-prompt = "jupiter-lab"
-titleCutting = true
-animateStyle = "animated slideInUp fast"
-
-[[params.navlinks]]
-name = "posts/"
+[[params.navigation]]
+name = "Blog"
 url = "/"
 
-[[params.navlinks]]
-name = "photos/"
-url = "photos/"
+[[params.navigation]]
+name = "Portfolio"
+url = "/photos/"
 
-[[params.navlinks]]
-name = "about/"
-url = "about/"
+[[params.navigation]]
+name = "About"
+url = "/about/"
+
+[[params.footer]]
+name = "Contact"
+url = "mailto:nick@karaolidis.com"
+
+[[params.footer]]
+name = "Socials"
+url = "https://social.karaolidis.com"
diff --git a/node_modules b/node_modules
new file mode 120000
index 0000000..5919126
--- /dev/null
+++ b/node_modules
@@ -0,0 +1 @@
+./themes/caldwell/node_modules
\ No newline at end of file
diff --git a/themes/caldwell b/themes/caldwell
new file mode 160000
index 0000000..d9dcea0
--- /dev/null
+++ b/themes/caldwell
@@ -0,0 +1 @@
+Subproject commit d9dcea0e41e08c7fce550fb8caf1979c729263f8
diff --git a/themes/huell b/themes/huell
deleted file mode 160000
index 1f49f0e..0000000
--- a/themes/huell
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f49f0ee88a75f16de144c1c8fbe92452b5382cb