diff --git a/_includes/panel.html b/_includes/panel.html
index 190c1f6..767964d 100644
--- a/_includes/panel.html
+++ b/_includes/panel.html
@@ -11,9 +11,9 @@
   <div class="access">
 
   {% include update-list.html %}
-  
+
   {% if update_list.size > 0 %}
-    
+
     <div id="access-lastmod" class="post">
       <span>{{- site.data.label.panel.lastmod -}}</span>
       <ul class="post-content pl-0 pb-1 ml-1 mt-2">
@@ -27,7 +27,7 @@
 
       </ul>
     </div> <!-- #access-lastmod -->
-  
+
   {% endif %}
 
   {% include trending-tags.html %}
@@ -36,10 +36,10 @@
     <div id="access-tags">
       <span>{{- site.data.label.panel.trending_tags -}}</span>
       <div class="d-flex flex-wrap mt-3 mb-1 mr-3">
-      
-      {% for tag in trending_tags %}
-        {% capture url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
-        <a class="post-tag" href="{{ url | relative_url }}">{{ tag | replace: '-', ' ' }}</a>
+
+      {% for tag_name in trending_tags %}
+        {% assign url = tag_name | slugify | url_encode | prepend: "/tags/" | append: "/" %}
+        <a class="post-tag" href="{{ url | relative_url }}">{{ tag_name }}</a>
       {% endfor %}
 
       </div>
diff --git a/_includes/search-results.html b/_includes/search-results.html
index 078f425..e22e23d 100644
--- a/_includes/search-results.html
+++ b/_includes/search-results.html
@@ -13,11 +13,11 @@
       {% include trending-tags.html %}
 
       {% for tag in trending_tags %}
-        {% capture url %}/tags/{{ tag | downcase | url_encode }}/{% endcapture %}
+        {% capture url %}/tags/{{ tag | slugify | url_encode }}/{% endcapture %}
         <a class="post-tag" href="{{ url | relative_url }}">{{ tag | replace: '-', ' ' }}</a>
       {% endfor %}
 
     </div>
     <div id="search-results" class="d-flex flex-wrap justify-content-center text-muted mt-3"></div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/_includes/trending-tags.html b/_includes/trending-tags.html
index 41351e4..f884768 100644
--- a/_includes/trending-tags.html
+++ b/_includes/trending-tags.html
@@ -15,7 +15,7 @@
   {% assign size = tag | last | size %}
   {% assign size_list = size_list | push: size %}
 
-  {% assign tag_str = tag | first | replace: " ", "-" | append: "::" | append: size %}
+  {% assign tag_str = tag | first | append: "::" | append: size %}
   {% assign tag_list =  tag_list | push: tag_str %}
 {% endfor %}
 
diff --git a/_layouts/categories.html b/_layouts/categories.html
index 1786cf1..474f983 100644
--- a/_layouts/categories.html
+++ b/_layouts/categories.html
@@ -46,7 +46,7 @@ layout: page
       {% else %}
         <i class="far fa-folder fa-fw"></i>
       {% endif %}
-        <a href="{{ site.baseurl }}/categories/{{ category_name | replace: ' ', '-' | downcase | url_encode }}/"
+        <a href="{{ site.baseurl }}/categories/{{ category_name | slugify | url_encode }}/"
           class="ml-1 mr-2">
           {{ category_name }}
         </a>
@@ -85,7 +85,7 @@ layout: page
         {% for sub_category in sub_categories %}
         <li class="list-group-item">
           <i class="far fa-folder fa-fw"></i>
-          <a href="{{ site.baseurl }}/categories/{{ sub_category | replace: ' ', '-' | downcase | url_encode }}/"
+          <a href="{{ site.baseurl }}/categories/{{ sub_category | slugify | url_encode }}/"
             class="ml-1 mr-2">{{ sub_category }}</a>
           {% assign posts_size = site.categories[sub_category] | size %}
           <span class="text-muted small font-weight-light">{{ posts_size }}
diff --git a/_layouts/post.html b/_layouts/post.html
index 1a9133b..8d90401 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -73,7 +73,7 @@ layout: default
         <div class="post-meta mb-3">
           <i class="far fa-folder-open fa-fw mr-1"></i>
           {% for category in page.categories %}
-            <a href='{{ site.baseurl }}/categories/{{ category | replace: ' ', '-' | downcase | url_encode }}/'>{{ category }}</a>
+            <a href='{{ site.baseurl }}/categories/{{ category | slugify | url_encode }}/'>{{ category }}</a>
             {%- unless forloop.last -%}, {%- endunless -%}
           {% endfor %}
         </div>
@@ -84,7 +84,7 @@ layout: default
         <div class="post-tags">
           <i class="fa fa-tags fa-fw mr-1"></i>
           {% for tag in page.tags %}
-          <a href="{{ site.baseurl }}/tags/{{ tag | replace: ' ', '-' | downcase | url_encode }}/"
+          <a href="{{ site.baseurl }}/tags/{{ tag | slugify | url_encode }}/"
             class="post-tag no-text-decoration" >
             {{- tag -}}
           </a>
diff --git a/_layouts/tags.html b/_layouts/tags.html
index 5c7d632..9c1923a 100644
--- a/_layouts/tags.html
+++ b/_layouts/tags.html
@@ -19,7 +19,7 @@ layout: page
 
   {% for t in sorted_tags %}
     <div>
-      <a class="tag" href="{{ site.baseurl }}/tags/{{ t | replace: ' ', '-' | downcase | url_encode }}/">{{ t }}<span class="text-muted">{{ site.tags[t].size }}</span></a>
+      <a class="tag" href="{{ site.baseurl }}/tags/{{ t | slugify | url_encode }}/">{{ t }}<span class="text-muted">{{ site.tags[t].size }}</span></a>
     </div>
   {% endfor %}