diff --git a/templates/archives.html b/templates/archives.html
index 667312f..5b7f5c4 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="uk-width-4-5@m">
-    <h1 class="uk-heading-large">Archives</h1>
+    <h1 class="uk-heading-primary">Archives</h1>
 
     {% for article in dates %}
     <article class="uk-article">
diff --git a/templates/article.html b/templates/article.html
index 42bac55..8e84e04 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -40,16 +40,16 @@
 {% endblock %}
 
 {% block content %}
-<div class="mg-container-social uk-width-1-10@m uk-hidden-small">
+<div class="mg-container-social uk-width-1-10@m ">
 
     {% if SHARE %}
     <div class="uk-panel" id="mg-panel-social">
-        <ul class="uk-nav uk-nav-side">
+        <ul class="uk-nav uk-nav-default">
             <li>
-            <a href="https://www.facebook.com/sharer/sharer.php?u={{ SITEURL }}/{{ article.url }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600');return false;" target="_blank" class="uk-button"><i class="fab fa-facebook-square"></i> Share</a>
+            <a href="https://www.facebook.com/sharer/sharer.php?u={{ SITEURL }}/{{ article.url }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600');return false;" target="_blank" class="uk-button uk-button-default"><i class="fab fa-facebook-square"></i> Share</a>
             </li>
             <li>
-            <a href="https://twitter.com/intent/tweet?text={{ article.title|striptags|urlencode }}&url={{ SITEURL }}/{{ article.url }}&via={{ TWITTER_USERNAME }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;" class="uk-button" target="_blank"><i class="fab fa-twitter-square"></i> Tweet</a>
+            <a href="https://twitter.com/intent/tweet?text={{ article.title|striptags|urlencode }}&url={{ SITEURL }}/{{ article.url }}&via={{ TWITTER_USERNAME }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;" class="uk-button uk-button-default" target="_blank"><i class="fab fa-twitter-square"></i> Tweet</a>
             </li>
         </ul>
     </div>
@@ -60,16 +60,16 @@
 <div class="uk-width-7-10@m">
 
     <article class="uk-article">
-        <h1 class="uk-heading-large uk-article-title" itemprop="name">{{ article.title }}</h1>
+        <h1 class="uk-heading-primary uk-article-title" itemprop="name">{{ article.title }}</h1>
         <p class="uk-article-meta">
             <time datetime="{{ article.date.strftime('%Y-%m-%d') }}" itemprop="datePublished">{{ article.locale_date }}</time>
             {% if CATEGORY_SAVE_AS %}<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}
-            {% if DISQUS_SITENAME %}, <br class="uk-visible-small"><i class="fas fa-comments"></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
+            {% if DISQUS_SITENAME %}, <br class="uk-visible@s"><i class="fas fa-comments"></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
         </p>
 
         {% if SHARE %}
-        <a href="https://www.facebook.com/sharer/sharer.php?u={{ SITEURL }}/{{ article.url }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600');return false;" target="_blank" class="uk-button uk-visible-small"><i class="fab fa-facebook-square"></i> Share</a>
-        <a href="https://twitter.com/intent/tweet?text={{ article.title|striptags|urlencode }}&url={{ SITEURL }}/{{ article.url }}&via={{ TWITTER_USERNAME }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;" class="uk-button uk-visible-small" target="_blank"><i class="fab fa-twitter-square"></i> Tweet</a>
+        <a href="https://www.facebook.com/sharer/sharer.php?u={{ SITEURL }}/{{ article.url }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=300,width=600');return false;" target="_blank" class="uk-button uk-button-default uk-visible@s"><i class="fab fa-facebook-square"></i> Share</a>
+        <a href="https://twitter.com/intent/tweet?text={{ article.title|striptags|urlencode }}&url={{ SITEURL }}/{{ article.url }}&via={{ TWITTER_USERNAME }}" onclick="javascript:window.open(this.href,'', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;" class="uk-button uk-button-default uk-visible@s" target="_blank"><i class="fab fa-twitter-square"></i> Tweet</a>
         {% endif %}
 
         {% if not MG_DISABLE_SUMMARY %}<p class="uk-text-lead" itemprop="description">{{ article.summary|striptags }}</p>{% endif %}
diff --git a/templates/categories.html b/templates/categories.html
index ffeed50..2bb261b 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="uk-width-4-5@m">
-    <h1 class="uk-heading-large">Categories</h1>
+    <h1 class="uk-heading-primary">Categories</h1>
     {% for category, articles in categories %}
     <h2><a href="{{ SITEURL}}/{{ category.url}}" class="uk-link-muted">{{ category|capitalize }}</a></h2>
         {% for article in articles %}
diff --git a/templates/page.html b/templates/page.html
index b0c0285..c2c6f12 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -27,7 +27,7 @@
 
 {% block content %}
 <article class="uk-article uk-width-4-5@m">
-    <h1 class="uk-heading-large uk-article-title" itemprop="name">{{ page.title }}</h1>
+    <h1 class="uk-heading-primary uk-article-title" itemprop="name">{{ page.title }}</h1>
     <div class="uk-article-content">
     {{ page.content }}
     </div>
diff --git a/templates/partials/article-excerpt.html b/templates/partials/article-excerpt.html
index fec66b9..d485ef0 100644
--- a/templates/partials/article-excerpt.html
+++ b/templates/partials/article-excerpt.html
@@ -2,7 +2,7 @@
     <a href="{{ SITEURL }}/{{ article.url }}" class="uk-link-muted"><h2 class="uk-article-title" itemprop="name">{{ article.title|e }}</h2></a>
     <p class="uk-article-meta"><time datetime="{{ article.date.strftime('%Y-%m-%d') }}" itemprop="datePublished">{{ article.locale_date }}</time>
         {% if CATEGORY_SAVE_AS %} • <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}
-        {% if DISQUS_SITENAME %} • <br class="uk-visible-small"><i class="fas fa-comments"></i></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
+        {% if DISQUS_SITENAME %} • <br class="uk-visible@s"><i class="fas fa-comments"></i></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
     </p>
     {% if not MG_DISABLE_SUMMARY %}<p class="uk-text-lead" itemprop="description">{{ article.summary|striptags|striptags }}</p>{% endif %}
     <section class="uk-article-content" itemprop="articleBody">{{ article.content }}</section>
diff --git a/templates/partials/article-short.html b/templates/partials/article-short.html
index bcbf5cf..331a7e2 100644
--- a/templates/partials/article-short.html
+++ b/templates/partials/article-short.html
@@ -8,7 +8,7 @@
             <a href="{{ SITEURL }}/{{ article.url }}" class="uk-link-muted"><h2 class="uk-article-title" itemprop="name">{{ article.title|e }}</h2></a>
             <p class="uk-article-meta"><time datetime="{{ article.date.strftime('%Y-%m-%d') }}" itemprop="datePublished">{{ article.locale_date }}</time>
                 {% if CATEGORY_SAVE_AS %} • <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>{% endif %}
-                {% if DISQUS_SITENAME %} • <br class="uk-visible-small"><i class="fas fa-comments"></i></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
+                {% if DISQUS_SITENAME %} • <br class="uk-visible@s"><i class="fas fa-comments"></i></i> <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread" itemprop="discussionUrl"></a>{% endif %}
             </p>
             <p class="uk-article-lead" itemprop="description">{{ article.summary|striptags|striptags }}</p>
             {% if not MG_DISABLE_SUMMARY %}<p>{{ ' '.join(article.content.split(' ')[:75])|striptags|striptags }}...</p>{% endif %}
diff --git a/templates/past_readings.html b/templates/past_readings.html
index 162a547..8dc6534 100644
--- a/templates/past_readings.html
+++ b/templates/past_readings.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="uk-width-4-5@m">
-    <h1 class="uk-heading-large">Lectures passées</h1>
+    <h1 class="uk-heading-primary">Lectures passées</h1>
 
     <div class="uk-grid">
     {% for reading in READINGS %}
diff --git a/templates/search.html b/templates/search.html
index c01181f..bed2938 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="uk-width-4-5@m">
-    <h1 class="uk-heading-large">Search results</h1>
+    <h1 class="uk-heading-primary">Search results</h1>
 
     <div id="tipue_search_content"></div>