diff --git a/exampleSite/config/_default/config.yaml b/exampleSite/config/_default/hugo.yaml
similarity index 95%
rename from exampleSite/config/_default/config.yaml
rename to exampleSite/config/_default/hugo.yaml
index 79c99c81f..94776ad01 100644
--- a/exampleSite/config/_default/config.yaml
+++ b/exampleSite/config/_default/hugo.yaml
@@ -19,9 +19,6 @@ module:
     - source: node_modules/mathjax/es5/output/chtml/fonts/woff-v2
       target: static/mathjax/es5/output/chtml/fonts/woff-v2
 
-# googleAnalytics: UA-123-45
-disqusShortname: hugothemeiris
-
 paginate: 3
 canonifyURLs: true
 enableRobotsTXT: true
@@ -35,6 +32,12 @@ enableEmoji: true
 enableGitInfo: true
 enableInlineShortcodes: true
 
+services:
+  # googleAnalytics
+    # id: G-XXXXXXXXX
+  disqus:
+    shortname: hugothemeiris
+
 taxonomies: {}
 #   - tag: tags
 
diff --git a/exampleSite/config/production/config.yaml b/exampleSite/config/production/hugo.yaml
similarity index 100%
rename from exampleSite/config/production/config.yaml
rename to exampleSite/config/production/hugo.yaml
diff --git a/exampleSite/config/staging/config.yaml b/exampleSite/config/staging/hugo.yaml
similarity index 100%
rename from exampleSite/config/staging/config.yaml
rename to exampleSite/config/staging/hugo.yaml
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 683f97ddf..7708304b9 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -17,7 +17,7 @@
     </section>
   {{ end }}
 
-  {{ if $.Site.DisqusShortname }}
+  {{ if $.Site.Config.Services.Disqus.Shortname }}
     <section class="section">
       {{ template "_internal/disqus.html" . }}
     </section>
diff --git a/layouts/partials/check-tools.html b/layouts/partials/check-tools.html
index 84729f4f9..4ea466725 100644
--- a/layouts/partials/check-tools.html
+++ b/layouts/partials/check-tools.html
@@ -52,7 +52,7 @@
       w3Validator: 'https://validator.w3.org/nu/?doc=',
       facebook: 'https://developers.facebook.com/tools/debug/?q=',
     }
-    {{ if $.Site.IsServer }}
+    {{ if hugo.IsServer }}
       const toolURL = toolsTable[toolName] + '{{ $.Site.Params.productionBaseURL | safeURL }}{{ .RelPermalink }}';
     {{ else }}
       const toolURL = toolsTable[toolName] + window.location.href;
diff --git a/theme.toml b/theme.toml
index 3d2215163..bf2a6cb49 100644
--- a/theme.toml
+++ b/theme.toml
@@ -4,7 +4,7 @@ licenselink = "https://github.com/peaceiris/hugo-theme-iris/blob/main/LICENSE"
 description = "Hugo Iris Theme - Portfolio and Blog"
 homepage = "https://github.com/peaceiris/hugo-theme-iris"
 demosite = "https://hugothemeiris.peaceiris.com/"
-min_version = "0.110.0"
+min_version = "0.120.0"
 tags = [
   "blog",
   "responsive",