diff --git a/app/javascript/src/styles/base/000_vars.scss b/app/javascript/src/styles/base/000_vars.scss
index af4897f49..78a4c20bb 100644
--- a/app/javascript/src/styles/base/000_vars.scss
+++ b/app/javascript/src/styles/base/000_vars.scss
@@ -1,13 +1,11 @@
-$h1_size: 2em;
-$h2_size: 1.5em;
-$h3_size: 1.16667em;
-$h4_size: 1em;
-$dtext_h1_size: 2em;
-$dtext_h2_size: 1.8em;
-$dtext_h3_size: 1.6em;
-$dtext_h4_size: 1.4em;
-$dtext_h5_size: 1.2em;
-$dtext_h6_size: 1em;
+:root {
+  --text-sm: 0.9em;
+  --text-md: 1em;
+  --text-lg: 1.16667em;
+  --text-xl: 1.5em;
+  --text-xxl: 2em;
+}
+
 $h1_padding: 0.8em 0 0.25em 0;
 $h2_padding: 0.8em 0 0.25em 0;
 $h3_padding: 0.8em 0 0.25em 0;
diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss
index 352f46349..6549f06bd 100644
--- a/app/javascript/src/styles/base/020_base.scss
+++ b/app/javascript/src/styles/base/020_base.scss
@@ -25,22 +25,23 @@ dt {
   font-weight: bold;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .heading {
   font-family: Tahoma, Verdana, Helvetica, sans-serif;
+  font-weight: bold;
   line-height: 1.5em;
   color: var(--header-color);
 }
 
 h1 {
-  font-size: $h1_size;
+  font-size: var(--text-xxl);
 }
 
 h2 {
-  font-size: $h2_size;
+  font-size: var(--text-lg);
 }
 
 h3, h4, h5, h6 {
-  font-size: $h3_size;
+  font-size: var(--text-md);
 }
 
 fieldset {
diff --git a/app/javascript/src/styles/common/dtext.scss b/app/javascript/src/styles/common/dtext.scss
index 6a9066af4..caf314053 100644
--- a/app/javascript/src/styles/common/dtext.scss
+++ b/app/javascript/src/styles/common/dtext.scss
@@ -9,32 +9,32 @@ div.prose {
   }
 
   h1 {
-    font-size: $dtext_h1_size;
+    font-size: var(--text-xl);
     padding: $h1_padding;
   }
 
   h2 {
-    font-size: $dtext_h2_size;
+    font-size: var(--text-xl);
     padding: $h2_padding;
   }
 
   h3 {
-    font-size: $dtext_h3_size;
+    font-size: var(--text-xl);
     padding: $h3_padding;
   }
 
   h4 {
-    font-size: $dtext_h4_size;
+    font-size: var(--text-xl);
     padding: $h4_padding;
   }
 
   h5 {
-    font-size: $dtext_h5_size;
+    font-size: var(--text-lg);
     padding: $h4_padding;
   }
 
   h6 {
-    font-size: $dtext_h6_size;
+    font-size: var(--text-md);
     padding: $h4_padding;
   }
 
diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss
index 1af5253b4..31311a6a2 100644
--- a/app/javascript/src/styles/common/main_layout.scss
+++ b/app/javascript/src/styles/common/main_layout.scss
@@ -6,10 +6,6 @@ div#page {
   padding: 0 10px;
 
   aside#sidebar {
-    h1 {
-      font-size: $h3_size;
-    }
-
     #options-box i.fa-bookmark {
       margin-right: 0.25em;
     }
diff --git a/app/javascript/src/styles/common/messages.scss b/app/javascript/src/styles/common/messages.scss
index 4d70c0103..b38857027 100644
--- a/app/javascript/src/styles/common/messages.scss
+++ b/app/javascript/src/styles/common/messages.scss
@@ -15,6 +15,10 @@ div.list-of-messages {
       width: 12em;
       margin-right: 1em;
 
+      div.author-name {
+        font-weight: bold;
+      }
+
       a.message-timestamp {
         font-style: italic;
         font-size: 0.90em;
@@ -42,7 +46,7 @@ div.list-of-messages {
         margin: 0 0 1em;
         width: auto;
 
-        h4 {
+        div.author-name {
           display: inline;
           margin-right: 0.5em;
         }
diff --git a/app/javascript/src/styles/common/page_header.scss b/app/javascript/src/styles/common/page_header.scss
index ea89e5394..11301b97e 100644
--- a/app/javascript/src/styles/common/page_header.scss
+++ b/app/javascript/src/styles/common/page_header.scss
@@ -3,8 +3,8 @@
 }
 
 header#top {
-  h1#app-name-header {
-    font-size: 2em;
+  #app-name-header {
+    font-size: var(--text-xxl);
     margin: 0 30px;
   }
 
diff --git a/app/javascript/src/styles/specific/pools.scss b/app/javascript/src/styles/specific/pools.scss
index 9ef7f703f..93d90cc3f 100644
--- a/app/javascript/src/styles/specific/pools.scss
+++ b/app/javascript/src/styles/specific/pools.scss
@@ -27,17 +27,9 @@ div#add-to-pool-dialog {
     margin-left: 1em;
     cursor: pointer;
   }
-
-  h1 {
-    font-size: $h3_size;
-  }
 }
 
 div#c-pools {
-  h1 {
-    font-size: $h2_size;
-  }
-
   textarea {
     height: 10em;
   }
@@ -50,10 +42,6 @@ div#c-pools {
 }
 
 div#c-pool-orders, div#c-favorite-group-orders {
-  h1 {
-    font-size: $h2_size;
-  }
-
   div#a-edit {
     ul.ui-sortable {
       list-style-type: none;
diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss
index 03a8eb93c..f6dfee59f 100644
--- a/app/javascript/src/styles/specific/posts.scss
+++ b/app/javascript/src/styles/specific/posts.scss
@@ -274,10 +274,6 @@ div#c-posts {
     &.post-notice-search { background: var(--post-search-notice-background); }
   }
 
-  aside#sidebar #tag-list h2 {
-    font-size: $h4_size;
-  }
-
   aside#sidebar > section > ul {
     margin-bottom: 1em;
 
@@ -308,7 +304,7 @@ div#c-posts {
   div#a-index {
     menu#post-sections {
       margin-bottom: 0.5em;
-      font-size: $h3_size;
+      font-size: var(--text-lg);
 
       li {
         padding: 0 1em 0.5em 0;
@@ -331,7 +327,7 @@ div#c-posts {
 
     menu#post-sections {
       margin: 0;
-      font-size: $h3_size;
+      font-size: var(--text-lg);
 
       li {
         padding: 0 1em 0 0;
diff --git a/app/javascript/src/styles/specific/site_map.scss b/app/javascript/src/styles/specific/site_map.scss
index cd015c5d1..11c2b7e9b 100644
--- a/app/javascript/src/styles/specific/site_map.scss
+++ b/app/javascript/src/styles/specific/site_map.scss
@@ -7,10 +7,6 @@ div#c-static {
     section {
       flex: 1;
 
-      h1 {
-        font-size: $h3_size;
-      }
-
       ul {
         margin-bottom: 1.5em;
       }
diff --git a/app/javascript/src/styles/specific/z_responsive.scss b/app/javascript/src/styles/specific/z_responsive.scss
index e775572a5..8c9a61ed2 100644
--- a/app/javascript/src/styles/specific/z_responsive.scss
+++ b/app/javascript/src/styles/specific/z_responsive.scss
@@ -4,20 +4,12 @@
   div#page {
     margin: 0 0.5rem;
     padding: 0;
-
-    aside#sidebar {
-      font-size: $h3_size;
-    }
   }
 
   header#top {
     position: relative;
     text-align: center;
 
-    h1#app-name-header {
-      display: inline;
-    }
-
     #maintoggle {
       display: block;
       font-weight: bold;
@@ -28,7 +20,6 @@
     }
 
     nav#nav {
-      font-size: $h3_size;
       line-height: 2em;
       display: none;
 
@@ -53,7 +44,7 @@
   }
 
   div.paginator {
-    font-size: $h2_size;
+    font-size: var(--text-lg);
     padding: 1em 0 0;
 
     li {
diff --git a/app/logical/tag_category.rb b/app/logical/tag_category.rb
index ea3d40b7c..92c9f3819 100644
--- a/app/logical/tag_category.rb
+++ b/app/logical/tag_category.rb
@@ -25,11 +25,6 @@ class TagCategory
       @@short_name_mapping ||= Hash[Danbooru.config.full_tag_config_info.map { |k, v| [v["short"], k] }]
     end
 
-    # Returns a hash mapping for split_tag_list_html (presenters/tag_set_presenter.rb)
-    def header_mapping
-      @@header_mapping ||= Hash[Danbooru.config.full_tag_config_info.map { |k, v| [k, v["header"]] }]
-    end
-
     # Returns a hash mapping for related tag buttons (javascripts/related_tag.js.erb)
     def related_button_mapping
       @@related_button_mapping ||= Hash[Danbooru.config.full_tag_config_info.map { |k, v| [k, v["relatedbutton"]] }]
diff --git a/app/presenters/tag_set_presenter.rb b/app/presenters/tag_set_presenter.rb
index 6182b2073..d10a92f46 100644
--- a/app/presenters/tag_set_presenter.rb
+++ b/app/presenters/tag_set_presenter.rb
@@ -35,7 +35,10 @@ class TagSetPresenter
       typetags = tags_for_category(category)
 
       if typetags.any?
-        html << TagCategory.header_mapping[category] if headers
+        if headers
+          html << %{<h3 class="#{category}-tag-list">#{category.capitalize.pluralize(typetags.size)}</h3>}
+        end
+
         html << %{<ul class="#{category}-tag-list">}
         typetags.each do |tag|
           html << build_list_item(tag, current_query: current_query, show_extra_links: show_extra_links, name_only: name_only, humanize_tags: humanize_tags)
diff --git a/app/views/bulk_update_requests/show.html.erb b/app/views/bulk_update_requests/show.html.erb
index f81923425..d37f61260 100644
--- a/app/views/bulk_update_requests/show.html.erb
+++ b/app/views/bulk_update_requests/show.html.erb
@@ -12,7 +12,6 @@
     </ul>
 
     <div style="margin: 1em 0;">
-      <h2>Script</h2>
       <div class="prose">
         <%= format_text @bulk_update_request.processor.to_dtext %>
       </div>
diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb
index 9df4db8b5..0dea551d8 100644
--- a/app/views/comments/partials/show/_comment.html.erb
+++ b/app/views/comments/partials/show/_comment.html.erb
@@ -17,12 +17,12 @@
            <% end %>
            data-is-voted="<%= comment.voted_by?(CurrentUser.user) %>">
     <div class="author">
-      <h4>
+      <div class="author-name">
         <%= link_to_user comment.creator %>
         <% if comment.is_deleted? %>
           (deleted)
         <% end %>
-      </h4>
+      </div>
       <%= link_to time_ago_in_words_tagged(comment.created_at), post_path(comment.post, anchor: "comment_#{comment.id}"), class: "message-timestamp" %>
     </div>
     <div class="content">
diff --git a/app/views/dmails/show.html.erb b/app/views/dmails/show.html.erb
index bca9226e1..59161e80f 100644
--- a/app/views/dmails/show.html.erb
+++ b/app/views/dmails/show.html.erb
@@ -4,8 +4,7 @@
 <div id="c-dmails">
   <div id="a-show">
     <div class="dmail">
-      <h1>Show Message</h1>
-      <h2><%= @dmail.title %></h2>
+      <h1><%= @dmail.title %></h1>
 
       <ul style="margin-bottom: 1em;">
         <li><strong>Sender</strong>: <%= link_to_user @dmail.from %></li>
@@ -13,7 +12,6 @@
         <li><strong>Date</strong>: <%= compact_time(@dmail.created_at) %></li>
       </ul>
 
-      <h3>Body</h3>
       <div class="prose">
         <%= format_text(@dmail.body) %>
 
diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 36e802f49..4f08f5fa9 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -6,12 +6,12 @@
            <% end %>
            data-creator="<%= forum_post.creator.name %>">
     <div class="author">
-      <h4>
+      <div class="author-name">
         <%= link_to_user forum_post.creator %>
         <% if forum_post.is_deleted? %>
           (deleted)
         <% end %>
-      </h4>
+      </div>
       <%= link_to time_ago_in_words_tagged(forum_post.created_at), forum_post, class: "message-timestamp" %>
     </div>
     <div class="content">
diff --git a/app/views/forum_posts/destroy.js.erb b/app/views/forum_posts/destroy.js.erb
index 6f187f01c..146cb8573 100644
--- a/app/views/forum_posts/destroy.js.erb
+++ b/app/views/forum_posts/destroy.js.erb
@@ -1,2 +1 @@
-
-$("article[data-forum-post-id=<%= @forum_post.id %>] div.author h4").append(" (deleted)");
+$("article[data-forum-post-id=<%= @forum_post.id %>] div.author div.author-name").append(" (deleted)");
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index e389762f9..d09e51a01 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -50,7 +50,7 @@
   <%= render "news_updates/listing" %>
 
   <header id="top">
-    <h1 id="app-name-header"><%= link_to Danbooru.config.app_name, "/" %></h1>
+    <%= link_to Danbooru.config.app_name, root_path, id: "app-name-header", class: "heading" %>
     
     <div id="maintoggle" class="mobile-only">
       <a href="#"><i id="maintoggle-on" class="fas fa-bars"></i></a>
diff --git a/app/views/modqueue/_sidebar.html.erb b/app/views/modqueue/_sidebar.html.erb
index 0ee352052..e11458f16 100644
--- a/app/views/modqueue/_sidebar.html.erb
+++ b/app/views/modqueue/_sidebar.html.erb
@@ -12,7 +12,7 @@
   <%= render "posts/partials/index/blacklist" %>
 
   <p id="modqueue-sidebar-status" class="sidebar-section">
-    <h6>Status</h6>
+    <h2>Status</h2>
     <ul>
       <li>
         <%= link_to "status:pending", modqueue_index_path(search: { tags: "status:pending" }) %>
@@ -33,7 +33,7 @@
   </p>
 
   <p id="modqueue-sidebar-uploaders" class="sidebar-section">
-    <h6>Uploaders</h6>
+    <h2>Uploaders</h2>
     <ul>
       <% @uploaders.each do |uploader, count| %>
         <li>
@@ -46,7 +46,7 @@
   </p>
 
   <p id="modqueue-sidebar-tags" class="sidebar-section">
-    <h6>Tags</h6>
+    <h2>Tags</h2>
 
     <%= render "tag_list", tags: @artist_tags %>
     <%= render "tag_list", tags: @copyright_tags %>
diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb
index 093dc49cc..1b5330f92 100644
--- a/app/views/posts/index.html.erb
+++ b/app/views/posts/index.html.erb
@@ -6,7 +6,7 @@
   <%= render "posts/partials/index/blacklist" %>
 
   <section id="tag-box">
-    <h1>Tags</h1>
+    <h2>Tags</h2>
     <%= @post_set.tag_list_html(current_query: params[:tags], show_extra_links: policy(Post).show_extra_links?) %>
   </section>
 
diff --git a/app/views/posts/partials/common/_search.html.erb b/app/views/posts/partials/common/_search.html.erb
index 08fc1de6f..a790825e5 100644
--- a/app/views/posts/partials/common/_search.html.erb
+++ b/app/views/posts/partials/common/_search.html.erb
@@ -1,7 +1,7 @@
 <%# path, tags %>
 
 <section id="search-box">
-  <h1>Search</h1>
+  <h2>Search</h2>
   <%= form_tag(path, method: "get", id: "search-box-form") do %>
     <% if params[:random] %>
       <%= hidden_field_tag :random, params[:random] %>
diff --git a/app/views/posts/partials/index/_blacklist.html.erb b/app/views/posts/partials/index/_blacklist.html.erb
index 0f606cad5..fc2ba967d 100644
--- a/app/views/posts/partials/index/_blacklist.html.erb
+++ b/app/views/posts/partials/index/_blacklist.html.erb
@@ -1,5 +1,5 @@
 <div id="blacklist-box" class="sidebar-blacklist">
-  <h1>Blacklisted (<%= link_to_wiki "help", "help:blacklists" %>)</h1>
+  <h2>Blacklisted (<%= link_to_wiki "help", "help:blacklists" %>)</h2>
   <ul id="blacklist-list" class="list-bulleted"></ul>
   <%= link_to "Disable all", "#", :id => "disable-all-blacklists", :style => "display: none;" %>
   <%= link_to "Re-enable all", "#", :id => "re-enable-all-blacklists", :style => "display: none;" %>
diff --git a/app/views/posts/partials/index/_edit.html.erb b/app/views/posts/partials/index/_edit.html.erb
index 100a0fce1..39c6d806a 100644
--- a/app/views/posts/partials/index/_edit.html.erb
+++ b/app/views/posts/partials/index/_edit.html.erb
@@ -1,5 +1,5 @@
 <div id="quick-edit-div" style="display: none;">
-  <h1>Edit</h1>
+  <h2>Edit</h2>
 
   <%= edit_form_for(:post, html: { id: "quick-edit-form" }) do |f| %>
     <%= f.input :tag_string, label: "Tags", as: :text, input_html: { "data-autocomplete": "tag-edit" } %>
diff --git a/app/views/posts/partials/index/_excerpt.html.erb b/app/views/posts/partials/index/_excerpt.html.erb
index cbd048b85..5bb118c2d 100644
--- a/app/views/posts/partials/index/_excerpt.html.erb
+++ b/app/views/posts/partials/index/_excerpt.html.erb
@@ -40,13 +40,13 @@
     <% end %>
   <% elsif post_set.pool.present? %>
     <% post_set.pool.tap do |pool| %>
-      <h4>
+      <h2>
         <%= pool.pretty_category %>:
         <%= link_to pool.pretty_name, pool_path(pool), :class => "pool-category-#{pool.category}" %>
         <% if pool.is_deleted? %>
           <span class="inactive">(deleted)</span>
         <% end %>
-      </h4>
+      </h2>
 
       <div id="description" class="prose">
         <%= format_text(post_set.pool.description) %>
@@ -57,10 +57,10 @@
       </p>
     <% end %>
   <% elsif post_set.favgroup.present? %>
-    <h4>
+    <h2>
       Favorite Group:
       <%= link_to post_set.favgroup.pretty_name, favorite_group_path(post_set.favgroup) %>
-    </h4>
+    </h2>
     Creator: <%= link_to_user post_set.favgroup.creator %>
   <% elsif post_set.has_blank_wiki? %>
     <p>There is currently no wiki page for the tag <%= link_to_wiki post_set.tag.pretty_name %>. You can <%= link_to "create one", new_wiki_page_path(wiki_page: { title: post_set.tag.name }), rel: "nofollow" %>.</p>
diff --git a/app/views/posts/partials/index/_mode_menu.html.erb b/app/views/posts/partials/index/_mode_menu.html.erb
index 3f42e70c4..d7c5a9464 100644
--- a/app/views/posts/partials/index/_mode_menu.html.erb
+++ b/app/views/posts/partials/index/_mode_menu.html.erb
@@ -1,6 +1,6 @@
 <% if policy(Post).can_use_mode_menu? %>
   <section id="mode-box">
-    <h1>Mode</h1>
+    <h2>Mode</h2>
     <form action="/">
       <select name="mode">
         <option value="view">View</option>
diff --git a/app/views/posts/partials/index/_options.html.erb b/app/views/posts/partials/index/_options.html.erb
index 3f8b0e7b2..d47338d92 100644
--- a/app/views/posts/partials/index/_options.html.erb
+++ b/app/views/posts/partials/index/_options.html.erb
@@ -1,5 +1,5 @@
 <section id="options-box">
-  <h1>Options</h1>
+  <h2>Options</h2>
   <ul>
     <% if policy(SavedSearch).create? %>
       <li><%= button_tag(tag.i(class: "fas fa-bookmark") + " Save search", id: "save-search", class: "ui-button ui-widget ui-corner-all sub") %></li>
diff --git a/app/views/posts/partials/index/_related.html.erb b/app/views/posts/partials/index/_related.html.erb
index cd0923567..ba1b680ce 100644
--- a/app/views/posts/partials/index/_related.html.erb
+++ b/app/views/posts/partials/index/_related.html.erb
@@ -1,5 +1,5 @@
 <section id="related-box">
-  <h1>Related</h1>
+  <h2>Related</h2>
   <ul id="related-list">
     <% if discover_mode? %> 
       <li id="secondary-links-posts-hot"><%= link_to "Hot", posts_path(:tags => "order:rank") %></li>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 1418f7068..29d8467a9 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -15,17 +15,17 @@
   </section>
 
   <section id="post-information">
-    <h1>Information</h1>
+    <h2>Information</h2>
     <%= render "posts/partials/show/information", :post => @post %>
   </section>
 
   <section id="post-options">
-    <h1>Options</h1>
+    <h2>Options</h2>
     <%= render "posts/partials/show/options", :post => @post %>
   </section>
 
   <section id="post-history">
-    <h1>History</h1>
+    <h2>History</h2>
     <ul>
       <li id="post-history-tags"><%= link_to "Tags", post_versions_path(search: { post_id: @post.id }) %></li>
       <li id="post-history-pools"><%= link_to "Pools", pool_versions_path(search: { post_id: @post.id }) %></li>
diff --git a/app/views/related_tags/_source_tags.html.erb b/app/views/related_tags/_source_tags.html.erb
index cdc307b9a..2b1899c67 100644
--- a/app/views/related_tags/_source_tags.html.erb
+++ b/app/views/related_tags/_source_tags.html.erb
@@ -3,7 +3,7 @@
     <%= render "related_tags/tag_column", tags: source.translated_tags.map(&:name), title: "Translated Tags" %>
 
     <div class="tag-column wide-column artist-related-tags-column">
-      <h6>Artist</h6>
+      <h3>Artist</h3>
 
       <% if source.artists.size == 0 %>
         none
diff --git a/app/views/related_tags/_tag_column.html.erb b/app/views/related_tags/_tag_column.html.erb
index 29d6f514d..0cd87960c 100644
--- a/app/views/related_tags/_tag_column.html.erb
+++ b/app/views/related_tags/_tag_column.html.erb
@@ -2,7 +2,7 @@
 
 <%= content_tag(:div, class: ["tag-column", local_assigns[:class] || "#{title.parameterize}-related-tags-column", "is-empty-#{tags.empty?}"].join(" ")) do %>
   <% if tags.present? %>
-    <h6><%= title %></h6>
+    <h3><%= title %></h3>
     <%= TagSetPresenter.new(tags).tag_list_html(name_only: true) %>
   <% end %>
 <% end %>
diff --git a/app/views/static/error.html.erb b/app/views/static/error.html.erb
index 22e9fd795..8aa90dc1f 100644
--- a/app/views/static/error.html.erb
+++ b/app/views/static/error.html.erb
@@ -4,6 +4,6 @@
 <p><%= @message %></p>
 
 <% unless @expected %>
-  <h6>Details</h6>
+  <h3>Details</h3>
   <%= render "static/backtrace", exception: @exception, backtrace: @backtrace %>
 <% end %>
diff --git a/app/views/static/search_timeout.html.erb b/app/views/static/search_timeout.html.erb
index 96f9861bb..df45e7eb6 100644
--- a/app/views/static/search_timeout.html.erb
+++ b/app/views/static/search_timeout.html.erb
@@ -6,7 +6,7 @@
 
     <p>Your search took too long to execute and was cancelled.</p>
 
-    <h6>Why did this happen?</h6>
+    <h3>Why did this happen?</h3>
 
     <p>
       Some kinds of searches are slower than others. If your search is too slow
@@ -15,7 +15,7 @@
     </p>
 
     <% if params[:controller] == "posts" && params[:action] == "index" && params[:tags].present? %>
-      <h6>What can I do?</h6>
+      <h3>What can I do?</h3>
 
       <p>Try changing your search:</p>
 
@@ -38,7 +38,7 @@
     <% end %>
 
     <% if !CurrentUser.is_gold? %>
-      <h6>Search limits</h6>
+      <h3>Search limits</h3>
 
       <p>
         Members are limited to searches that take up to 3 seconds long. You can
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index fabd7675e..b88b8c138 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -4,7 +4,7 @@
   <div id="a-site-map" class="fixed-width-container">
     <section>
       <ul>
-        <li><h1>Posts</h1></li>
+        <li><h2>Posts</h2></li>
         <li><%= link_to_wiki "Help", "help:posts" %></li>
         <li><%= link_to("Listing", posts_path) %></li>
         <li><%= link_to("Upload", new_upload_path) %></li>
@@ -18,7 +18,7 @@
         <% end %>
       </ul>
       <ul>
-        <li><h1>Post Events</h1></li>
+        <li><h2>Post Events</h2></li>
         <li><%= link_to("Changes", post_versions_path) %></li>
         <li><%= link_to("Approvals", post_approvals_path) %></li>
         <li><%= link_to("Disapprovals", post_disapprovals_path) %></li>
@@ -27,7 +27,7 @@
         <li><%= link_to("Replacements", post_replacements_path) %></li>
       </ul>
       <ul>
-        <li><h1>Tools</h1></li>
+        <li><h2>Tools</h2></li>
         <li><%= link_to("Source Code", Danbooru.config.source_code_url) %></li>
         <li><%= link_to("Bug Reports", Danbooru.config.issues_url) %></li>
         <li><%= link_to("Keyboard Shortcuts", keyboard_shortcuts_path) %></li>
@@ -37,7 +37,7 @@
         <li><%= link_to("Similar Images Search", iqdb_queries_path) %></li>
       </ul>
       <ul>
-        <li><h1>Artists</h1></li>
+        <li><h2>Artists</h2></li>
         <li><%= link_to_wiki "Help", "help:artists" %></li>
         <li><%= link_to("Listing", artists_path) %></li>
         <li><%= link_to("Banned", banned_artists_path) %></li>
@@ -46,7 +46,7 @@
     </section>
     <section>
       <ul>
-        <li><h1>Tags</h1></li>
+        <li><h2>Tags</h2></li>
         <li><%= link_to_wiki "Help", "help:tags" %></li>
         <li><%= link_to_wiki "Cheat sheet", "help:cheatsheet" %></li>
         <li><%= link_to("Aliases", tag_aliases_path) %></li>
@@ -54,14 +54,14 @@
         <li><%= link_to("Listing", tags_path) %></li>
       </ul>
       <ul>
-        <li><h1>Notes</h1></li>
+        <li><h2>Notes</h2></li>
         <li><%= link_to_wiki "Help", "help:notes" %></li>
         <li><%= link_to("Listing", notes_path) %></li>
         <li><%= link_to("Search", search_notes_path) %></li>
         <li><%= link_to("Changes", note_versions_path) %></li>
       </ul>
       <ul>
-        <li><h1>Pools</h1></li>
+        <li><h2>Pools</h2></li>
         <li><%= link_to_wiki "Help", "help:pools" %></li>
         <li><%= link_to("Listing", pools_path) %></li>
         <li><%= link_to("Gallery", gallery_pools_path) %></li>
@@ -70,7 +70,7 @@
         <% end %>
       </ul>
       <ul>
-        <li><h1>Reports</h1></li>
+        <li><h2>Reports</h2></li>
         <li><%= link_to("Performance Reports", "https://isshiki.donmai.us/user-reports") %></li>
         <li><%= link_to("Top Searches", searches_explore_posts_path) %></li>
         <li><%= link_to("Missed Searches", missed_searches_explore_posts_path) %></li>
@@ -78,7 +78,7 @@
     </section>
     <section>
       <ul>
-        <li><h1>Comments</h1></li>
+        <li><h2>Comments</h2></li>
         <li><%= link_to_wiki "Help", "help:comments" %></li>
         <li><%= link_to("Listing", comments_path) %></li>
         <li><%= link_to("Search", search_comments_path) %></li>
@@ -86,7 +86,7 @@
         <li><%= link_to("RSS", comments_path(:atom)) %></li>
       </ul>
       <ul>
-        <li><h1>Forum</h1></li>
+        <li><h2>Forum</h2></li>
         <li><%= link_to_wiki "Help", "help:forum" %></li>
         <li><%= link_to("Listing", forum_topics_path) %></li>
         <li><%= link_to("Search", search_forum_posts_path) %></li>
@@ -94,14 +94,14 @@
         <li><%= link_to("RSS", forum_topics_path(:atom)) %></li>
       </ul>
       <ul>
-        <li><h1>Wiki</h1></li>
+        <li><h2>Wiki</h2></li>
         <li><%= link_to_wiki "Help", "help:wiki" %></li>
         <li><%= link_to("Listing", wiki_pages_path) %></li>
         <li><%= link_to("Search", search_wiki_pages_path) %></li>
         <li><%= link_to("Changes", wiki_page_versions_path) %></li>
       </ul>
       <ul>
-        <li><h1>Artist commentary</h1></li>
+        <li><h2>Artist commentary</h2></li>
         <li><%= link_to_wiki "Help", "help:artist_commentary" %></li>
         <li><%= link_to("Listing", artist_commentaries_path) %></li>
         <li><%= link_to("Search", search_artist_commentaries_path) %></li>
@@ -110,7 +110,7 @@
     </section>
     <section>
       <ul>
-        <li><h1>Profile</h1></li>
+        <li><h2>Profile</h2></li>
         <% if CurrentUser.is_anonymous? %>
           <li><%= link_to "Login", login_path %></li>
           <li><%= link_to "Sign up", new_user_path %></li>
@@ -128,7 +128,7 @@
         <li><%= link_to "Upgrade information", new_user_upgrade_path %></li>
       </ul>
       <ul>
-        <li><h1>Users</h1></li>
+        <li><h2>Users</h2></li>
         <% if CurrentUser.is_moderator? %>
           <li><%= link_to("Dashboard", moderator_dashboard_path) %></li>
         <% end %>
@@ -141,7 +141,7 @@
         <li><%= link_to("Privacy Policy", privacy_policy_path) %></li>
       </ul>
       <ul>
-        <li><h1>Admin</h1></li>
+        <li><h2>Admin</h2></li>
         <li><%= link_to("Mod Actions", mod_actions_path) %></li>
         <li><%= link_to("Jobs", delayed_jobs_path) %></li>
         <li><%= link_to("Bulk Update Requests", bulk_update_requests_path) %></li>
diff --git a/app/views/wiki_pages/_recent_changes.html.erb b/app/views/wiki_pages/_recent_changes.html.erb
index 20f5eb2cc..5f107794e 100644
--- a/app/views/wiki_pages/_recent_changes.html.erb
+++ b/app/views/wiki_pages/_recent_changes.html.erb
@@ -1,5 +1,5 @@
 <section>
-  <h1>Recent Changes (<%= link_to "all", wiki_page_versions_path %>)</h1>
+  <h2>Recent Changes (<%= link_to "all", wiki_page_versions_path %>)</h2>
   <ul>
     <% WikiPage.order(updated_at: :desc).includes(:tag).limit(25).each do |page| %>
       <li><%= link_to page.pretty_title, wiki_page_path(page), class: tag_class(page.tag) %></li>
diff --git a/app/views/wiki_pages/_sidebar.html.erb b/app/views/wiki_pages/_sidebar.html.erb
index 18b7966fe..cc9af4c32 100644
--- a/app/views/wiki_pages/_sidebar.html.erb
+++ b/app/views/wiki_pages/_sidebar.html.erb
@@ -3,7 +3,7 @@
   <%= render "wiki_pages/recent_changes" %>
 
   <% if @wiki_page.present? %>
-    <h4>Options</h4>
+    <h2>Options</h2>
 
     <ul>
       <% unless @wiki_page.is_meta_wiki? %>
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 2f6317b71..9178f6312 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -177,7 +177,6 @@ module Danbooru
           "category" => 0,
           "short" => "gen",
           "extra" => [],
-          "header" => %{<h1 class="general-tag-list">Tags</h1>},
           "relatedbutton" => "General",
           "css" => {
             "color" => "var(--general-tag-color)",
@@ -188,7 +187,6 @@ module Danbooru
           "category" => 4,
           "short" => "char",
           "extra" => ["ch"],
-          "header" => %{<h2 class="character-tag-list">Characters</h2>},
           "relatedbutton" => "Characters",
           "css" => {
             "color" => "var(--character-tag-color)",
@@ -199,7 +197,6 @@ module Danbooru
           "category" => 3,
           "short" => "copy",
           "extra" => ["co"],
-          "header" => %{<h2 class="copyright-tag-list">Copyrights</h2>},
           "relatedbutton" => "Copyrights",
           "css" => {
             "color" => "var(--copyright-tag-color)",
@@ -210,7 +207,6 @@ module Danbooru
           "category" => 1,
           "short" => "art",
           "extra" => [],
-          "header" => %{<h2 class="artist-tag-list">Artists</h2>},
           "relatedbutton" => "Artists",
           "css" => {
             "color" => "var(--artist-tag-color)",
@@ -221,7 +217,6 @@ module Danbooru
           "category" => 5,
           "short" => "meta",
           "extra" => [],
-          "header" => %{<h2 class="meta-tag-list">Meta</h2>},
           "relatedbutton" => nil,
           "css" => {
             "color" => "var(--meta-tag-color)",
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index ac033bf9d..99f7aa3cc 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -3,12 +3,13 @@
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.uncountable "general"
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
-# end
+end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|