diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 2e65d414..d5924464 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -6,14 +6,15 @@ theme: hugo-theme-mini
 # Default content language, support en (English) / zh (Chinese) / nl (Dutch) / fr (French) / es (Spanish) / da (Danish), default 'en'
 defaultContentLanguage: en
 
-# !!! exampleSite only, you may need to delete the line: `themesDir: ../../` 
+# !!! exampleSite only, you may need to delete the line: `themesDir: ../../`
 themesDir: ../../
 
 hasCJKLanguage: true
 permalinks:
   posts: /posts/:title/
 
-paginate: 3
+pagination:
+  pagerSize: 3
 
 googleAnalytics: your-google-analytics-id
 disqusShortname: your-disqus-shortname
@@ -33,15 +34,6 @@ markup:
     renderer:
       unsafe: true
 
-# Social links in footer, support github,twitter,stackoverflow,facebook
-social:
-  # e.g.
-  github: your-github-link
-  twitter: your-twitter-link
-  stackoverflow: your-stackoverflow-link
-  # facebook: your-facebook-link
-
-
 # Site parameters
 params:
   # Site Author
@@ -51,6 +43,14 @@ params:
   # Site Description, used in HTML meat
   description: My Blog
 
+  # Social links in footer, support github,twitter,stackoverflow,facebook
+  social:
+    # e.g.
+    github: your-github-link
+    twitter: your-twitter-link
+    stackoverflow: your-stackoverflow-link
+    # facebook: your-facebook-link
+
 
   ###########################################
   # Optional Configuration
@@ -71,7 +71,7 @@ params:
   # To hidden post summary in home page, you could set `hiddenPostSummaryInHomePage: true`, default is `false`
   hiddenPostSummaryInHomePage: false
   # Website copyright, default: '© Copyright 2021 ❤️ {params.author}'
-  copyright: '' 
+  copyright: ''
 
   # Extra links in navigation
   links:
diff --git a/exampleSite/content/posts/rich-content.md b/exampleSite/content/posts/rich-content.md
index c1ea8712..0e2af125 100644
--- a/exampleSite/content/posts/rich-content.md
+++ b/exampleSite/content/posts/rich-content.md
@@ -22,9 +22,9 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
 
 ---
 
-## Twitter Simple Shortcode
+## X Shortcode
 
-{{< twitter_simple 1085870671291310081 >}}
+{{< x user="DesignReviewed" id="1085870671291310081" >}}
 
 <br>
 
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 27a75187..f6a179ad 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,5 +1,5 @@
 <footer id="footer">
-    {{ if .Site.Social }}
+    {{ if .Site.Params.Social }}
         {{ partial "social.html" . }}
     {{ end }}
 
@@ -7,8 +7,8 @@
     {{ with .Site.Params.copyright }}
         {{ . | markdownify }}
     {{ else }}
-       © Copyright 
-       {{ now.Format "2006"}} 
+       © Copyright
+       {{ now.Format "2006"}}
        <span class="split">
         {{ partial "svgs/heart.svg" (dict "fill" "#bbbbbb" "width" 15 "height" 15 ) }}
        </span>
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index c96fc49e..8a2544f2 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -11,6 +11,6 @@
 	{{ end }}
 
 	{{ if .Site.Params.enableRSS }}
-	  <a class="button" href="{{ .Site.RSSLink }}">{{ with .Site.Params.subscribe }}{{ . }}{{ else }}{{ i18n "subscribe" }}{{ end }}</a>
+	  <a class="button" href="{{ "index.xml" | absURL }}">{{ with .Site.Params.subscribe }}{{ . }}{{ else }}{{ i18n "subscribe" }}{{ end }}</a>
 	{{ end }}
-</nav>
+</nav>
\ No newline at end of file
diff --git a/layouts/partials/social.html b/layouts/partials/social.html
index ebc9d66c..03258b00 100644
--- a/layouts/partials/social.html
+++ b/layouts/partials/social.html
@@ -1,6 +1,6 @@
 <div id="social">
 
-{{ range $key, $val := .Site.Social }}
+{{ range $key, $val := .Site.Params.Social }}
     <a class="symbol" href="{{ $val }}" rel="me" target="_blank">
         {{ $svg :=  print "svgs/" $key ".svg" }}
         {{ partial $svg (dict "fill" "#bbbbbb" "width" 28 "height" 28 ) }}