diff --git a/theme/funkwhale/templates/base.html b/theme/funkwhale/templates/base.html
index 9256f1d726a87207254e502a24b45f9e46b6ce01..5b429c449150079967f4fad889a2356e8659d1a7 100644
--- a/theme/funkwhale/templates/base.html
+++ b/theme/funkwhale/templates/base.html
@@ -17,6 +17,7 @@
         <meta itemprop="description" content="{{ AUTHOR_DESCRIPTION }}">
 
         <!-- Style Meta Data -->
+        <link rel="stylesheet" href="https://ui.funkwhale.audio/v0.1.2/css/funkwhale.css" type="text/css" />
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" type="text/css"/>
         <link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygments.css" type="text/css"/>
 
diff --git a/theme/funkwhale/templates/pagination.html b/theme/funkwhale/templates/pagination.html
index 8d2751044f9a21f2d6286c6db7ba0b24e3873f18..9aa1255ea182776e6df28ba8658cdd47b70e0106 100644
--- a/theme/funkwhale/templates/pagination.html
+++ b/theme/funkwhale/templates/pagination.html
@@ -1,16 +1,57 @@
 {% if DEFAULT_PAGINATION %}
-    <p class="paginator">
-        {% if articles_page.has_previous() %}
-            {% if articles_page.previous_page_number() == 1 %}
-                <a href="{{ SITEURL }}/{{ page_name }}.html">~:)</a>
-            {% else %}
-                <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">~:)</a>
+    <nav class="pagination is-centered">
+        <ul class="pagination-list">
+            {% if articles_page.has_previous() %}
+                {% if articles_page.previous_page_number() == 1 %}
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}.html" aria-label="Goto page 1">1</a>
+                    </li>
+                {% elif articles_page.previous_page_number() == 2 %}
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}.html" aria-label="Goto page 1">1</a>
+                    </li>
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html" aria-label="Goto page {{ articles_page.previous_page_number() }}">{{ articles_page.previous_page_number() }}</a>
+                    </li>
+                {% else %}
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL}}/{{ page_name }}.html" aria-label="Goto page 1">1</a>
+                    </li>
+                    <li>
+                        <span class="pagination-ellipsis">…</span>
+                    </li>
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">{{ articles_page.previous_page_number() }}</a>
+                    </li>
+                {% endif %}
             {% endif %}
-        {% endif %}
-        {{ articles_page.number }} ~ {{ articles_paginator.num_pages }}
-        {% if articles_page.has_next() %}
-            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">(:~</a>
-        {% endif %}
-    </p>
-{% endif %}
-
+            <li>
+                <a class="pagination-link is-current" aria-label="Page {{ articles_page.number }}" aria-current="page">{{ articles_page.number }}</a>
+            </li>
+            {% if articles_page.has_next() %}
+                {% if articles_page.next_page_number() ==  articles_paginator.num_pages %}
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" aria-label="Goto page {{ articles_page.next_page_number() }}">{{ articles_page.next_page_number() }}</a>
+                    </li>
+                {% elif  articles_page.next_page_number() ==  articles_paginator.num_pages -1%}
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" aria-label="Goto page {{ articles_page.next_page_number() }}">{{ articles_page.next_page_number() }}</a>
+                    </li>
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_paginator.num_pages  }}.html" aria-label="Goto page {{ articles_paginator.num_pages  }}">{{ articles_paginator.num_pages  }}</a>
+                    </li>
+                {% else %}
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" aria-label="Goto page {{ articles_page.next_page_number() }}">{{ articles_page.next_page_number() }}</a>
+                    </li>
+                    <li>
+                        <span class="pagination-ellipsis">…</span>
+                    </li>
+                    <li>
+                        <a class="pagination-link" href="{{ SITEURL }}/{{ page_name }}{{ articles_paginator.num_pages  }}.html" aria-label="Goto page {{ articles_paginator.num_pages  }}">{{ articles_paginator.num_pages  }}</a>
+                    </li>
+                {% endif %}
+            {% endif %}
+        </ul>
+    </nav>
+{% endif %}
\ No newline at end of file