diff --git a/_config.yml b/_config.yml
index 0b4403a..7760c03 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,20 +17,20 @@ timezone: Asia/Kolkata
 
 title: Engineer's Odyssey # the main title
 
-tagline: Your Hub for Tech, DIY, and Innovation # it will display as the sub-title
+tagline: Your Hub for Tech, DIY, and Innovation # it will display as the subtitle
 
 description: >- # used by seo meta and the atom feed
   Through my articles and stories, I hope to guide you through the intricate world of technology, offer insights into automation's transformative power, unveil the secrets behind successful DIY projects, and encourage you to fearlessly pursue new skills.
 
 # Fill in the protocol & hostname for your site.
-# e.g. 'https://username.github.io', note that it does not end with a '/'.
+# E.g. 'https://username.github.io', note that it does not end with a '/'.
 url: "http://localhost:4000"
 
 github:
-  username: rajukottedi # change to your github username
+  username: rajukottedi # change to your GitHub username
 
 twitter:
-  username: RajuKottedi # change to your twitter username
+  username: RajuKottedi # change to your Twitter username
 
 social:
   # Change to your full name.
@@ -39,8 +39,8 @@ social:
   email: bangararaju.kottedi@gmail.com # change to your email address
   links:
     # The first element serves as the copyright owner's link
-    - https://github.com/rajukottedi  # change to your github homepage
-    - https://twitter.com/rajukottedi # change to your twitter homepage
+    - https://github.com/rajukottedi  # change to your GitHub homepage
+    - https://twitter.com/rajukottedi # change to your Twitter homepage
     # Uncomment below to add more social links
     - https://www.facebook.com/RajuKottedi435
     - https://www.linkedin.com/in/bangararajuk/
@@ -50,11 +50,26 @@ google_site_verification: # fill in to your verification string
 # ↑ --------------------------
 # The end of `jekyll-seo-tag` settings
 
-google_analytics:
-  id:
+# Web Analytics Settings
+analytics:
+  google:
+    id: # fill in your Google Analytics ID
+  goatcounter:
+    id: # fill in your GoatCounter ID
+  umami:
+    id: # fill in your Umami ID
+    domain: # fill in your Umami domain
+  matomo:
+    id: # fill in your Matomo ID
+    domain: # fill in your Matomo domain
+  cloudflare:
+    id: # fill in your Cloudflare Web Analytics token
+  fathom:
+    id: # fill in your Fathom Site ID
 
-goatcounter:
-  id: # fill in your Goatcounter ID
+# Page Views settings
+pageviews:
+  provider: # now only supports 'goatcounter'
 
 # Prefer color scheme setting.
 #
@@ -118,7 +133,7 @@ assets:
     env: # [development | production]
 
 pwa:
-  enabled: true # the option for PWA feature (installable)
+  enabled: true # The option for PWA feature (installable)
   cache:
     enabled: true # the option for PWA offline cache
     # Paths defined here will be excluded from the PWA cache.
diff --git a/_includes/comments/remark42.html b/_includes/comments/remark42.html
index 74cb4b5..24f9379 100644
--- a/_includes/comments/remark42.html
+++ b/_includes/comments/remark42.html
@@ -8,7 +8,7 @@
     components: ['embed', 'counter'],
 
     max_shown_comments: 10,
-    theme: modeToggle.modeStatus,
+    theme: Theme.visualState,
 
     locale: 'en',
     show_email_subscription: false
@@ -27,7 +27,7 @@ var targetDiv = document.getElementById("sidebar").getElementsByClassName("mode-
 
 if (targetDiv != null) {
     targetDiv.addEventListener("click", () => {
-        window.REMARK42.changeTheme(modeToggle.modeStatus === 'light' ? 'dark' : 'light');
+        window.REMARK42.changeTheme(Theme.visualState === 'light' ? 'dark' : 'light');
     })
 }
 </script>
\ No newline at end of file
diff --git a/assets/js/comments/remark42.js b/assets/js/comments/remark42.js
index 37434e1..7782c21 100644
--- a/assets/js/comments/remark42.js
+++ b/assets/js/comments/remark42.js
@@ -4,7 +4,7 @@ var remark_config = {
     components: ['embed'],
 
     max_shown_comments: 10,
-    theme: modeToggle.modeStatus,
+    theme: Theme.visualState,
 
     locale: 'en',
     show_email_subscription: false
@@ -23,6 +23,6 @@ var targetDiv = document.getElementById("sidebar").getElementsByClassName("mode-
 
 if (targetDiv != null) {
     targetDiv.addEventListener("click", () => {
-        window.REMARK42.changeTheme(modeToggle.modeStatus === 'light' ? 'dark' : 'light');
+        window.REMARK42.changeTheme(Theme.visualState === 'light' ? 'dark' : 'light');
     })
 }
\ No newline at end of file