diff --git a/src/Controller/TorrentController.php b/src/Controller/TorrentController.php
index cc6bb6a..078bad9 100644
--- a/src/Controller/TorrentController.php
+++ b/src/Controller/TorrentController.php
@@ -262,16 +262,26 @@ class TorrentController extends AbstractController
 
             // Generate keywords by extension
             $keywords = [];
+
             foreach ($file->getFileList() as $item)
             {
                 if ($keyword = pathinfo($item['path'], PATHINFO_EXTENSION))
                 {
-                    $keywords[] = mb_strtolower($keyword);
+                    $keyword = mb_strtolower($keyword);
+
+                    if (isset($keywords[$keyword]))
+                    {
+                        $keywords[$keyword]++;
+                    }
+
+                    else
+                    {
+                        $keywords[$keyword] = 1;
+                    }
                 }
             }
-            $keywords = array_unique($keywords);
 
-            sort($keywords);
+            arsort($keywords);
 
             // Push torrent
             $torrents[] =
@@ -401,16 +411,26 @@ class TorrentController extends AbstractController
 
             // Generate keywords by extension
             $keywords = [];
+
             foreach ($file->getFileList() as $item)
             {
                 if ($keyword = pathinfo($item['path'], PATHINFO_EXTENSION))
                 {
-                   $keywords[] = mb_strtolower($keyword);
+                    $keyword = mb_strtolower($keyword);
+
+                    if (isset($keywords[$keyword]))
+                    {
+                        $keywords[$keyword]++;
+                    }
+
+                    else
+                    {
+                        $keywords[$keyword] = 1;
+                    }
                 }
             }
-            $keywords = array_unique($keywords);
 
-            sort($keywords);
+            arsort($keywords);
 
             // Push torrent
             $torrents[] =
diff --git a/templates/default/torrent/list.html.twig b/templates/default/torrent/list.html.twig
index 27dcb2b..8c3b35e 100644
--- a/templates/default/torrent/list.html.twig
+++ b/templates/default/torrent/list.html.twig
@@ -13,7 +13,7 @@
     </div>
     {% if torrents %}
         {% for torrent in torrents %}
-            <div class="padding-16-px margin-y-8-px border-radius-3-px background-color-night{% if torrent.sensitive == true or torrent.approved == false %} opacity-06{% endif %}">
+            <div class="padding-24-px margin-y-8-px border-radius-3-px background-color-night{% if torrent.sensitive == true or torrent.approved == false %} opacity-06{% endif %}">
                 <a name="{{ torrent.id }}"></a>
                 <div class="margin-b-16-px">
                     <h2>
@@ -44,8 +44,8 @@
                 </div>
                 {% if torrent.keywords %}
                     <div class="margin-b-16-px">
-                        {% for keyword in torrent.keywords %}
-                            <a href="{{ path('torrent_search', { query : keyword | url_encode(true) }) }}">
+                        {% for keyword, quantity in torrent.keywords %}
+                            <a href="{{ path('torrent_search', { query : keyword | url_encode(true) }) }}" title="{{ 'Contains' | trans }}: {{ quantity }}">
                                 #{{ keyword }}
                             </a>
                         {% endfor %}