diff --git a/.gitmodules b/.gitmodules
index ce3490a..28a62c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "themes/hugo-coder"]
 	path = themes/hugo-coder
 	url = https://github.com/luizdepra/hugo-coder.git
+[submodule "themes/risotto"]
+	path = themes/risotto
+	url = https://github.com/joeroe/risotto
diff --git a/hugo.yaml b/hugo.yaml
index 116749c..df5984e 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -1,8 +1,9 @@
 ---
 baseURL: "https://pedini.dev"
-languageCode: "en-us"
+languageCode: "us"
+theme: "risotto"
 title: "Bryan Joshua Pedini"
-theme: "hugo-coder"
+copyright: "Copyright © 2019 Bryan Joshua Pedini - All Rights Reserved"
 
 markup:
   goldmark:
@@ -10,67 +11,42 @@ markup:
       hardWraps: true
 
 params:
-  author: "Bryan Joshua Pedini"
-  info: "FullStack Developer - Integration Manager - Cloud/PBX/Network/Docker Specialist - DevOps Enthusiast - Kubernetes/Ceph Apprentice"
-  description: "Bryan's personal website / blog"
-  keywords: "blog,personal,developer,networking,docker,devops,k8s,kubernetes"
-  gravatar: "bryan@pedini.dev"
-  since: 2019
-  commit: "https://git.bjphoster.com/source/pedini.dev/"
-  colorScheme: "dark"
+  theme:
+    palette: "base16-dark"
+  about:
+    title: "Bryan Joshua Pedini"
+    description: "Developer, Network Specialist, Cloud Architect, Right to Repair/Ownership Advocate, Self Employed."
+    logo_image: ""
+  #keywords: "blog,personal,developer,networking,docker,devops,k8s,kubernetes"
 
-  csp:
-    childsrc:
-      - self
-    fontsrc:
-      - self
-    formaction:
-      - self
-    framesrc:
-      - self
-    imgsrc:
-      - self
-    objectsrc:
-      - self
-    stylesrc:
-      - self
-    scriptsrc:
-      - self
-    connectsrc:
-      - self
-
-  social:
-    - name: "Git"
+  socialLinks:
+    - title: "Git"
       icon: "fa-brands fa-git fa-2x"
-      weight: 1
       url: "https://45r.it/bjphoster-git"
-    - name: "Instagram"
+    - title: "Instagram"
       icon: "fa-brands fa-instagram fa-2x"
-      weight: 2
       url: "https://45r.it/pedini-ig"
-    - name: "Telegram"
+    - title: "Telegram"
       icon: "fa-brands fa-telegram fa-2x"
-      weight: 3
       url: "https://45r.it/pedini-tg"
-    - name: "LinkedIn"
+    - title: "LinkedIn"
       icon: "fa-brands fa-linkedin fa-2x"
-      weight: 4
       url: "https://45r.it/pedini-li"
 
 menu:
   main:
     - name: "About me"
       weight: 1
-      url: "about/"
+      url: "/about/"
     - name: "Blog"
       weight: 2
-      url: "blog/"
-    - name: "Contacts"
+      url: "/blog/"
+    - name: "Contact"
       weight: 3
-      url: "contacts/"
+      url: "/contact/"
     - name: "Version"
       weight: 4
-      url: "version/"
+      url: "/version/"
 
 taxonomies:
   category: "categories"
diff --git a/makefile b/makefile
index 2184bec..48891ce 100644
--- a/makefile
+++ b/makefile
@@ -5,11 +5,11 @@ default: build
 prep:
 	git submodule foreach --recursive bash -c "git checkout \$$(git remote show origin | grep HEAD | sed 's/.*\: //'); git pull"
 
-build: prep
+build:
 	/usr/bin/env bash version.sh
 
 deploy:
 	/usr/bin/env bash deploy.sh
 
-run: prep
+run:
 	hugo server
diff --git a/themes/risotto b/themes/risotto
new file mode 160000
index 0000000..02f2872
--- /dev/null
+++ b/themes/risotto
@@ -0,0 +1 @@
+Subproject commit 02f2872a1809372582e60b37ffdb8274e0723416