diff --git a/hugo.toml b/hugo.toml
deleted file mode 100644
index 141f881..0000000
--- a/hugo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-baseURL = 'https://ctrlz.es/'
-languageCode = 'es-es'
-title = 'Control + Z'
-theme = 'clean'
-disableHugoGeneratorInject = true
-enableEmoji = true
-
-[params]
-  [params.contact]
-    name = 'Miguel de la Cruz'
-    email = 'mgdelacroix@gmail.com'
-    mastodon = 'https://social.ctrlz.es/@mgdelacroix'
-  [params.author]
-    name = 'Miguel de la Cruz'
-    email = 'mgdelacroix@gmail.com'
diff --git a/hugo.yaml b/hugo.yaml
new file mode 100644
index 0000000..2e6e40d
--- /dev/null
+++ b/hugo.yaml
@@ -0,0 +1,25 @@
+---
+baseURL: https://ctrlz.es/
+languageCode: es-es
+title: ControlZ
+theme: clean
+disableHugoGeneratorInject: true
+enableEmoji: true
+
+menus:
+  main:
+    - name: Inicio
+      pageRef: '/'
+      weight: 10
+    - name: Posts
+      pageRef: '/posts'
+      weight: 20
+
+params:
+  contact:
+    name: Miguel de la Cruz
+    email: mgdelacroix@gmail.com
+    mastodon: https://social.ctrlz.es/@mgdelacroix
+  author:
+    name: Miguel de la Cruz
+    email: mgdelacroix@gmail.com
diff --git a/themes/clean/hugo.toml b/themes/clean/hugo.toml
deleted file mode 100644
index 533e8de..0000000
--- a/themes/clean/hugo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-baseURL = 'https://example.org/'
-languageCode = 'en-us'
-title = 'My New Hugo Site'
-
-[[menus.main]]
-name = 'Principal'
-pageRef = '/'
-weight = 10
-
-[[menus.main]]
-name = 'Posts'
-pageRef = '/posts'
-weight = 20
-
-[[menus.main]]
-name = 'Etiquetas'
-pageRef = '/tags'
-weight = 30
-
-[module]
-  [module.hugoVersion]
-    extended = false
-    min = "0.116.0"
diff --git a/themes/clean/hugo.yaml b/themes/clean/hugo.yaml
new file mode 100644
index 0000000..cfbc38a
--- /dev/null
+++ b/themes/clean/hugo.yaml
@@ -0,0 +1,21 @@
+---
+baseURL: https://example.org/
+languageCode: en-us
+title: My New Hugo Site
+
+menus:
+  main:
+    - name: Home
+      pageRef: '/'
+      weight: 10
+    - name: Posts
+      pageRef: '/posts'
+      weight: 20
+    - name: Tags
+      pageRef: '/tags'
+      weight: 30
+
+module:
+  hugoVersion:
+    extended: false
+    min: "0.116.0"
diff --git a/themes/clean/theme.toml b/themes/clean/theme.toml
deleted file mode 100644
index c03ab05..0000000
--- a/themes/clean/theme.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-name = 'Clean'
-license = 'MIT'
-licenselink = 'https://github.com/owner/repo/LICENSE'
-description = 'A small theme for a small web'
-
-# The home page of the theme, where the source can be found
-homepage = 'https://github.com/owner/repo'
-
-# If you have a running demo of the theme
-demosite = 'https://owner.github.io/repo'
-
-# Taxonomy terms
-tags = ['blog', 'company']
-features = ['some', 'awesome', 'features']
-
-# If the theme has a single author
-[author]
-  name = 'Miguel de la Cruz'
-  homepage = 'https://ctrlz.es'
diff --git a/themes/clean/theme.yaml b/themes/clean/theme.yaml
new file mode 100644
index 0000000..e5bd0dd
--- /dev/null
+++ b/themes/clean/theme.yaml
@@ -0,0 +1,25 @@
+---
+name: Clean
+license: MIT
+licenselink: https://github.com/owner/repo/LICENSE
+description: A small theme for a small web
+
+# The home page of the theme, where the source can be found
+homepage: https://github.com/owner/repo
+
+# If you have a running demo of the theme
+demosite: https://owner.github.io/repo
+
+# Taxonomy terms
+tags:
+  - blog
+  - company
+features:
+  - some
+  - awesome
+  - features
+
+# If the theme has a single author
+author:
+  name: Miguel de la Cruz
+  homepage: https://ctrlz.es