diff --git a/config.toml b/config.toml
deleted file mode 100644
index aa193623..00000000
--- a/config.toml
+++ /dev/null
@@ -1,110 +0,0 @@
-baseURL = "https://adityatelange.github.io/hugo-PaperMod/"
-title = "PaperMod"
-author = "Steve Francia"
-copyright = "Copyright © 2008–2019, Steve Francia and the Hugo Authors; all rights reserved."
-paginate = 3
-languageCode = "en"
-DefaultContentLanguage = "en"
-enableInlineShortcodes = true
-theme = "hugo-PaperMod"
-
-[params]
-  description = "Theme PaperMod - https://github.com/adityatelange/hugo-PaperMod"
-  author = "Theme PaperMod"
-  ShowReadingTime = true
-  SetThemeAuto = true
-  contentTypeName = "posts"
-  defaultTheme = "auto"
-  ShowShareButtons = true
-
-  [params.profileMode]
-  enabled = false
-  title = "PaperMod"
-  imageUrl = "#"
-  imageTitle = "my image"
-
-  [[params.profileMode.buttons]]
-  name = "Archives"
-  url = "archives"
-
-  [[params.profileMode.buttons]]
-  name = "Tags"
-  url = "tags"
-
-  [params.homeInfoParams]
-    Title = "Hi there 👋"
-    Content = "Welcome to my blog"
-
-  [[params.socialIcons]]
-  name = "twitter"
-  url = "#"
-
-  [[params.socialIcons]]
-  name = "stackoverflow"
-  url = "#"
-
-  [[params.socialIcons]]
-  name = "codepen"
-  url = "#"
-
-  [[params.socialIcons]]
-  name = "linkedin"
-  url = "#"
-
-  [[params.socialIcons]]
-  name = "github"
-  url = "#"
-
-[menu]
-
-  [[menu.main]]
-    name = "Archives"
-    url = "archives/"
-    weight = 5
-
-  [[menu.main]]
-    name = "Tags"
-    url = "tags/"
-    weight = 10
-
-  [[menu.main]]
-    name = "Series"
-    url = "series/"
-    weight = 15
-
-  [[menu.main]]
-    name = "Categories"
-    url = "categories/"
-    weight = 20
-
-[taxonomies]
-category = "categories"
-tag = "tags"
-series = "series"
-
-[privacy]
-
-  [privacy.vimeo]
-    disabled = false
-    simple = true
-
-  [privacy.twitter]
-    disabled = false
-    enableDNT = true
-    simple = true
-
-  [privacy.instagram]
-    disabled = false
-    simple = true
-
-  [privacy.youtube]
-    disabled = false
-    privacyEnhanced = true
-
-[services]
-
-  [services.instagram]
-    disableInlineCSS = true
-
-  [services.twitter]
-    disableInlineCSS = true
diff --git a/config.yml b/config.yml
new file mode 100644
index 00000000..eb87fcb3
--- /dev/null
+++ b/config.yml
@@ -0,0 +1,91 @@
+baseURL: 'https://adityatelange.github.io/hugo-PaperMod/'
+title: PaperMod
+author: Steve Francia
+copyright: >-
+  Copyright © 2008–2019, Steve Francia and the Hugo Authors; all rights
+  reserved.
+
+paginate: 3
+languageCode: en
+DefaultContentLanguage: en
+enableInlineShortcodes: true
+theme: hugo-PaperMod
+
+params:
+  description: 'Theme PaperMod - https://github.com/adityatelange/hugo-PaperMod'
+  author: Theme PaperMod
+  ShowReadingTime: true
+  SetThemeAuto: true
+  contentTypeName: posts
+  defaultTheme: auto
+  ShowShareButtons: true
+  profileMode:
+    enabled: false
+    title: PaperMod
+    imageUrl: '#'
+    imageTitle: my image
+    buttons:
+      - name: Archives
+        url: archives
+      - name: Tags
+        url: tags
+
+  homeInfoParams:
+    Title: "Hi there \U0001F44B"
+    Content: Welcome to my blog
+
+  socialIcons:
+    - name: twitter
+      url: '#'
+    - name: stackoverflow
+      url: '#'
+    - name: codepen
+      url: '#'
+    - name: linkedin
+      url: '#'
+    - name: github
+      url: '#'
+
+menu:
+  main:
+    - name: Archives
+      url: archives/
+      weight: 5
+    - name: Tags
+      url: tags/
+      weight: 10
+    - name: Series
+      url: series/
+      weight: 15
+    - name: Categories
+      url: categories/
+      weight: 20
+
+taxonomies:
+  category: categories
+  tag: tags
+  series: series
+
+privacy:
+  vimeo:
+    disabled: false
+    simple: true
+
+  twitter:
+    disabled: false
+    enableDNT: true
+    simple: true
+
+  instagram:
+    disabled: false
+    simple: true
+
+  youtube:
+    disabled: false
+    privacyEnhanced: true
+
+services:
+  instagram:
+    disableInlineCSS: true
+  twitter:
+    disableInlineCSS: true
diff --git a/configTaxo.toml b/configTaxo.toml
deleted file mode 100644
index 9220fcf6..00000000
--- a/configTaxo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-timeout = 30000
-enableInlineShortcodes = true
-
-[taxonomies]
-category = "categories"
-tag = "tags"
-series = "series"
-
-[privacy]
-
-  [privacy.vimeo]
-    disabled = false
-    simple = true
-
-  [privacy.twitter]
-    disabled = false
-    enableDNT = true
-    simple = true
-    disableInlineCSS = true
-
-  [privacy.instagram]
-    disabled = false
-    simple = true
-
-  [privacy.youtube]
-    disabled = false
-    privacyEnhanced = true
diff --git a/configTaxo.yml b/configTaxo.yml
new file mode 100644
index 00000000..a0337d2b
--- /dev/null
+++ b/configTaxo.yml
@@ -0,0 +1,26 @@
+timeout: 30000
+enableInlineShortcodes: true
+
+taxonomies:
+  category: categories
+  tag: tags
+  series: series
+
+privacy:
+  vimeo:
+    disabled: false
+    simple: true
+
+  twitter:
+    disabled: false
+    enableDNT: true
+    simple: true
+    disableInlineCSS: true
+
+  instagram:
+    disabled: false
+    simple: true
+
+  youtube:
+    disabled: false
+    privacyEnhanced: true