diff --git a/docs/_static/versions.json b/docs/_static/versions.json
deleted file mode 100644
index c66d00dab..000000000
--- a/docs/_static/versions.json
+++ /dev/null
@@ -1 +0,0 @@
-{"release": "", "development": "devel"}
diff --git a/docs/conf.py b/docs/conf.py
index 021e2a9bc..889399ebf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -47,7 +47,8 @@
     "sphinx.ext.todo",
     "sphinx.ext.mathjax",
     "sphinx.ext.viewcode",
-    "nbsphinx",
+    # Disable nbsphinx since it greatly slows down documentation build.
+    #"nbsphinx",
     "recommonmark",
     "sphinx_markdown_tables",
 ]
@@ -76,61 +77,72 @@
 
 # -- HTML theme settings ------------------------------------------------
 
-html_show_sourcelink = True
-html_sidebars = {
-    "**": ["logo-text.html", "globaltoc.html", "localtoc.html", "searchbox.html"]
-}
-
 extensions.append("sphinx_material")
-html_theme_path = sphinx_material.html_theme_path()
-html_context = sphinx_material.get_html_context()
 html_theme = "sphinx_material"
 
 # material theme options (see theme.conf for more information)
 html_theme_options = {
     "logo_svg": "material-design-build-icon.svg",
-    "base_url": "http://bashtage.github.io/sphinx-material/",
+    "site_url": "http://bashtage.github.io/sphinx-material/",
     "repo_url": "https://github.com/bashtage/sphinx-material/",
     "repo_name": "Material for Sphinx",
-    "google_analytics_account": "UA-XXXXX",
-    "html_minify": False,
-    "html_prettify": True,
-    "css_minify": True,
     "repo_type": "github",
+    "google_analytics": ["UA-XXXXX", "auto"],
+    "html_minify": False,
+    "html_prettify": False,
+    "css_minify": False,
     "globaltoc_depth": 2,
-    "color_primary": "blue",
-    "color_accent": "cyan",
-    "touch_icon": "images/apple-icon-152x152.png",
-    "theme_color": "#2196f3",
-    "master_doc": False,
-    "nav_links": [
-        {"href": "index", "internal": True, "title": "Material"},
-        {
-            "href": "https://squidfunk.github.io/mkdocs-material/",
-            "internal": False,
-            "title": "Material for MkDocs",
-        },
+    'features': [
+        'navigation.expand',
+        # 'navigation.tabs',
+        # 'toc.integrate',
+        'navigation.sections',
+        'navigation.instant',
+        # 'header.autohide',
     ],
+    'palette': {
+        'scheme': 'preference',
+        'primary': 'blue',
+        'accent': 'cyan',
+    },
+    "touch_icon": "images/apple-icon-152x152.png",
     "heroes": {
         "index": "A responsive Material Design theme for Sphinx sites.",
         "customization": "Configuration options to personalize your site.",
     },
     "version_dropdown": True,
     "version_json": "_static/versions.json",
-    "version_info": {
-        "Release": "https://bashtage.github.io/sphinx-material/",
-        "Development": "https://bashtage.github.io/sphinx-material/devel/",
-        "Release (rel)": "/sphinx-material/",
-        "Development (rel)": "/sphinx-material/devel/",
-    },
-    "table_classes": ["plain"],
+    "version_info": [
+        {
+            "title": "Release",
+            "version": "https://bashtage.github.io/sphinx-material/",
+            "aliases": []
+        },
+        {
+            "title": "Development",
+            "version": "https://bashtage.github.io/sphinx-material/devel/",
+            "aliases": []
+        },
+        {
+            "title": "Release (rel)",
+            "version": "/sphinx-material/",
+            "aliases": []
+        },
+        {
+            "title": "Development (rel)",
+            "version": "/sphinx-material/devel/",
+            "aliases": []
+        },
+    ],
 }
 
 if FORCE_CLASSIC:
     print("!!!!!!!!! Forcing classic !!!!!!!!!!!")
     html_theme = "classic"
     html_theme_options = {}
-    html_sidebars = {"**": ["globaltoc.html", "localtoc.html", "searchbox.html"]}
+    html_sidebars = {
+        "**": ["globaltoc.html", "localtoc.html", "searchbox.html"]
+    }
 
 language = "en"
 html_last_updated_fmt = ""
@@ -153,11 +165,16 @@
     "dudir": ("http://docutils.sourceforge.net/docs/ref/rst/" "directives.html#%s", ""),
 }
 
+
 # Enable eval_rst in markdown
 def setup(app):
     app.add_config_value(
         "recommonmark_config",
-        {"enable_math": True, "enable_inline_math": True, "enable_eval_rst": True},
+        {
+            "enable_math": True,
+            "enable_inline_math": True,
+            "enable_eval_rst": True
+        },
         True,
     )
     app.add_transform(AutoStructify)
diff --git a/docs/customization.rst b/docs/customization.rst
index dba7f1741..19536af8c 100644
--- a/docs/customization.rst
+++ b/docs/customization.rst
@@ -11,14 +11,12 @@ options are:
 .. code-block:: python
 
     html_theme_options = {
-        'base_url': 'http://bashtage.github.io/sphinx-material/',
+        'site_url': 'http://bashtage.github.io/sphinx-material/',
         'repo_url': 'https://github.com/bashtage/sphinx-material/',
         'repo_name': 'Material for Sphinx',
-        'google_analytics_account': 'UA-XXXXX',
+        'google_analytics': ['UA-XXXXX','auto'],
         'html_minify': True,
         'css_minify': True,
-        'nav_title': 'Material Sphinx Demo',
-        'logo_icon': '&#xe869',
         'globaltoc_depth': 2
     }
 
@@ -28,9 +26,9 @@ The complete list of options with detailed explanations appears in
 Configuration Options
 =====================
 
-``nav_title``
-   Set the name to appear in the left sidebar/header. If not provided, uses
-   html_short_title if defined, or html_title.
+``direction``
+  Specifies the text direction.  Set to ``ltr`` (default) for left-to-right,
+  or ``rtl`` for right-to-left.
 ``touch_icon``
    Path to a touch icon, should be 152x152 or larger.
 ``google_analytics_account``
@@ -41,8 +39,8 @@ Configuration Options
    The name of the repo. If must be set if repo_url is set.
 ``repo_type``
    Must be one of github, gitlab or bitbucket.
-``base_url``
-   Specify a base_url used to generate sitemap.xml links. If not specified, then
+``site_url``
+   Specify a site_url used to generate sitemap.xml links. If not specified, then
    no sitemap will be built.
 ``globaltoc_depth``
    The maximum depth of the global TOC; set it to -1 to allow unlimited depth.
@@ -67,20 +65,6 @@ Configuration Options
    Prettify pages, usually only for debugging.
 ``css_minify``
    Minify css files found in the output directory.
-``logo_icon``
-   Set the logo icon. Should be a pre-escaped html string that indicates a
-   unicode point, e.g., ``'&#xe869'`` which is used on this site.
-``master_doc``
-   Include the master document at the top of the page in the breadcrumb bar.
-   You must also set this to true if you want to override the rootrellink block, in which
-   case the content of the overridden block will appear
-``nav_links``
-   A list of dictionaries where each has three keys:
-
-   - ``href``: The URL or pagename (str)
-   - ``title``: The title to appear (str)
-   - ``internal``: Flag indicating to use pathto to find the page.  Set to False for
-     external content. (bool)
 ``heroes``
    A ``dict[str,str]`` where the key is a pagename and the value is the text to display in the
    page's hero location.
@@ -95,9 +79,6 @@ Configuration Options
 ``version_info``
    A dictionary used to populate the version dropdown.  If this variable is provided, the static
    dropdown is used and any JavaScript information is ignored.
-``table_classes``
-   A list of classes to **not strip** from tables. All other classes are stripped, and the default
-   table has no class attribute. Custom table classes need to provide the full style for the table.
 
 Sidebars
 ========
diff --git a/sphinx_material/__init__.py b/sphinx_material/__init__.py
index 93a64f9f8..5b9153933 100644
--- a/sphinx_material/__init__.py
+++ b/sphinx_material/__init__.py
@@ -1,18 +1,21 @@
 """Sphinx Material theme."""
 
-import hashlib
-import inspect
+import collections
 import os
-import re
 import sys
 from multiprocessing import Manager
 from typing import List, Optional
 from xml.etree import ElementTree
 
-import bs4
+import docutils.nodes
+import jinja2
 import slugify
-from bs4 import BeautifulSoup
-from sphinx.util import console, logging
+import sphinx.addnodes
+import sphinx.builders
+import sphinx.environment.adapters.toctree
+from sphinx.util import console
+import sphinx.util.docutils
+import sphinx.writers.html5
 
 from ._version import get_versions
 
@@ -21,26 +24,292 @@
 
 ROOT_SUFFIX = "--page-root"
 
-USER_TABLE_CLASSES = []
+DEFAULT_THEME_OPTIONS = {
+    'features': [],
+    'font': {
+        'text': 'Roboto',
+        'code': 'Roboto Mono'
+    },
+    'plugins': {
+        'search': {},
+    },
+    'globaltoc_depth': 1,
+    'globaltoc_collapse': True,
+    'globaltoc_includehidden': True,
+}
+
+
+class CustomHTMLTranslator(sphinx.writers.html5.HTML5Translator):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Ensure pygments uses <code> elements, for compatibility with the
+        # mkdocs-material CSS which expects that.
+        self.highlighter.formatter_args.update(wrapcode=True)
+
+        # Ensure all tables are marked as data tables.  The material CSS only
+        # applies to tables with this class, in order to leave tables used for
+        # layout purposes alone.
+        self.settings.table_style = ','.join(
+            self.settings.table_style.split(',') + ['data'])
+
+    def visit_section(self, node: docutils.nodes.section) -> None:
+        # Sphinx normally writes sections with a section heading as:
+        #
+        #     <div id="identifier" class="section"><hN>...</hN>...</div>
+        #
+        # but that is incompatible with the way scroll-margin-top and the
+        # `:target` selector are used in the mkdocs-material CSS.  For
+        # compatibility with mkdocs-material, we strip the outer `<div>` and
+        # instead add the `id` to the inner `<hN>` element.
+        #
+        # That is accomplished by overriding `visit_section` and
+        # `depart_section` not to add the `<div>` and `</div>` tags, and also
+        # modifying `viist_title` to insert the `id`.
+        self.section_level += 1
+
+    def depart_section(self, node: docutils.nodes.section) -> None:
+        self.section_level -= 1
+
+    def visit_title(self, node: docutils.nodes.title) -> None:
+        if isinstance(node.parent, docutils.nodes.section):
+            if node.parent.get('ids') and not node.get('ids'):
+                node['ids'] = node.parent.get('ids')
+                super().visit_title(node)
+                del node['ids']
+                return
+        super().visit_title(node)
+
+
+class _TocVisitor(docutils.nodes.NodeVisitor):
+    """NodeVisitor used by `_get_mkdocs_toc`."""
+    def __init__(self, document, builder, exclude_local=False):
+        super().__init__(document)
+        self._prev_caption = None
+        self._rendered_title = None
+        self._url = None
+        self._builder = builder
+        self._active = False
+        self._children = []
+        self._exclude_local = exclude_local
+
+    def _render(self, node):
+        if not isinstance(node, list):
+            node = [node]
+        return ''.join(
+            self._builder.render_partial(x)['fragment'] for x in node)
+
+    def _render_title(self, node):
+        if not isinstance(node, list):
+            node = [node]
+        return ''.join(x.astext() for x in node)
+
+    def visit_reference(self, node):
+        self._rendered_title = self._render_title(node.children)
+        self._url = node.get('refuri')
+        raise docutils.nodes.SkipChildren
+
+    def visit_compact_paragraph(self, node):
+        pass
+
+    def visit_toctree(self, node):
+        raise docutils.nodes.SkipChildren
+
+    def visit_paragraph(self, node):
+        pass
+
+    def visit_caption(self, node):
+        self._prev_caption = node
+        raise docutils.nodes.SkipChildren
+
+    def visit_bullet_list(self, node):
+        if self._prev_caption is not None and self._prev_caption.parent is node.parent:
+            # Insert as sub-entry
+            title = self._render_title(self._prev_caption.children)
+            self._prev_caption = None
+            child_visitor = _TocVisitor(self.document,
+                                        self._builder,
+                                        exclude_local=self._exclude_local)
+            if node.get('iscurrent', False):
+                child_visitor._active = True
+            node.walk(child_visitor)
+            url = None
+            children = child_visitor._children
+            if children:
+                url = children[0].get('url', None)
+            self._children.append({
+                'title': title,
+                'url': url,
+                'children': children,
+                'active': child_visitor._active
+            })
+            raise docutils.nodes.SkipChildren
+
+    def get_result(self):
+        return {
+            'title': self._rendered_title,
+            'url': self._url,
+            'children': self._children,
+            'active': self._active,
+        }
+
+    def visit_list_item(self, node):
+        child_visitor = _TocVisitor(self.document,
+                                    self._builder,
+                                    exclude_local=self._exclude_local)
+        if node.get('iscurrent', False):
+            child_visitor._active = True
+        for child in node.children:
+            child.walk(child_visitor)
+        child_result = child_visitor.get_result()
+        if self._exclude_local:
+            child_url = child_result['url']
+            fragment_start = child_url.find('#')
+            if fragment_start != -1 and child_url[:fragment_start] == self._url:
+                # Child is a local link within the page
+                raise docutils.nodes.SkipChildren
+        self._children.append(child_result)
+        raise docutils.nodes.SkipChildren
+
+
+def _get_mkdocs_toc(toc_node: docutils.nodes.Node,
+                    builder: sphinx.builders.Builder,
+                    exclude_local: bool) -> list:
+    """Converts a docutils toc node into a mkdocs-format JSON toc."""
+    visitor = _TocVisitor(sphinx.util.docutils.new_document(''),
+                          builder,
+                          exclude_local=exclude_local)
+    toc_node.walk(visitor)
+    return visitor._children
+
+
+def dict_merge(*dicts: List[collections.Mapping]):
+    result = dict()
+    for d in dicts:
+        for k, v in d.items():
+            if (isinstance(v, collections.Mapping) and k in result
+                    and isinstance(result[k], dict)):
+                result[k] = dict_merge(result[k], v)
+            else:
+                result[k] = v
+    return result
+
+
+def html_page_context(app, pagename, templaetname, context, doctree):
+    theme_options = app.config["html_theme_options"]
+    theme_options = dict_merge(DEFAULT_THEME_OPTIONS, theme_options)
+
+    # Add global table of contents in mkdocs format.
+    global_toc_node = sphinx.environment.adapters.toctree.TocTree(
+        app.env).get_toctree_for(
+            pagename,
+            app.builder,
+            collapse=theme_options.get('globaltoc_collapse', False),
+            includehidden=theme_options.get('globaltoc_includehidden', True),
+            maxdepth=theme_options.get('globaltoc_depth', -1),
+        )
+    context.update(
+        nav=_get_mkdocs_toc(global_toc_node, app.builder, exclude_local=True))
+
+    # Add local table of contents in mkdocs format.
+    local_toc_node = sphinx.environment.adapters.toctree.TocTree(
+        app.env).get_toc_for(
+            pagename,
+            app.builder,
+        )
+    local_toc = _get_mkdocs_toc(local_toc_node,
+                                app.builder,
+                                exclude_local=False)
+    if len(local_toc) == 1:
+        local_toc = local_toc[0]['children']
+
+    num_slashes = pagename.count('/')
+    if num_slashes == 0:
+        base_url = '.'
+    else:
+        base_url = '/'.join('..' for _ in range(num_slashes))
+
+    # Add other context values in mkdocs/mkdocs-material format.
+    page = dict(
+        title=jinja2.Markup.escape(
+            jinja2.Markup(context.get('title')).striptags()),
+        is_homepage=(pagename == context['master_doc']),
+        toc=local_toc,
+        meta={
+            'hide': [],
+            'revision_date': context.get('last_updated')
+        },
+        content=context.get('body'),
+    )
+    meta = context.get('meta', {})
+    if meta and meta.get('tocdepth') == 0:
+        page['meta']['hide'].append('toc')
+    if context.get('next'):
+        page['next_page'] = {
+            'title':
+            jinja2.Markup.escape(
+                jinja2.Markup(context['next']['title']).striptags()),
+            'url':
+            context['next']['link'],
+        }
+    if context.get('prev'):
+        page['previous_page'] = {
+            'title':
+            jinja2.Markup.escape(
+                jinja2.Markup(context['prev']['title']).striptags()),
+            'url':
+            context['prev']['link'],
+        }
+
+    version_config = None
+    if theme_options.get('version_dropdown'):
+        version_config = {
+            'staticVersions': theme_options.get('version_info'),
+            'versionPath': theme_options.get('version_json'),
+        }
+
+    context.update(
+        config={
+            "theme": theme_options,
+            'site_url': theme_options.get('site_url'),
+            'site_name': context['docstitle'],
+            'repo_url': theme_options.get('repo_url', None),
+            'repo_name': theme_options.get('repo_name', None),
+            "extra": {
+                'version': version_config,
+                'social': theme_options.get('social'),
+                'disqus': theme_options.get('disqus'),
+                'manifest': theme_options.get('pwa_manifest'),
+            },
+            "plugins": theme_options.get('plugins'),
+            "google_analytics": theme_options.get("google_analytics"),
+        },
+        base_url=base_url,
+        page=page,
+    )
+
+
+def add_jinja_filters(app):
+    # For compatibility with mkdocs
+    app.builder.templates.environment.filters['url'] = lambda url: url
 
 
 def setup(app):
-    """Setup connects events to the sitemap builder"""
+    app.connect("html-page-context", html_page_context)
     app.connect("html-page-context", add_html_link)
+    app.connect("builder-inited", add_jinja_filters)
     app.connect("build-finished", create_sitemap)
     app.connect("build-finished", reformat_pages)
     app.connect("build-finished", minify_css)
-    app.connect("builder-inited", update_html_context)
-    app.connect("config-inited", update_table_classes)
+    app.set_translator('html', CustomHTMLTranslator, override=True)
     manager = Manager()
     site_pages = manager.list()
     sitemap_links = manager.list()
     app.multiprocess_manager = manager
     app.sitemap_links = sitemap_links
     app.site_pages = site_pages
-    app.add_html_theme(
-        "sphinx_material", os.path.join(html_theme_path()[0], "sphinx_material")
-    )
+    app.add_html_theme("sphinx_material",
+                       os.path.abspath(os.path.dirname(__file__)))
     return {
         "version": __version__,
         "parallel_read_safe": True,
@@ -50,9 +319,12 @@ def setup(app):
 
 def add_html_link(app, pagename, templatename, context, doctree):
     """As each page is built, collect page names for the sitemap"""
-    base_url = app.config["html_theme_options"].get("base_url", "")
+    base_url = app.config["html_theme_options"].get("site_url", "")
     if base_url:
-        app.sitemap_links.append(base_url + pagename + ".html")
+        if not base_url.endswith('/'):
+            base_url += '/'
+        full_url = base_url + pagename + app.builder.link_suffix
+        app.sitemap_links.append(full_url)
     minify = app.config["html_theme_options"].get("html_minify", False)
     prettify = app.config["html_theme_options"].get("html_prettify", False)
     if minify and prettify:
@@ -63,18 +335,14 @@ def add_html_link(app, pagename, templatename, context, doctree):
 
 def create_sitemap(app, exception):
     """Generates the sitemap.xml from the collected HTML page links"""
-    if (
-        not app.config["html_theme_options"].get("base_url", "")
-        or exception is not None
-        or not app.sitemap_links
-    ):
+    if (not app.config["html_theme_options"].get("site_url", "")
+            or exception is not None or not app.sitemap_links):
         return
 
     filename = app.outdir + "/sitemap.xml"
-    print(
-        "Generating sitemap for {0} pages in "
-        "{1}".format(len(app.sitemap_links), console.colorize("blue", filename))
-    )
+    print("Generating sitemap for {0} pages in "
+          "{1}".format(len(app.sitemap_links),
+                       console.colorize("blue", filename)))
 
     root = ElementTree.Element("urlset")
     root.set("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9")
@@ -119,14 +387,14 @@ def reformat_pages(app, exception):
 
 def minify_css(app, exception):
     if exception is not None or not app.config["html_theme_options"].get(
-        "css_minify", False
-    ):
+            "css_minify", False):
         app.multiprocess_manager.shutdown()
         return
     import glob
     from css_html_js_minify.css_minifier import css_minify
 
-    css_files = glob.glob(os.path.join(app.outdir, "**", "*.css"), recursive=True)
+    css_files = glob.glob(os.path.join(app.outdir, "**", "*.css"),
+                          recursive=True)
     print("Minifying {0} css files".format(len(css_files)))
     for css_file in css_files:
         colorized = console.colorize("blue", css_file)
@@ -138,167 +406,3 @@ def minify_css(app, exception):
             content.write(css)
     print()
     app.multiprocess_manager.shutdown()
-
-
-def update_html_context(app):
-    config = app.config
-    config.html_context = {**get_html_context(), **config.html_context}
-
-
-def update_table_classes(app, config):
-    table_classes = config.html_theme_options.get("table_classes")
-    if table_classes:
-        USER_TABLE_CLASSES.extend(table_classes)
-
-
-def html_theme_path():
-    return [os.path.dirname(os.path.abspath(__file__))]
-
-
-def ul_to_list(node: bs4.element.Tag, fix_root: bool, page_name: str) -> List[dict]:
-    out = []
-    for child in node.find_all("li", recursive=False):
-        if callable(child.isspace) and child.isspace():
-            continue
-        formatted = {}
-        if child.a is not None:
-            formatted["href"] = child.a["href"]
-            formatted["contents"] = "".join(map(str, child.a.contents))
-            if fix_root and formatted["href"] == "#" and child.a.contents:
-                slug = slugify.slugify(page_name) + ROOT_SUFFIX
-                formatted["href"] = "#" + slug
-            formatted["current"] = "current" in child.a.get("class", [])
-        if child.ul is not None:
-            formatted["children"] = ul_to_list(child.ul, fix_root, page_name)
-        else:
-            formatted["children"] = []
-        out.append(formatted)
-    return out
-
-
-class CaptionList(list):
-    _caption = ""
-
-    def __init__(self, caption=""):
-        super().__init__()
-        self._caption = caption
-
-    @property
-    def caption(self):
-        return self._caption
-
-    @caption.setter
-    def caption(self, value):
-        self._caption = value
-
-
-def derender_toc(
-    toc_text, fix_root=True, page_name: str = "md-page-root--link"
-) -> List[dict]:
-    nodes = []
-    try:
-        toc = BeautifulSoup(toc_text, features="html.parser")
-        for child in toc.children:
-            if callable(child.isspace) and child.isspace():
-                continue
-            if child.name == "p":
-                nodes.append({"caption": "".join(map(str, child.contents))})
-            elif child.name == "ul":
-                nodes.extend(ul_to_list(child, fix_root, page_name))
-            else:
-                raise NotImplementedError
-    except Exception as exc:
-        logger = logging.getLogger(__name__)
-        logger.warning(
-            "Failed to process toctree_text\n" + str(exc) + "\n" + str(toc_text)
-        )
-
-    return nodes
-
-
-def walk_contents(tags):
-    out = []
-    for tag in tags.contents:
-        if hasattr(tag, "contents"):
-            out.append(walk_contents(tag))
-        else:
-            out.append(str(tag))
-    return "".join(out)
-
-
-def table_fix(body_text, page_name="md-page-root--link"):
-    # This is a hack to skip certain classes of tables
-    ignore_table_classes = {"highlighttable", "longtable", "dataframe"}
-    try:
-        body = BeautifulSoup(body_text, features="html.parser")
-        for table in body.select("table"):
-            classes = set(table.get("class", tuple()))
-            if classes.intersection(ignore_table_classes):
-                continue
-            classes = [tc for tc in classes if tc in USER_TABLE_CLASSES]
-            if classes:
-                table["class"] = classes
-            else:
-                del table["class"]
-        first_h1: Optional[bs4.element.Tag] = body.find("h1")
-        headers = body.find_all(re.compile("^h[1-6]$"))
-        for i, header in enumerate(headers):
-            for a in header.select("a"):
-                if "headerlink" in a.get("class", ""):
-                    header["id"] = a["href"][1:]
-        if first_h1 is not None:
-            slug = slugify.slugify(page_name) + ROOT_SUFFIX
-            first_h1["id"] = slug
-            for a in first_h1.select("a"):
-                a["href"] = "#" + slug
-
-        divs = body.find_all("div", {"class": "section"})
-        for div in divs:
-            div.unwrap()
-
-        return str(body)
-    except Exception as exc:
-        logger = logging.getLogger(__name__)
-        logger.warning("Failed to process body_text\n" + str(exc))
-        return body_text
-
-
-# These final lines exist to give sphinx a stable str representation of
-# these two functions across runs, and to ensure that the str changes
-# if the source does.
-#
-# Note that this would be better down with a metaclass factory
-table_fix_src = inspect.getsource(table_fix)
-table_fix_hash = hashlib.sha512(table_fix_src.encode()).hexdigest()
-derender_toc_src = inspect.getsource(derender_toc)
-derender_toc_hash = hashlib.sha512(derender_toc_src.encode()).hexdigest()
-
-
-class TableFixMeta(type):
-    def __repr__(self):
-        return f"table_fix, hash: {table_fix_hash}"
-
-    def __str__(self):
-        return f"table_fix, hash: {table_fix_hash}"
-
-
-class TableFix(object, metaclass=TableFixMeta):
-    def __new__(cls, *args, **kwargs):
-        return table_fix(*args, **kwargs)
-
-
-class DerenderTocMeta(type):
-    def __repr__(self):
-        return f"derender_toc, hash: {derender_toc_hash}"
-
-    def __str__(self):
-        return f"derender_toc, hash: {derender_toc_hash}"
-
-
-class DerenderToc(object, metaclass=DerenderTocMeta):
-    def __new__(cls, *args, **kwargs):
-        return derender_toc(*args, **kwargs)
-
-
-def get_html_context():
-    return {"table_fix": TableFix, "derender_toc": DerenderToc}
diff --git a/sphinx_material/sphinx_material/theme.conf b/sphinx_material/theme.conf
similarity index 52%
rename from sphinx_material/sphinx_material/theme.conf
rename to sphinx_material/theme.conf
index 8d4fb59cf..ac88b183a 100644
--- a/sphinx_material/sphinx_material/theme.conf
+++ b/sphinx_material/theme.conf
@@ -2,17 +2,12 @@
 
 inherit = basic
 stylesheet = material.css
-pygments_style = emacs
 
 [options]
 
-# TODO: Not enabled
-# Set to an html template to load custom HTML for the homepage
-index_template =
+logo_svg =
 
-# Set the name to appear in the left sidebar/header. If not provided, uses
-# html_short_title if defined, or html_title
-nav_title =
+direction =
 
 # TODO: This could be improved
 # Path to a touch icon. Should be 152x152 or larger. Path is relative
@@ -21,12 +16,17 @@ nav_title =
 # this file is not copied
 touch_icon =
 
-# TODO: Not enabled
-# Set this value to enable Disqus comments
-disqus_comments_shortname =
+font =
 
-# Set to enable google analytics
-google_analytics_account =
+features =
+
+palette =
+
+# Set to an array `["UA-XXXXX", "auto"]` to enable google analytics
+google_analytics =
+
+# Set to disqus id to enable disqus integration
+disqus =
 
 # Repository integration
 # Set the repo url for the link to appear
@@ -39,29 +39,19 @@ repo_type = github
 # Sitemap generation
 # Specify a base_url used to generate sitemap.xml links. If not specified, then
 # no sitemap will be built.
-base_url =
+site_url =
+
+pwa_manifest =
+
+plugins =
 
 # TOC Tree generation
 # The maximum depth of the global TOC; set it to -1 to allow unlimited depth
-globaltoc_depth = 1
+globaltoc_depth =
 # If true, TOC entries that are not ancestors of the current page are collapsed
-globaltoc_collapse = true
+globaltoc_collapse =
 # If true, the global TOC tree will also contain hidden entries
-globaltoc_includehidden = true
-
-# Colors
-# The theme color for mobile browsers. Hex color.
-theme_color = #3f51b5
-# Primary colors:
-# red, pink, purple, deep-purple, indigo, blue, light-blue, cyan,
-# teal, green, light-green, lime, yellow, amber, orange, deep-orange,
-# brown, grey, blue-grey, white
-color_primary = blue-grey
-
-# Accent colors:
-# red, pink, purple, deep-purple, indigo, blue, light-blue, cyan,
-# teal, green, light-green, lime, yellow, amber, orange, deep-orange
-color_accent = blue
+globaltoc_includehidden =
 
 # Content Minification
 # Minify pages after creation using htmlmin
@@ -71,20 +61,6 @@ html_prettify = False
 # Minify css files found in the output directory
 css_minify = False
 
-# Set the logo icon
-logo_icon =
-
-# Include the master document at the top of the page in the breadcrumb bar.
-# You must also set this to true if you want to override the rootrellink block, in which
-# case the content of the overridden block will appear
-master_doc = True
-
-# A list of dictionaries where each has three keys:
-#   href: The URL or pagename (str)
-#   title: The title to appear (str)
-#   internal: Flag indicating to use pathto (bool)
-nav_links =
-
 # Text to appear at the top of the home page in a "hero" div. Must be a
 # dict[str, str] of the form pagename: hero text, e.g., {'index': 'text on index'}
 heroes =
@@ -93,9 +69,6 @@ heroes =
 # of the json file required.
 version_dropdown = False
 
-# Text to use in the dropdown menu
-version_dropdown_text = Versions
-
 # Optional dictionary that to use when populating the version dropdown.
 # The key is the text that appears, and the value is the absolute path
 # of the alternative versions
@@ -105,8 +78,3 @@ version_info =
 # file hosted in the root of the site. You can use other file names or locations, e.g.,
 # "_static/old_versions.json"
 version_json = "versions.json"
-
-# Table classes to _not_ strip.  Must be a list. Classes on this list are *not*
-# removed from tables. All other classes are removed, and only tables with outclasses
-# are styled by default.
-table_classes =
\ No newline at end of file
diff --git a/src/base.html b/src/base.html
index 89cb7788f..29b63f832 100644
--- a/src/base.html
+++ b/src/base.html
@@ -20,74 +20,20 @@
   IN THE SOFTWARE.
 -->
 
+{%- extends "basic/layout.html" %}
 {% import "partials/language.html" as lang with context %}
 
-<!doctype html>
-<html lang="{{ lang.t('language') }}" class="no-js">
-  <head>
-
-    <!-- Metatags -->
-    {% block site_meta %}
-      <meta charset="utf-8" />
-      <meta name="viewport" content="width=device-width,initial-scale=1" />
-
-      <!-- Page description -->
-      {% if page and page.meta and page.meta.description %}
-        <meta name="description" content="{{ page.meta.description }}" />
-      {% elif config.site_description %}
-        <meta name="description" content="{{ config.site_description }}" />
-      {% endif %}
-
-      <!-- Page keywords -->
-      {% if page and page.meta and page.meta.keywords %}
-        <meta name="keywords" content="{{ page.meta.keywords }}" />
-      {% elif config.site_keywords %}
-        <meta name="keywords" content="{{ config.site_keywords }}" />
-      {% endif %}
-
-      <!-- Page author -->
-      {% if page and page.meta and page.meta.author %}
-        <meta name="author" content="{{ page.meta.author }}" />
-      {% elif config.site_author %}
-        <meta name="author" content="{{ config.site_author }}" />
-      {% endif %}
-
-      <!-- Canonical -->
-      {% if page.canonical_url %}
-        <link rel="canonical" href="{{ page.canonical_url }}" />
-      {% endif %}
-
-      <!-- Favicon -->
-      <link rel="shortcut icon" href="{{ config.theme.favicon | url }}" />
-
-      <!-- Generator banner -->
-      <meta
-        name="generator"
-        content="mkdocs-{{ mkdocs_version }}, $md-name$-$md-version$"
-      />
-    {% endblock %}
-
-    <!-- Site title -->
-    {% block htmltitle %}
-      {% if page and page.meta and page.meta.title %}
-        <title>{{ page.meta.title }} - {{ config.site_name }}</title>
-      {% elif page and page.title and not page.is_homepage %}
-        <title>{{ page.title | striptags }} - {{ config.site_name }}</title>
-      {% else %}
-        <title>{{ config.site_name }}</title>
-      {% endif %}
-    {% endblock %}
-
+{%- block css %}
     <!-- Theme-related stylesheets -->
     {% block styles %}
-      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.css' | url }}" />
+      <link rel="stylesheet" href="{{ pathto('_static/stylesheets/main.css', resource=True) }}" />
 
       <!-- Extra color palette -->
       {% if config.theme.palette %}
         {% set palette = config.theme.palette %}
         <link
           rel="stylesheet"
-          href="{{ 'assets/stylesheets/palette.css' | url }}"
+          href="{{ pathto('_static/stylesheets/palette.css', resource=True) }}"
         />
 
         <!-- Theme-color meta tag for Android -->
@@ -101,9 +47,6 @@
       {% endif %}
     {% endblock %}
 
-    <!-- JavaScript libraries -->
-    {% block libs %}{% endblock %}
-
     <!-- Webfonts -->
     {% block fonts %}
 
@@ -136,11 +79,6 @@
       />
     {% endif %}
 
-    <!-- Custom stylesheets -->
-    {% for path in config["extra_css"] %}
-      <link rel="stylesheet" href="{{ path | url }}" />
-    {% endfor %}
-
     <!-- Analytics -->
     {% block analytics %}
       {% if config.google_analytics %}
@@ -148,10 +86,25 @@
       {% endif %}
     {% endblock %}
 
-    <!-- Custom front matter -->
-    {% block extrahead %}{% endblock %}
-  </head>
+   <!-- Override default css block to exclude pygments.css, since this theme
+   provides its own pygments styles -->
+    {%- for css in css_files %}
+      {%- if css|attr("filename") %}
+    {{ css_tag(css) }}
+      {%- else %}
+    <link rel="stylesheet" href="{{ pathto(css, 1)|e }}" type="text/css" />
+      {%- endif %}
+    {%- endfor %}
+{%- endblock %}
+
+{%- block extrahead %}
+  {% if theme_touch_icon %}
+    <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}"/>
+  {% endif %}
+  {{ super() }}
+{% endblock %}
 
+{%- block body_tag %}
   <!-- Text direction and color palette, if defined -->
   {% set direction = config.theme.direction or lang.t('direction') %}
   {% if config.theme.palette %}
@@ -180,10 +133,12 @@
   {% else %}
     <body dir="{{ direction }}">
   {% endif %}
+{%- endblock %}
 
     <!-- Retrieve features from configuration -->
     {% set features = config.theme.features or [] %}
 
+{%- block header %}
     <!--
       State toggles - we need to set autocomplete="off" in order to reset the
       drawer on back button invocation in some browsers
@@ -208,12 +163,9 @@
 
     <!-- Skip to content -->
     <div data-md-component="skip">
-      {% if page.toc | first is defined %}
-        {% set skip = page.toc | first %}
-        <a href="{{ skip.url | url }}" class="md-skip">
+        <a href="#{{ pagename }}" class="md-skip">
           {{ lang.t('skip.link.title') }}
         </a>
-      {% endif %}
     </div>
 
     <!-- Announcement bar -->
@@ -228,10 +180,13 @@
     </div>
 
     <!-- Header -->
-    {% block header %}
       {% include "partials/header.html" %}
-    {% endblock %}
+{% endblock %}
 
+{%- block relbar1 %}{% endblock %}
+{%- block relbar2 %}{% endblock %}
+
+{%- block content %}
     <!-- Container -->
     <div class="md-container" data-md-component="container">
 
@@ -297,7 +252,6 @@
             <article class="md-content__inner md-typeset" role="main">
 
               <!-- Content -->
-              {% block content %}
 
                 <!-- Edit button -->
                 {% if page.edit_url %}
@@ -310,17 +264,7 @@
                   </a>
                 {% endif %}
 
-                <!--
-                  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 %}
-
-                <!-- Markdown content -->
-                {{ page.content }}
+                {% block body %} {% endblock %}
 
                 <!-- Last update of source file -->
                 {% if page and page.meta %}
@@ -330,7 +274,6 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
                     {% include "partials/source-date.html" %}
                   {% endif %}
                 {% endif %}
-              {% endblock %}
 
               <!-- Disqus integration -->
               {% block disqus %}
@@ -340,17 +283,17 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
           </div>
         </div>
       </main>
+    </div>
+{%- endblock %}
 
       <!-- Footer -->
       {% block footer %}
         {% include "partials/footer.html" %}
-      {% endblock %}
-    </div>
-
     <!-- Dialog -->
     <div class="md-dialog" data-md-component="dialog">
       <div class="md-dialog__inner md-typeset"></div>
     </div>
+        {%- block footer_scripts %}
 
     <!-- Theme-related configuration -->
     {% block config %}
@@ -387,14 +330,6 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
       </script>
     {% endblock %}
 
-    <!-- Theme-related JavaScript -->
-    {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.js' | url }}"></script>
-
-      <!-- Custom JavaScript -->
-      {% for path in config["extra_javascript"] %}
-        <script src="{{ path | url }}"></script>
-      {% endfor %}
-    {% endblock %}
-  </body>
-</html>
+    <script src="{{ pathto('_static/javascripts/bundle.js', 1) }}"></script>
+  {%- endblock %}
+{% endblock %}
diff --git a/src/layout.html b/src/layout.html
new file mode 100644
index 000000000..b0d1d9d5f
--- /dev/null
+++ b/src/layout.html
@@ -0,0 +1,2 @@
+{# Main layout template is in `base.html` to match mkdocs-material #}
+{% extends "base.html" %}
diff --git a/src/partials/footer.html b/src/partials/footer.html
index 276e04efe..2f4a6c87c 100644
--- a/src/partials/footer.html
+++ b/src/partials/footer.html
@@ -24,6 +24,7 @@
 
 <!-- Footer -->
 <footer class="md-footer">
+  {%- block footerrel %}
 
   <!-- Link to previous and/or next page -->
   {% if page.previous_page or page.next_page %}
@@ -75,6 +76,7 @@
       {% endif %}
     </nav>
   {% endif %}
+  {% endblock %}
 
   <!-- Further information -->
   <div class="md-footer-meta md-typeset">
@@ -82,23 +84,33 @@
 
       <!-- Copyright and theme information -->
       <div class="md-footer-copyright">
-        {% if config.copyright %}
+        {% if show_copyright %}
           <div class="md-footer-copyright__highlight">
-            {{ config.copyright }}
+            {%- if hasdoc('copyright') %}
+              {% trans path=pathto('copyright'), copyright=copyright|e %}&#169;
+                <a href="{{ path }}">Copyright</a> {{ copyright }}.
+              {% endtrans %}
+            {%- else %}
+              {% trans copyright=copyright|e %}&#169; Copyright {{ copyright }}.
+              {% endtrans %}
+            {%- endif %}
           </div>
         {% endif %}
-        Made with
-        <a
-          href="https://squidfunk.github.io/mkdocs-material/"
-          target="_blank" rel="noopener"
-        >
-          Material for MkDocs
-        </a>
+        {%- if show_sphinx %}
+          {% trans sphinx_version=sphinx_version|e %}Created using
+          <a href="http://www.sphinx-doc.org/" target="_blank" rel="noopener">Sphinx</a>
+          {{ sphinx_version }}.
+          {% endtrans %} and
+          <a href="https://github.com/bashtage/sphinx-material/"
+             target="_blank" rel="noopener">Material for Sphinx</a>
+        {%- endif %}
         {% block extracopyright %}{% endblock %}
       </div>
 
       <!-- Social links -->
       {% include "partials/social.html" %}
+      {%- block extrafooter %}
+      {%- endblock %}
     </div>
   </div>
 </footer>
diff --git a/src/partials/header.html b/src/partials/header.html
index 89a7d85da..8d06f8f2b 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -20,11 +20,8 @@
   IN THE SOFTWARE.
 -->
 
-<!-- Mitigate bug: https://github.com/mkdocs/mkdocs/issues/2191 -->
-{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
-{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
-  {% set site_url = site_url ~ "/index.html" %}
-{% endif %}
+{% import "partials/language.html" as lang with context %}
+{% set site_url = pathto(master_doc)|e %}
 
 <!-- Header -->
 <header class="md-header" data-md-component="header">
@@ -53,7 +50,7 @@
       <div class="md-header__ellipsis">
         <div class="md-header__topic">
           <span class="md-ellipsis">
-            {{ config.site_name }}
+            {{ shorttitle }}
           </span>
         </div>
         <div class="md-header__topic" data-md-component="header-topic">
diff --git a/src/partials/language.html b/src/partials/language.html
index c91bc43e8..4041804b4 100644
--- a/src/partials/language.html
+++ b/src/partials/language.html
@@ -21,7 +21,7 @@
 -->
 
 <!-- Import translations for given language and fallback -->
-{% import "partials/languages/" ~ config.theme.language ~ ".html" as lang %}
+{% import "partials/languages/" ~ language ~ ".html" as lang %}
 {% import "partials/languages/en.html" as fallback %}
 
 <!-- Re-export translations -->
diff --git a/src/partials/languages/pl.html b/src/partials/languages/pl.html
old mode 100755
new mode 100644
diff --git a/src/partials/logo.html b/src/partials/logo.html
index 9cb0d0a3b..5e574fc47 100644
--- a/src/partials/logo.html
+++ b/src/partials/logo.html
@@ -21,9 +21,8 @@
 -->
 
 <!-- Logo -->
-{% if config.theme.logo %}
-  <img src="{{ config.theme.logo | url }}" alt="logo" />
-{% else %}
-  {% set icon = config.theme.icon.logo or "material/library" %}
-  {% include ".icons/" ~ icon ~ ".svg" %}
-{% endif %}
+{%- if logo -%}
+  <img src="{{ pathto('_static/' ~ logo, 1) }}" alt="logo" />
+{%- elif theme_logo_svg -%}
+  {%- include theme_logo_svg -%}
+{%- endif -%}
diff --git a/src/partials/nav-item.html b/src/partials/nav-item.html
index 2bbaad7cd..b8b53138b 100644
--- a/src/partials/nav-item.html
+++ b/src/partials/nav-item.html
@@ -65,7 +65,7 @@
 
       <!-- Expand active pages -->
       <label class="md-nav__link" for="{{ path }}">
-        {{ nav_item.title }}
+        <a href="{{ nav_item.url|e }}">{{ nav_item.title }}</a>
         <span class="md-nav__icon md-icon"></span>
       </label>
       <nav
@@ -88,7 +88,7 @@
     </li>
 
   <!-- Currently active page -->
-  {% elif nav_item == page %}
+  {% elif nav_item.active %}
     <li class="{{ class }}">
       {% set toc = page.toc %}
 
@@ -100,11 +100,6 @@
         id="__toc"
       />
 
-      <!-- Hack: see partials/toc.html for more information -->
-      {% if toc | first is defined and "\x3ch1 id=" in page.content %}
-        {% set toc = (toc | first).children %}
-      {% endif %}
-
       <!-- Render table of contents, if not empty -->
       {% if toc | first is defined %}
         <label class="md-nav__link md-nav__link--active" for="__toc">
diff --git a/src/partials/nav.html b/src/partials/nav.html
index 91ff7485f..e23c69d00 100644
--- a/src/partials/nav.html
+++ b/src/partials/nav.html
@@ -20,11 +20,7 @@
   IN THE SOFTWARE.
 -->
 
-<!-- Mitigate bug: https://github.com/mkdocs/mkdocs/issues/2191 -->
-{% set site_url = config.site_url | d(nav.homepage.url, true) | url %}
-{% if not config.use_directory_urls and site_url[0] == site_url[-1] == "." %}
-  {% set site_url = site_url ~ "/index.html" %}
-{% endif %}
+{% set site_url = pathto(master_doc)|e %}
 
 <!-- Determine class according to configuration -->
 {% set class = "md-nav md-nav--primary" %}
diff --git a/src/partials/toc.html b/src/partials/toc.html
index a81f2addd..7f61d6c3e 100644
--- a/src/partials/toc.html
+++ b/src/partials/toc.html
@@ -26,16 +26,6 @@
 <nav class="md-nav md-nav--secondary" aria-label="{{ lang.t('toc.title') }}">
   {% set toc = page.toc %}
 
-  <!--
-    Hack: check whether the content contains a h1 headline. If it does, the
-    top-level anchor must be skipped, since it would be redundant to the link
-    to the current page that is located just above the anchor. Therefore we
-    directly continue with the children of the anchor.
-  -->
-  {% if toc | first is defined and "\x3ch1 id=" in page.content %}
-    {% set toc = (toc | first).children %}
-  {% endif %}
-
   <!-- Render item list -->
   {% if toc | first is defined %}
     <label class="md-nav__title" for="__toc">