diff --git a/_includes/head.html b/_includes/head.html
index 8c85ec9..50e0214 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -87,4 +87,7 @@
+ {% unless site.theme_mode %}
+ {% include mode-toggle.html %}
+ {% endunless %}
diff --git a/_includes/post-sharing.html b/_includes/post-sharing.html
index d6c80d7..69714ae 100644
--- a/_includes/post-sharing.html
+++ b/_includes/post-sharing.html
@@ -6,10 +6,11 @@
{{ site.data.locales[lang].post.share }}
{% capture title %}{{ page.title }} - {{ site.title }}{% endcapture %}
- {% assign url = page.url | absolute_url %}
+ {% assign title = title | url_encode %}
+ {% assign url = page.url | absolute_url | url_encode %}
{% for share in site.data.share.platforms %}
- {% assign link = share.link | replace: 'TITLE', title | replace: 'URL', url | escape %}
+ {% assign link = share.link | replace: 'TITLE', title | replace: 'URL', url %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 1634cb4..782c10a 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -19,10 +19,6 @@ layout: compress
{% include head.html %}
- {% unless site.theme_mode %}
- {% include mode-toggle.html %}
- {% endunless %}
-
{% include sidebar.html %}