diff --git a/hugo.toml b/hugo.toml
deleted file mode 100644
index b0315df..0000000
--- a/hugo.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-baseURL = "https://example.com/"
-
-[module]
-  [module.hugoVersion]
-    extended = false
-    min = "0.116.0"
diff --git a/hugo.yaml b/hugo.yaml
new file mode 100644
index 0000000..1710cae
--- /dev/null
+++ b/hugo.yaml
@@ -0,0 +1,11 @@
+markup:
+  goldmark:
+    parser:
+      wrapStandAloneImageWithinParagraph: false
+  highlight:
+    noClasses: false
+
+module:
+  hugoVersion:
+    extended: false
+    min: "0.116.0"
diff --git a/theme.toml b/theme.toml
deleted file mode 100644
index b4806c5..0000000
--- a/theme.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-name = "Erynwells.me Design System"
-description = "Theme description"
-homepage = "https://nutmeg.erynwells.me"
-tags = ["Design System"]
-features = ["Spacing", "Typography"]
-
-[author]
-  name = 'Eryn Wells'
-  homepage = 'https://erynwells.me'
diff --git a/theme.yaml b/theme.yaml
new file mode 100644
index 0000000..05b2ba9
--- /dev/null
+++ b/theme.yaml
@@ -0,0 +1,16 @@
+name: "Erynwells.me Design System"
+description: "Theme description"
+homepage: "https://nutmeg.erynwells.me"
+tags: ["Design System"]
+features: ["Spacing", "Typography"]
+
+author:
+  name: 'Eryn Wells'
+  homepage: 'https://erynwells.me'
+
+markup:
+  goldmark:
+    parser:
+      wrapStandAloneImageWithinParagraph: false
+  highlight:
+    noClasses: false