diff --git a/.gitmodules b/.gitmodules
index 50395675..2d24c239 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "themes/hugo-atom-feed"]
 	path = themes/hugo-atom-feed
 	url = https://github.com/kaushalmodi/hugo-atom-feed
+[submodule "themes/scientific-python-hugo-theme"]
+	path = themes/scientific-python-hugo-theme
+	url = https://github.com/scientific-python/scientific-python-hugo-theme
diff --git a/config.yaml b/config.yaml
index 1bd5f09e..07650cb9 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,13 +1,60 @@
-disableKinds:
-  - taxonomy
-theme:
-  - scientific-python-hugo-theme/themes/hugo-atom-feed
+baseURL: "https://example.com/"
+languageCode: "en-us"
+title: "Example Site"
+theme: scientific-python-hugo-theme
+relativeURLs: true
+disableKinds: ["taxonomy"]
+
+markup:
+  highlight:
+    noClasses: false
+  goldmark:
+    renderer:
+      unsafe: true
+    renderHooks:
+      link:
+        enableDefault: true
+
 params:
-  colorScheme: auto # can be auto (browser setting), light, or dark
+  author:
+    name: "Example Team"
+  description: "Example"
   images:
     - /images/logo.svg
-  navColor: blue
-  search: false
-  plausible:
-    dataDomain: null
-    javaScript: "https://views.scientific-python.org/js/script.js"
+  search: true
+  navbarlogo:
+    image: logo.svg
+    text: Scientific Python Hugo Theme
+    link: /
+  fonts:
+    - name: "Lato"
+      weights: [400, 900]
+  hero:
+    title: Example Site
+    image: logo.svg
+    buttontext: Get Started
+    buttonlink: "#"
+  navbar:
+    - title: User Guide
+      url: /
+  footer:
+    logo: logo.svg
+    socialmediatitle: ""
+    socialmedia:
+      - link: https://github.com/
+        icon: github
+
+    quicklinks:
+      column1:
+        title: ""
+        links:
+          - text: About
+            link: /
+          - text: Theme GitHub
+            link: https://github.com/scientific-python/scientific-python-hugo-theme
+      column2:
+        links:
+          - text: Scientific Python Forum
+            link: https://discuss.scientific-python.org
+      column3:
+        links:
diff --git a/content/_index.md b/content/_index.md
new file mode 100644
index 00000000..18b63196
--- /dev/null
+++ b/content/_index.md
@@ -0,0 +1,3 @@
+---
+title:
+---
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 074fefcc..4d7b8979 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,7 +6,7 @@
     {{ with .Params.canonicalURL -}}
     <link rel="canonical" href="{{ . }}">
     {{- end }}
-    <title>{{ block "title" . }}{{ .Site.Title }}{{ if not (eq .Site.Title .Title) }} - {{ .Title }}{{end}}{{ end }}</title>
+    <title>{{ block "title" . }}{{ .Site.Title }}{{ if .Title }} - {{ .Title }}{{ end }}{{ end }}</title>
 
     <!-- Render theme css -->
     {{ partial "css.html" . -}}
diff --git a/themes/scientific-python-hugo-theme b/themes/scientific-python-hugo-theme
new file mode 160000
index 00000000..1e3185e7
--- /dev/null
+++ b/themes/scientific-python-hugo-theme
@@ -0,0 +1 @@
+Subproject commit 1e3185e774da60d3a4a2d71fc2088d0413890cf4