diff --git a/.gitmodules b/.gitmodules
index 7b30435e0a492ec2dc6835a691b685d0aecbda51..f9054e1f42198c58ae38014d4516416c573e1552 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "themes/minimal"]
-	path = themes/minimal
-	url = https://github.com/calintat/minimal.git
+[submodule "themes/castellum"]
+	path = themes/castellum
+	url = https://git.mpib-berlin.mpg.de/castellum/castellum_hugo_theme.git
diff --git a/config.toml b/config.toml
index 9d24fedcbfd637d25f227bf97dce617464943c72..9f69624349952eb0721fa9fc47b825233e6a8d3b 100644
--- a/config.toml
+++ b/config.toml
@@ -1,33 +1,36 @@
 baseURL = "https://castellum.mpib.berlin/"
 languageCode = "en-us"
 title = "Castellum"
-theme = "minimal"
+theme = "castellum"
 
 DefaultContentLanguage = "en"
 enableRobotsTXT = true
 
 [[menu.main]]
-    url = "/"
-    name = "Home"
-    weight = 1
+  name = "Home"
+  url = "/"
+  weight = 1
+
+[[menu.main]]
+  name = "Contact"
+  url = "/contact/"
+  weight = 2
 
-[menu]
-  [[menu.main]]
-    name = "Contact"
-    url = "/contact/"
-    weight = 2
+[markup.goldmark.renderer]
+  unsafe = false
 
 [params]
   author = "Castellum Team"
-  description = "A Subject Database Meeting Data Protection Standards"
+  description = "Castellum - A Subject Database Meeting Data Protection Standards"
   favicon = "img/castellum-logo.png"
+  MathJax = false
   accent = "#2F5D77" # should match MPIB colors
   showBorder = true
   backgroundColor = "white"
-  highlight = true
-  highlightStyle = "solarized-light"
-  highlightLanguages = ["python", "html", "css", "javascript"]
+  highlight = false
   css = ["css/custom.css"]
+  copyright = true 
+  imprint = "/imprint/"
 
 [[menu.icon]]
   url = "mailto:goettel@mpib-berlin.mpg.de"
@@ -35,7 +38,7 @@ enableRobotsTXT = true
   weight = 1
 
 [[menu.icon]]
-  url = "https://git.mpib-berlin.mpg.de/castellum/castellum/"
+  url = "https://git.mpib-berlin.mpg.de/castellum"
   name = "fab fa-gitlab"
   weight = 2
 
diff --git a/layouts/partials/copyright.html b/layouts/partials/copyright.html
new file mode 100644
index 0000000000000000000000000000000000000000..34fcf892c281f68a50f3d3f486942f6193c4c0f8
--- /dev/null
+++ b/layouts/partials/copyright.html
@@ -0,0 +1,4 @@
+{{ with .Site.Params.imprint }}<a href="{{ . }}">Imprint</a>.{{ end }}
+&copy; Castellum Team at <a href="https://www.mpib-berlin.mpg.de/research-data/castellum">MPIB</a>. 
+Made with <a href="https://gohugo.io">Hugo <i class='fas fa-external-link-alt'></i></a>.
+    
\ No newline at end of file
diff --git a/themes/castellum b/themes/castellum
new file mode 160000
index 0000000000000000000000000000000000000000..15832e4dbea57fc6ddde3909826bb452b79fc355
--- /dev/null
+++ b/themes/castellum
@@ -0,0 +1 @@
+Subproject commit 15832e4dbea57fc6ddde3909826bb452b79fc355
diff --git a/themes/minimal b/themes/minimal
deleted file mode 160000
index 987f270dfee350c561a4c588724c8eae290aeaa8..0000000000000000000000000000000000000000
--- a/themes/minimal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 987f270dfee350c561a4c588724c8eae290aeaa8