diff --git a/_layouts/categories.html b/_layouts/categories.html
index d5808287..9c6d77b9 100644
--- a/_layouts/categories.html
+++ b/_layouts/categories.html
@@ -4,7 +4,7 @@ layout: archive
 
 {{ content }}
 
-<ul class="taxonomy-index">
+<ul class="taxonomy__index">
   {% assign categories_max = 0 %}
   {% for category in site.categories %}
     {% if category[1].size > categories_max %}
@@ -16,7 +16,7 @@ layout: archive
       {% if category[1].size == i %}
         <li>
           <a href="#{{ category[0] | slugify }}">
-            <strong>{{ category[0] }}</strong> <span class="taxonomy-count">{{ i }}</span>
+            <strong>{{ category[0] }}</strong> <span class="taxonomy__count">{{ i }}</span>
           </a>
         </li>
       {% endif %}
@@ -34,7 +34,7 @@ layout: archive
 {% for i in (1..categories_max) reversed %}
   {% for category in site.categories %}
     {% if category[1].size == i %}
-      <section id="{{ category[0] | slugify | downcase }}" class="taxonomy-section">
+      <section id="{{ category[0] | slugify | downcase }}" class="taxonomy__section">
         <h2 class="archive__subtitle">{{ category[0] }}</h2>
         <div class="entries-{{ page.entries_layout | default: 'list' }}">
           {% for post in category.last %}
diff --git a/_layouts/posts.html b/_layouts/posts.html
index 18006143..d70ce060 100644
--- a/_layouts/posts.html
+++ b/_layouts/posts.html
@@ -4,12 +4,12 @@ layout: archive
 
 {{ content }}
 
-<ul class="taxonomy-index">
+<ul class="taxonomy__index">
   {% assign postsInYear = site.posts | group_by_exp: 'post', 'post.date | date: "%Y"' %}
   {% for year in postsInYear %}
     <li>
       <a href="#{{ year.name }}">
-        <strong>{{ year.name }}</strong> <span class="taxonomy-count">{{ year.items | size }}</span>
+        <strong>{{ year.name }}</strong> <span class="taxonomy__count">{{ year.items | size }}</span>
       </a>
     </li>
   {% endfor %}
@@ -17,7 +17,7 @@ layout: archive
 
 {% assign postsByYear = site.posts | group_by_exp: 'post', 'post.date | date: "%Y"' %}
 {% for year in postsByYear %}
-  <section id="{{ year.name }}" class="taxonomy-section">
+  <section id="{{ year.name }}" class="taxonomy__section">
     <h2 class="archive__subtitle">{{ year.name }}</h2>
     <div class="entries-{{ page.entries_layout | default: 'list' }}">
       {% for post in year.items %}
diff --git a/_layouts/tags.html b/_layouts/tags.html
index da5888d3..f81986b5 100644
--- a/_layouts/tags.html
+++ b/_layouts/tags.html
@@ -4,7 +4,7 @@ layout: archive
 
 {{ content }}
 
-<ul class="taxonomy-index">
+<ul class="taxonomy__index">
   {% assign tags_max = 0 %}
   {% for tag in site.tags %}
     {% if tag[1].size > tags_max %}
@@ -16,7 +16,7 @@ layout: archive
       {% if tag[1].size == i %}
         <li>
           <a href="#{{ tag[0] | slugify }}">
-            <strong>{{ tag[0] }}</strong> <span class="taxonomy-count">{{ i }}</span>
+            <strong>{{ tag[0] }}</strong> <span class="taxonomy__count">{{ i }}</span>
           </a>
         </li>
       {% endif %}
@@ -34,7 +34,7 @@ layout: archive
 {% for i in (1..tags_max) reversed %}
   {% for tag in site.tags %}
     {% if tag[1].size == i %}
-      <section id="{{ tag[0] | slugify | downcase }}" class="taxonomy-section">
+      <section id="{{ tag[0] | slugify | downcase }}" class="taxonomy__section">
         <h2 class="archive__subtitle">{{ tag[0] }}</h2>
         <div class="entries-{{ page.entries_layout | default: 'list' }}">
           {% for post in tag.last %}
diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss
index ac1afb7a..78fc9bd9 100644
--- a/_sass/minimal-mistakes/_page.scss
+++ b/_sass/minimal-mistakes/_page.scss
@@ -295,7 +295,7 @@
   }
 }
 
-.taxonomy-section {
+.taxonomy__section {
   margin-bottom: 2em;
   padding-bottom: 1em;
 
@@ -312,25 +312,25 @@
     border: 0;
   }
 
-  + .taxonomy-section {
+  + .taxonomy__section {
     margin-top: 2em;
   }
 }
 
-.taxonomy-title {
+.taxonomy__title {
   margin-bottom: 0.5em;
   color: lighten($text-color, 60%);
 }
 
-.taxonomy-count {
+.taxonomy__count {
   color: lighten($text-color, 50%);
 }
 
-.taxonomy-index {
+.taxonomy__index {
   display: grid;
   grid-column-gap: 2em;
   grid-template-columns: repeat(2, 1fr);
-  margin: 0;
+  margin: 1.414em 0;
   padding: 0;
   font-size: 0.75em;
   list-style: none;