diff --git a/material/overrides/blog.html b/material/overrides/blog.html
deleted file mode 100644
index 609da25882b..00000000000
--- a/material/overrides/blog.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{#-
-  This file was automatically generated - do not edit
--#}
-{% extends "overrides/main.html" %}
-{% block content %}
-  {{ super() }}
-  <h2 id="__comments">{{ lang.t("meta.comments") }}</h2>
-  <script src="https://giscus.app/client.js" data-repo="squidfunk/mkdocs-material" data-repo-id="MDEwOlJlcG9zaXRvcnk1MDYxNzQyOA==" data-category="_" data-category-id="DIC_kwDOAwRcVM4CAtJY" data-mapping="pathname" data-reactions-enabled="1" data-emit-metadata="1" data-theme="light" data-lang="en" crossorigin="anonymous" async></script>
-  <script>var theme,giscus=document.querySelector("script[src*=giscus]"),palette=__md_get("__palette");palette&&"object"==typeof palette.color&&(theme="slate"===palette.color.scheme?"dark":"light",giscus.setAttribute("data-theme",theme)),document.addEventListener("DOMContentLoaded",function(){document.querySelector("[data-md-component=palette]").addEventListener("change",function(){var e=__md_get("__palette");e&&"object"==typeof e.color&&(e="slate"===e.color.scheme?"dark":"light",document.querySelector(".giscus-frame").contentWindow.postMessage({giscus:{setConfig:{theme:e}}},"https://giscus.app"))})})</script>
-{% endblock %}
diff --git a/material/overrides/main.html b/material/overrides/main.html
index d61ab0c8329..f414b841fea 100644
--- a/material/overrides/main.html
+++ b/material/overrides/main.html
@@ -14,9 +14,6 @@
     <strong>Twitter</strong>
   </a>
 {% endblock %}
-{% block content %}
-  {% include "overrides/partials/content.html" %}
-{% endblock %}
 {% block scripts %}
   {{ super() }}
   <script src="{{ 'overrides/assets/javascripts/bundle.d665d539.min.js' | url }}"></script>
diff --git a/material/overrides/partials/content.html b/material/overrides/partials/content.html
deleted file mode 100644
index 10acfc0cc03..00000000000
--- a/material/overrides/partials/content.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{#-
-  This file was automatically generated - do not edit
--#}
-{% if "tags" in config.plugins %}
-  {% include "partials/tags.html" %}
-{% endif %}
-{% include "overrides/partials/actions.html" %}
-{% if not "\x3ch1" in page.content %}
-  <h1>{{ page.title | d(config.site_name, true)}}</h1>
-{% endif %}
-{{ page.content }}
-{% if page.meta and (
-  page.meta.git_revision_date_localized or
-  page.meta.revision_date
-) %}
-  {% include "partials/source-file.html" %}
-{% endif %}
-{% include "partials/feedback.html" %}
diff --git a/mkdocs.yml b/mkdocs.yml
index 603dcec3eaf..341d58b67e2 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,6 +36,7 @@ copyright: Copyright &copy; 2016 - 2022 Martin Donath
 # Configuration
 theme:
   name: material
+  custom_dir: material/overrides
   features:
     # - announce.dismiss
     - content.code.annotate
diff --git a/src/overrides/blog.html b/src/overrides/blog.html
deleted file mode 100644
index ddbd3ed802c..00000000000
--- a/src/overrides/blog.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-  Copyright (c) 2016-2022 Martin Donath <martin.donath@squidfunk.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
--->
-
-{% extends "overrides/main.html" %}
-
-<!-- Content -->
-{% block content %}
-  {{ super() }}
-
-  <!-- Giscus - generated by https://giscus.app -->
-  <h2 id="__comments">{{ lang.t("meta.comments") }}</h2>
-  <script
-    src="https://giscus.app/client.js"
-    data-repo="squidfunk/mkdocs-material"
-    data-repo-id="MDEwOlJlcG9zaXRvcnk1MDYxNzQyOA=="
-    data-category="_"
-    data-category-id="DIC_kwDOAwRcVM4CAtJY"
-    data-mapping="pathname"
-    data-reactions-enabled="1"
-    data-emit-metadata="1"
-    data-theme="light"
-    data-lang="en"
-    crossorigin="anonymous"
-    async
-  >
-  </script>
-
-  <!-- Synchronize Giscus theme with palette -->
-  <script>
-    var giscus = document.querySelector("script[src*=giscus]")
-
-    /* Set palette on initial load */
-    var palette = __md_get("__palette")
-    if (palette && typeof palette.color === "object") {
-      var theme = palette.color.scheme === "slate" ? "dark" : "light"
-      giscus.setAttribute("data-theme", theme)
-    }
-
-    /* Register event handlers after documented loaded */
-    document.addEventListener("DOMContentLoaded", function() {
-      var ref = document.querySelector("[data-md-component=palette]")
-      ref.addEventListener("change", function() {
-        var palette = __md_get("__palette")
-        if (palette && typeof palette.color === "object") {
-          var theme = palette.color.scheme === "slate" ? "dark" : "light"
-
-          /* Instruct Giscus to change theme */
-          var frame = document.querySelector(".giscus-frame")
-          frame.contentWindow.postMessage(
-            { giscus: { setConfig: { theme } } },
-            "https://giscus.app"
-          )
-        }
-      })
-    })
-  </script>
-{% endblock %}
diff --git a/src/overrides/main.html b/src/overrides/main.html
index 5aeb7e2941a..88a14e8f732 100644
--- a/src/overrides/main.html
+++ b/src/overrides/main.html
@@ -43,11 +43,6 @@
   </a>
 {% endblock %}
 
-<!-- Content -->
-{% block content %}
-  {% include "overrides/partials/content.html" %}
-{% endblock %}
-
 <!-- Theme-related JavaScript -->
 {% block scripts %}
   {{ super() }}
diff --git a/src/overrides/partials/content.html b/src/overrides/partials/content.html
deleted file mode 100644
index b954431ade5..00000000000
--- a/src/overrides/partials/content.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  Copyright (c) 2016-2022 Martin Donath <martin.donath@squidfunk.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
--->
-
-<!-- Tags -->
-{% if "tags" in config.plugins %}
-  {% include "partials/tags.html" %}
-{% endif %}
-
-<!-- Actions -->
-{% include "overrides/partials/actions.html" %}
-
-<!--
-  Hack: check whether the content contains a h1 headline. If it doesn't, the
-  page title (or respectively site name) is used as the main headline.
--->
-{% if not "\x3ch1" in page.content %}
-  <h1>{{ page.title | d(config.site_name, true)}}</h1>
-{% endif %}
-
-<!-- Page content -->
-{{ page.content }}
-
-<!-- Source file information -->
-{% if page.meta and (
-  page.meta.git_revision_date_localized or
-  page.meta.revision_date
-) %}
-  {% include "partials/source-file.html" %}
-{% endif %}
-
-<!-- Was this page helpful? -->
-{% include "partials/feedback.html" %}