diff --git a/.djlintrc b/.djlintrc
new file mode 100644
index 0000000000..58e7fe1c0d
--- /dev/null
+++ b/.djlintrc
@@ -0,0 +1,3 @@
+{
+    "ignore": "D018,H006,H008,H020,H021,H023,H025,H030,H031,T002"
+}
diff --git a/.github/workflows/qc_checks.yaml b/.github/workflows/qc_checks.yaml
index 6084c28e55..ff8a7cc695 100644
--- a/.github/workflows/qc_checks.yaml
+++ b/.github/workflows/qc_checks.yaml
@@ -76,22 +76,6 @@ jobs:
           python InvenTree/manage.py prerender
           npx eslint InvenTree/InvenTree/static_i18n/i18n/*.js
 
-  html:
-    name: Style [HTML]
-    runs-on: ubuntu-20.04
-
-    needs: pep_style
-
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin@v3.1.0
-      - name: Enviroment Setup
-        uses: ./.github/actions/setup
-        with:
-          npm: true
-          install: true
-      - name: Check HTML Files
-        run: npx markuplint **/templates/*.html
-
   pre-commit:
     name: Style [pre-commit]
     runs-on: ubuntu-20.04
@@ -194,7 +178,7 @@ jobs:
     name: Tests - DB [SQLite] + Coverage
     runs-on: ubuntu-20.04
 
-    needs: [ 'javascript', 'html', 'pre-commit' ]
+    needs: [ 'javascript', 'pre-commit' ]
     continue-on-error: true # continue if a step fails so that coverage gets pushed
 
     env:
@@ -227,7 +211,7 @@ jobs:
   postgres:
     name: Tests - DB [PostgreSQL]
     runs-on: ubuntu-20.04
-    needs: [ 'javascript', 'html', 'pre-commit' ]
+    needs: [ 'javascript', 'pre-commit' ]
 
     env:
       INVENTREE_DB_ENGINE: django.db.backends.postgresql
@@ -271,7 +255,7 @@ jobs:
     name: Tests - DB [MySQL]
     runs-on: ubuntu-20.04
 
-    needs: [ 'javascript', 'html', 'pre-commit' ]
+    needs: [ 'javascript', 'pre-commit' ]
     if: github.event_name == 'push'
 
     env:
diff --git a/.markuplintrc b/.markuplintrc
deleted file mode 100644
index 858d05f3b2..0000000000
--- a/.markuplintrc
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "overrides": {
-        "**/templates/*.html": {
-            "rules": {
-                "[[character-reference]]": false
-            }
-        }
-    }
-}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9ed3e281f1..d8e11a1211 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -40,3 +40,7 @@ repos:
         name: pip-compile requirements.txt
         args: [requirements.in, -o, requirements.txt]
         files: ^requirements\.(in|txt)$
+-   repo: https://github.com/Riverside-Healthcare/djLint
+    rev: v1.25.0
+    hooks:
+      - id: djlint-django
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d417fdb62..0702815af2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -128,6 +128,24 @@ The various github actions can be found in the `./github/workflows` directory
 Sumbitted Python code is automatically checked against PEP style guidelines. Locally you can run `invoke style` to ensure the style checks will pass, before submitting the PR.
 Please write docstrings for each function and class - we follow the [google doc-style](https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings) for python. Docstrings for general javascript code is encouraged! Docstyles are checked by `invoke style`.
 
+### Django templates
+
+Django are checked by [djlint](https://github.com/Riverside-Healthcare/djlint) through pre-commit.
+
+The following rules out of the [default set](https://djlint.com/docs/linter/) are not applied:
+```bash
+D018: (Django) Internal links should use the {% url ... %} pattern
+H006: Img tag should have height and width attributes
+H008: Attributes should be double quoted
+H021: Inline styles should be avoided
+H023: Do not use entity references
+H025: Tag seems to be an orphan
+H030: Consider adding a meta description
+H031: Consider adding meta keywords
+T002: Double quotes should be used in tags
+```
+
+
 ## Documentation
 
 New features or updates to existing features should be accompanied by user documentation.
diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html
index f0aff38766..fecc6638f6 100644
--- a/InvenTree/build/templates/build/build_base.html
+++ b/InvenTree/build/templates/build/build_base.html
@@ -7,7 +7,7 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Build Order" %} - {{ build }}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumbs %}
 <li class='breadcrumb-item'><a href='{% url "build-index" %}'>{% trans "Build Orders" %}</a></li>
@@ -25,7 +25,7 @@ src="{% static 'img/blank_image.png' %}"
 
 {% block heading %}
 {% trans "Build Order" %} {{ build }}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <!-- Admin Display -->
@@ -147,7 +147,7 @@ src="{% static 'img/blank_image.png' %}"
     {% endif %}
     {% endif %}
 </div>
-{% endblock %}
+{% endblock details %}
 
 {% block details_right %}
 <table class='table table-striped table-condensed'>
@@ -219,7 +219,7 @@ src="{% static 'img/blank_image.png' %}"
     </tr>
     {% endif %}
 </table>
-{% endblock %}
+{% endblock details_right %}
 
 {% block page_data %}
 <h3>
@@ -231,8 +231,7 @@ src="{% static 'img/blank_image.png' %}"
 <hr>
 <p>{{ build.title }}</p>
 
-
-{% endblock %}
+{% endblock page_data %}
 
 {% block js_ready %}
 
@@ -288,7 +287,7 @@ src="{% static 'img/blank_image.png' %}"
     $('#show-qr-code').click(function() {
         showQRDialog(
             '{% trans "Build Order QR Code" %}',
-            '{"build": {{ build.pk }}}'
+            '{"build": {{ build.pk }} }'
         );
     });
 
@@ -312,4 +311,4 @@ src="{% static 'img/blank_image.png' %}"
     {% endif %}
     {% endif %}
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index 9e4d7c1afb..2e727b4014 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -6,7 +6,7 @@
 
 {% block sidebar %}
 {% include "build/sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block page_content %}
 
@@ -22,12 +22,12 @@
                 <tr>
                     <td><span class='fas fa-info'></span></td>
                     <td>{% trans "Description" %}</td>
-                    <td>{{ build.title }}{% include "clip.html"%}</td>
+                    <td>{{ build.title }}{% include "clip.html" %}</td>
                 </tr>
                 <tr>
                     <td><span class='fas fa-shapes'></span></td>
                     <td>{% trans "Part" %}</td>
-                    <td><a href="{% url 'part-detail' build.part.id %}?display=build-orders">{{ build.part.full_name }}</a>{% include "clip.html"%}</td>
+                    <td><a href="{% url 'part-detail' build.part.id %}?display=build-orders">{{ build.part.full_name }}</a>{% include "clip.html" %}</td>
                 </tr>
                 <tr>
                     <td></td>
@@ -38,7 +38,7 @@
                     <td>{% trans "Stock Source" %}</td>
                     <td>
                         {% if build.take_from %}
-                        <a href="{% url 'stock-location-detail' build.take_from.id %}">{{ build.take_from }}</a>{% include "clip.html"%}
+                        <a href="{% url 'stock-location-detail' build.take_from.id %}">{{ build.take_from }}</a>{% include "clip.html" %}
                         {% else %}
                         <em>{% trans "Stock can be taken from any available location." %}</em>
                         {% endif %}
@@ -51,7 +51,7 @@
                         {% if build.destination %}
                         <a href="{% url 'stock-location-detail' build.destination.id %}">
                             {{ build.destination }}
-                        </a>{% include "clip.html"%}
+                        </a>{% include "clip.html" %}
                         {% else %}
                         <em>{% trans "Destination location not specified" %}</em>
                         {% endif %}
@@ -78,14 +78,14 @@
                 <tr>
                     <td><span class='fas fa-layer-group'></span></td>
                     <td>{% trans "Batch" %}</td>
-                    <td>{{ build.batch }}{% include "clip.html"%}</td>
+                    <td>{{ build.batch }}{% include "clip.html" %}</td>
                 </tr>
                 {% endif %}
                 {% if build.parent %}
                 <tr>
                     <td><span class='fas fa-sitemap'></span></td>
                     <td>{% trans "Parent Build" %}</td>
-                    <td><a href="{% url 'build-detail' build.parent.id %}">{{ build.parent }}</a>{% include "clip.html"%}</td>
+                    <td><a href="{% url 'build-detail' build.parent.id %}">{{ build.parent }}</a>{% include "clip.html" %}</td>
                 </tr>
                 {% endif %}
                 {% if build.priority != 0 %}
@@ -99,7 +99,7 @@
                 <tr>
                     <td><span class='fas fa-dolly'></span></td>
                     <td>{% trans "Sales Order" %}</td>
-                    <td><a href="{% url 'so-detail' build.sales_order.id %}">{{ build.sales_order }}</a>{% include "clip.html"%}</td>
+                    <td><a href="{% url 'so-detail' build.sales_order.id %}">{{ build.sales_order }}</a>{% include "clip.html" %}</td>
                 </tr>
                 {% endif %}
                 {% if build.link %}
@@ -319,8 +319,7 @@
     </div>
 </div>
 
-
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -519,4 +518,4 @@ $('#allocate-selected-items').click(function() {
 
 enableSidebar('buildorder');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html
index 6f08348f44..5094c6a45a 100644
--- a/InvenTree/build/templates/build/index.html
+++ b/InvenTree/build/templates/build/index.html
@@ -6,11 +6,11 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Build Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block heading %}
 {% trans "Build Orders" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.build.add %}
@@ -18,7 +18,7 @@
     <span class='fas fa-tools'></span> {% trans "New Build Order" %}
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 
@@ -35,7 +35,7 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock page_info %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -48,4 +48,4 @@ loadBuildTable($("#build-table"), {
     locale: '{{ request.LANGUAGE_CODE }}',
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html
index 2bf017b506..7953635671 100644
--- a/InvenTree/company/templates/company/company_base.html
+++ b/InvenTree/company/templates/company/company_base.html
@@ -6,11 +6,11 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Company" %} - {{ company.name }}
-{% endblock %}
+{% endblock page_title %}
 
 {% block heading %}
 {% trans "Company" %}: {{ company.name }}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <!-- Admin View -->
@@ -45,7 +45,7 @@
 
 {% block thumbnail %}
 <div class='dropzone part-thumb-container' id='company-thumb'>
-    <img class="part-thumb" id='company-image'
+    <img class="part-thumb" id='company-image' alt="{% trans 'Part image' %}"
     {% if company.image %}
     src="{{ company.image.preview.url }}"
     {% else %}
@@ -62,7 +62,7 @@
         </div>
     </div>
 </div>
-{% endblock %}
+{% endblock thumbnail %}
 
 {% block details %}
 <table class='table table-striped table-condensed'>
@@ -74,7 +74,7 @@
     </tr>
     <tr>
         <td><span class='fas fa-industry'></span></td>
-        <td>{%trans "Manufacturer" %}</td>
+        <td>{% trans "Manufacturer" %}</td>
         <td>{% include "yesnolabel.html" with value=company.is_manufacturer %}</td>
     </tr>
     <tr>
@@ -89,7 +89,7 @@
     </tr>
 </table>
 
-{% endblock %}
+{% endblock details %}
 
 {% block details_right %}
 
@@ -99,7 +99,7 @@
 <tr>
     <td><span class='fas fa-globe'></span></td>
     <td>{% trans "Website" %}</td>
-    <td><a href="{{ company.website }}">{{ company.website }}</a>{% include "clip.html"%}</td>
+    <td><a href="{{ company.website }}">{{ company.website }}</a>{% include "clip.html" %}</td>
 </tr>
 {% endif %}
 <tr>
@@ -117,7 +117,7 @@
 <tr>
     <td><span class='fas fa-map-marked-alt'></span></td>
     <td>{% trans "Address" %}</td>
-    <td>{{ company.address }}{% include "clip.html"%}</td>
+    <td>{{ company.address }}{% include "clip.html" %}</td>
 </tr>
 {% endif %}
 {% if company.phone %}
@@ -138,11 +138,11 @@
 <tr>
     <td><span class='fas fa-user'></span></td>
     <td>{% trans "Contact" %}</td>
-    <td>{{ company.contact }}{% include "clip.html"%}</td>
+    <td>{{ company.contact }}{% include "clip.html" %}</td>
 </tr>
 {% endif %}
 </table>
-{% endblock %}
+{% endblock details_right %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -262,4 +262,4 @@
         });
     }
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 0f3bc6e203..513aaff775 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -5,7 +5,7 @@
 
 {% block sidebar %}
 {% include 'company/sidebar.html' %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block page_content %}
 
@@ -270,7 +270,7 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -542,4 +542,4 @@
 
     enableSidebar('company');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html
index f9790a9a1d..b255137114 100644
--- a/InvenTree/company/templates/company/index.html
+++ b/InvenTree/company/templates/company/index.html
@@ -6,11 +6,11 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Supplier List" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block heading %}
 {{ title }}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if pagetype == 'manufacturers' and roles.purchase_order.add or pagetype == 'suppliers' and roles.purchase_order.add or pagetype == 'customers' and roles.sales_order.add %}
@@ -18,7 +18,7 @@
     <span class='fas fa-plus-circle'></span> {{ button_text }}
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 
@@ -32,7 +32,7 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock page_info %}
 {% block js_ready %}
 {{ block.super }}
 
@@ -59,4 +59,4 @@
         }
     );
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index 50663c620f..c26e828558 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -5,7 +5,7 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Manufacturer Part" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block sidebar %}
 {% include "company/manufacturer_part_sidebar.html" %}
@@ -48,7 +48,7 @@
 {% endblock actions %}
 
 {% block thumbnail %}
-<img class='part-thumb'
+<img class='part-thumb' alt="{% trans 'Part image' %}"
 {% if part.part.image %}
 src='{{ part.part.image.preview.url }}'
 {% else %}
@@ -65,7 +65,7 @@ src="{% static 'img/blank_image.png' %}"
         <td>{% trans "Internal Part" %}</td>
         <td>
             {% if part.part %}
-            <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html"%}
+            <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html" %}
             {% endif %}
         </td>
     </tr>
@@ -73,7 +73,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td></td>
         <td>{% trans "Description" %}</td>
-        <td>{{ part.description }}{% include "clip.html"%}</td>
+        <td>{{ part.description }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
 </table>
@@ -90,7 +90,7 @@ src="{% static 'img/blank_image.png' %}"
         <td>{% trans "Manufacturer" %}</td>
         <td>
             {% if part.manufacturer %}
-            <a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html"%}
+            <a href="{% url 'company-detail' part.manufacturer.id %}">{{ part.manufacturer.name }}</a>{% include "clip.html" %}
             {% else %}
             <em>{% trans "No manufacturer information available" %}</em>
             {% endif %}
@@ -99,7 +99,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "MPN" %}</td>
-        <td>{{ part.MPN }}{% include "clip.html"%}</td>
+        <td>{{ part.MPN }}{% include "clip.html" %}</td>
     </tr>
     {% if part.link %}
     <tr>
@@ -191,8 +191,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-{% endblock %}
-
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -325,7 +324,7 @@ $('#delete-part').click(function() {
                         success: function() {
                             {% if part.manufacturer %}
                             window.location.href = "{% url 'company-detail' part.manufacturer.id %}";
-                            {% else%}
+                            {% else %}
                             window.location.href = "{% url 'index' %}";
                             {% endif %}
                         }
@@ -338,4 +337,4 @@ $('#delete-part').click(function() {
 
 enableSidebar('manufacturerpart');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index 90f85faed8..87fc1f0f10 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -81,13 +81,13 @@
 {% endblock actions %}
 
 {% block thumbnail %}
-<img class='part-thumb'
+<img class='part-thumb' alt="{% trans 'Part image' %}"
 {% if part.part.image %}
 src='{{ part.part.image.preview.url }}'
 {% else %}
 src="{% static 'img/blank_image.png' %}"
 {% endif %}/>
-{% endblock %}
+{% endblock thumbnail %}
 
 {% block details %}
 
@@ -98,7 +98,7 @@ src="{% static 'img/blank_image.png' %}"
         <td>{% trans "Internal Part" %}</td>
         <td>
             {% if part.part %}
-            <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html"%}
+            <a href="{% url 'part-detail' part.part.id %}?display=part-suppliers">{{ part.part.full_name }}</a>{% include "clip.html" %}
             {% endif %}
         </td>
     </tr>
@@ -106,7 +106,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td></td>
         <td>{% trans "Description" %}</td>
-        <td>{{ part.description }}{% include "clip.html"%}</td>
+        <td>{{ part.description }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if part.availability_updated %}
@@ -129,7 +129,7 @@ src="{% static 'img/blank_image.png' %}"
             <td><span class='fas fa-building'></span></td>
             <td>{% trans "Supplier" %}</td>
             <td>{% if part.supplier %}
-                <a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a>{% include "clip.html"%}
+                <a href="{% url 'company-detail' part.supplier.id %}">{{ part.supplier.name }}</a>{% include "clip.html" %}
                 {% else %}
                 <em>{% trans "No supplier information available" %}</em>
                 {% endif %}
@@ -138,28 +138,28 @@ src="{% static 'img/blank_image.png' %}"
         <tr>
             <td><span class='fas fa-hashtag'></span></td>
             <td>{% trans "SKU" %}</td>
-            <td>{{ part.SKU }}{% include "clip.html"%}</tr>
+            <td>{{ part.SKU }}{% include "clip.html" %}</tr>
         </tr>
         {% if part.manufacturer_part.manufacturer %}
         <tr>
             <td><span class='fas fa-industry'></span></td>
             <td>{% trans "Manufacturer" %}</td>
             <td><a href="{% url 'company-detail' part.manufacturer_part.manufacturer.id %}">
-            {{ part.manufacturer_part.manufacturer.name }}</a>{% include "clip.html"%}</td>
+            {{ part.manufacturer_part.manufacturer.name }}</a>{% include "clip.html" %}</td>
         </tr>
         {% endif %}
         {% if part.manufacturer_part.MPN %}
         <tr>
             <td><span class='fas fa-hashtag'></span></td>
             <td>{% trans "MPN" %}</td>
-            <td><a href="{% url 'manufacturer-part-detail' part.manufacturer_part.id %}">{{ part.manufacturer_part.MPN }}</a>{% include "clip.html"%}</td>
+            <td><a href="{% url 'manufacturer-part-detail' part.manufacturer_part.id %}">{{ part.manufacturer_part.MPN }}</a>{% include "clip.html" %}</td>
         </tr>
         {% endif %}
         {% if part.packaging %}
         <tr>
             <td><span class='fas fa-cube'></span></td>
             <td>{% trans "Packaging" %}</td>
-            <td>{{ part.packaging }}{% include "clip.html"%}</td>
+            <td>{{ part.packaging }}{% include "clip.html" %}</td>
         </tr>
         {% endif %}
         {% if part.pack_size != 1.0 %}
@@ -173,7 +173,7 @@ src="{% static 'img/blank_image.png' %}"
         <tr>
             <td><span class='fas fa-sticky-note'></span></td>
             <td>{% trans "Note" %}</td>
-            <td>{{ part.note }}{% include "clip.html"%}</td>
+            <td>{{ part.note }}{% include "clip.html" %}</td>
         </tr>
         {% endif %}
         {% if part.link %}
@@ -184,7 +184,7 @@ src="{% static 'img/blank_image.png' %}"
         </tr>
         {% endif %}
 </table>
-{% endblock %}
+{% endblock details_right %}
 
 {% block page_content %}
 
@@ -256,7 +256,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -266,7 +266,7 @@ src="{% static 'img/blank_image.png' %}"
 $("#show-qr-code").click(function() {
     showQRDialog(
         '{% trans "Supplier Part QR Code" %}',
-        '{"supplierpart": {{ part.pk }}}'
+        '{"supplierpart": {{ part.pk }} }'
     );
 });
 
@@ -397,4 +397,4 @@ $('#delete-part').click(function() {
 
 enableSidebar('supplierpart');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/label/templates/label/label_base.html b/InvenTree/label/templates/label/label_base.html
index 79913c946f..6ee1c42575 100644
--- a/InvenTree/label/templates/label/label_base.html
+++ b/InvenTree/label/templates/label/label_base.html
@@ -10,7 +10,7 @@
             {% endlocalize %}
             {% block margin %}
             margin: 0mm;
-            {% endblock %}
+            {% endblock margin %}
         }
 
         body {
@@ -35,7 +35,7 @@
 
         {% block style %}
         /* User-defined styles can go here */
-        {% endblock %}
+        {% endblock style %}
 
     </style>
 </head>
@@ -44,6 +44,6 @@
     <div class='content'>
         {% block content %}
         <!-- Label data rendered here! -->
-        {% endblock %}
+        {% endblock content %}
     </div>
 </body>
diff --git a/InvenTree/label/templates/label/part/part_label.html b/InvenTree/label/templates/label/part/part_label.html
index ba7b3c148b..ef4af6be41 100644
--- a/InvenTree/label/templates/label/part/part_label.html
+++ b/InvenTree/label/templates/label/part/part_label.html
@@ -1,7 +1,6 @@
 {% extends "label/label_base.html" %}
 
-{% load l10n %}
-{% load barcode %}
+{% load l10n i18n barcode %}
 
 {% block style %}
 
@@ -25,14 +24,14 @@
     top: 2mm;
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block content %}
 
-<img class='qr' src='{% qrcode qr_data %}'>
+<img class='qr' alt="{% trans 'QC Code' %}" src='{% qrcode qr_data %}'>
 
 <div class='part'>
     {{ part.full_name }}
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/label/templates/label/part/part_label_code128.html b/InvenTree/label/templates/label/part/part_label_code128.html
index 088eed0555..982baf4422 100644
--- a/InvenTree/label/templates/label/part/part_label_code128.html
+++ b/InvenTree/label/templates/label/part/part_label_code128.html
@@ -1,7 +1,6 @@
 {% extends "label/label_base.html" %}
 
-{% load l10n %}
-{% load barcode %}
+{% load l10n i18n barcode %}
 
 {% block style %}
 
@@ -25,14 +24,14 @@
     top: 2mm;
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block content %}
 
-<img class='qr' src='{% barcode qr_data %}'>
+<img class='qr' alt='{% trans "QR code" %}' src='{% barcode qr_data %}'>
 
 <div class='part'>
     {{ part.full_name }}
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/label/templates/label/stockitem/qr.html b/InvenTree/label/templates/label/stockitem/qr.html
index ba0de3a4ec..3a67a7793d 100644
--- a/InvenTree/label/templates/label/stockitem/qr.html
+++ b/InvenTree/label/templates/label/stockitem/qr.html
@@ -1,7 +1,6 @@
 {% extends "label/label_base.html" %}
 
-{% load l10n %}
-{% load barcode %}
+{% load l10n i18n barcode %}
 
 {% block style %}
 
@@ -15,9 +14,9 @@
     {% endlocalize %}
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block content %}
 
-<img class='qr' src='{% qrcode qr_data %}'>
-{% endblock %}
+<img class='qr' alt="{% trans 'QC Code' %}" src='{% qrcode qr_data %}'>
+{% endblock content %}
diff --git a/InvenTree/label/templates/label/stocklocation/qr.html b/InvenTree/label/templates/label/stocklocation/qr.html
index ba0de3a4ec..3a67a7793d 100644
--- a/InvenTree/label/templates/label/stocklocation/qr.html
+++ b/InvenTree/label/templates/label/stocklocation/qr.html
@@ -1,7 +1,6 @@
 {% extends "label/label_base.html" %}
 
-{% load l10n %}
-{% load barcode %}
+{% load l10n i18n barcode %}
 
 {% block style %}
 
@@ -15,9 +14,9 @@
     {% endlocalize %}
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block content %}
 
-<img class='qr' src='{% qrcode qr_data %}'>
-{% endblock %}
+<img class='qr' alt="{% trans 'QC Code' %}" src='{% qrcode qr_data %}'>
+{% endblock content %}
diff --git a/InvenTree/label/templates/label/stocklocation/qr_and_text.html b/InvenTree/label/templates/label/stocklocation/qr_and_text.html
index 86466a44bd..aa18b3d332 100644
--- a/InvenTree/label/templates/label/stocklocation/qr_and_text.html
+++ b/InvenTree/label/templates/label/stocklocation/qr_and_text.html
@@ -1,7 +1,6 @@
 {% extends "label/label_base.html" %}
 
-{% load l10n %}
-{% load barcode %}
+{% load l10n i18n barcode %}
 
 {% block style %}
 
@@ -25,14 +24,14 @@
     top: 2mm;
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block content %}
 
-<img class='qr' src='{% qrcode qr_data %}'>
+<img class='qr' alt="{% trans 'QR code' %}" src='{% qrcode qr_data %}'>
 
 <div class='loc'>
     {{ location.name }}
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html
index 6890ce7858..3c703bb2ae 100644
--- a/InvenTree/order/templates/order/order_base.html
+++ b/InvenTree/order/templates/order/order_base.html
@@ -108,7 +108,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Order Reference" %}</td>
-        <td>{{ order.reference }}{% include "clip.html"%}</td>
+        <td>{{ order.reference }}{% include "clip.html" %}</td>
     </tr>
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
@@ -140,7 +140,7 @@ src="{% static 'img/blank_image.png' %}"
         <td>{% trans "Supplier" %}</td>
         <td>
             {% if order.supplier %}
-            <a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html"%}
+            <a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html" %}
             {% else %}
             <em>{% trans "No suppplier information available" %}</em>
             {% endif %}
@@ -150,7 +150,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Supplier Reference" %}</td>
-        <td>{{ order.supplier_reference }}{% include "clip.html"%}</td>
+        <td>{{ order.supplier_reference }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     <tr>
@@ -329,7 +329,7 @@ $("#export-order").click(function() {
 $('#show-qr-code').click(function() {
     showQRDialog(
         '{% trans "Purchase Order QR Code" %}',
-        '{"purchaseorder": {{ order.pk }}}'
+        '{"purchaseorder": {{ order.pk }} }'
     );
 });
 
diff --git a/InvenTree/order/templates/order/order_wizard/match_fields.html b/InvenTree/order/templates/order/order_wizard/match_fields.html
index 288ddb21eb..f1d7a71f74 100644
--- a/InvenTree/order/templates/order/order_wizard/match_fields.html
+++ b/InvenTree/order/templates/order/order_wizard/match_fields.html
@@ -96,4 +96,4 @@ $('.fieldselect').select2({
     matcher: partialMatcher,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/order_wizard/match_parts.html b/InvenTree/order/templates/order/order_wizard/match_parts.html
index 4f22ac124d..5615dd986f 100644
--- a/InvenTree/order/templates/order/order_wizard/match_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/match_parts.html
@@ -44,7 +44,7 @@
             </tr>
         </thead>
         <tbody>
-             <tr></tr> {% comment %} Dummy row for javascript del_row method {% endcomment %}
+             <tr>{% comment %} Dummy row for javascript del_row method {% endcomment %}</tr>
             {% for row in rows %}
             <tr {% if row.errors %} style='background: #ffeaea;'{% endif %} part-select='#select_part_{{ row.index }}'>
                 <td>
@@ -123,4 +123,4 @@ $('.currencyselect').select2({
     dropdownAutoWidth: true,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html
index 6683fabdf1..b5d4b681bc 100644
--- a/InvenTree/order/templates/order/order_wizard/po_upload.html
+++ b/InvenTree/order/templates/order/order_wizard/po_upload.html
@@ -7,7 +7,7 @@
 {% url "po-detail" order.id as url %}
 {% trans "Return to Orders" as text %}
 {% include "sidebar_item.html" with url=url text=text icon="fa-undo" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block page_content %}
     {% trans "Upload File for Purchase Order" as header_text %}
@@ -60,9 +60,9 @@
             </div>
         </div>
     {% endwith %}
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index 0e5839c6b5..f6cf72643d 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -5,7 +5,6 @@
 {% load i18n %}
 {% load static %}
 
-
 {% block sidebar %}
 {% include 'order/po_sidebar.html' %}
 {% endblock sidebar %}
@@ -264,4 +263,4 @@ loadOrderTotal(
 
 enableSidebar('purchaseorder');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html
index e60f015fa6..23b56baee1 100644
--- a/InvenTree/order/templates/order/purchase_orders.html
+++ b/InvenTree/order/templates/order/purchase_orders.html
@@ -6,11 +6,11 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Purchase Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block heading %}
 {% trans "Purchase Orders" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.purchase_order.add %}
@@ -18,7 +18,7 @@
     <span class='fas fa-plus-circle'></span> {% trans "New Purchase Order" %}
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 
@@ -38,12 +38,12 @@
 
 </div>
 
-{% endblock %}
+{% endblock page_info %}
 
 {% block js_load %}
 {{ block.super }}
 
-{% endblock %}
+{% endblock js_load %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -56,4 +56,4 @@ loadPurchaseOrderTable("#purchase-order-table", {
     url: "{% url 'api-po-list' %}",
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/return_order_base.html b/InvenTree/order/templates/order/return_order_base.html
index 990d5cd5c0..f908d3baf8 100644
--- a/InvenTree/order/templates/order/return_order_base.html
+++ b/InvenTree/order/templates/order/return_order_base.html
@@ -22,7 +22,7 @@ src="{{ order.customer.image.url }}"
 src="{% static 'img/blank_image.png' %}"
 {% endif %}
 />
-{% endblock thumbnail%}
+{% endblock thumbnail %}
 
 {% block heading %}
 {% trans "Return Order" %} {{ order.reference }}
@@ -100,7 +100,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Order Reference" %}</td>
-        <td>{{ order.reference }}{% include "clip.html"%}</td>
+        <td>{{ order.reference }}{% include "clip.html" %}</td>
     </tr>
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
@@ -130,14 +130,14 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Customer" %}</td>
-        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td>
+        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if order.customer_reference %}
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Customer Reference" %}</td>
-        <td>{{ order.customer_reference }}{% include "clip.html"%}</td>
+        <td>{{ order.customer_reference }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if order.link %}
@@ -255,7 +255,7 @@ $('#print-order-report').click(function() {
 $('#show-qr-code').click(function() {
     showQRDialog(
         '{% trans "Return Order QR Code" %}',
-        '{"returnorder": {{ order.pk }}}'
+        '{"returnorder": {{ order.pk }} }'
     );
 });
 
diff --git a/InvenTree/order/templates/order/return_order_detail.html b/InvenTree/order/templates/order/return_order_detail.html
index e57896ec41..56a943308f 100644
--- a/InvenTree/order/templates/order/return_order_detail.html
+++ b/InvenTree/order/templates/order/return_order_detail.html
@@ -6,7 +6,7 @@
 {% load static %}
 
 {% block sidebar %}
-{% include "order/return_order_sidebar.html"  %}
+{% include "order/return_order_sidebar.html" %}
 {% endblock sidebar %}
 
 {% block page_content %}
diff --git a/InvenTree/order/templates/order/return_orders.html b/InvenTree/order/templates/order/return_orders.html
index e364214c85..698b682be0 100644
--- a/InvenTree/order/templates/order/return_orders.html
+++ b/InvenTree/order/templates/order/return_orders.html
@@ -6,15 +6,14 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Return Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block heading %}
 {% trans "Return Orders" %}
-{% endblock %}
-
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.return_order.add %}
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index c78d3e5391..c64c45d614 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -7,12 +7,12 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Sales Order" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumbs %}
 <li class='breadcrumb-item'><a href='{% url "sales-order-index" %}'>{% trans "Sales Orders" %}</a></li>
 <li class="breadcrumb-item active" aria-current="page"><a href='{% url "so-detail" order.id %}'>{{ order }}</a></li>
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block thumbnail %}
 <img class='part-thumb'
@@ -22,11 +22,11 @@ src="{{ order.customer.image.url }}"
 src="{% static 'img/blank_image.png' %}"
 {% endif %}
 />
-{% endblock %}
+{% endblock thumbnail %}
 
 {% block heading %}
 {% trans "Sales Order" %} {{ order.reference }}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if user.is_staff and roles.sales_order.change %}
@@ -105,7 +105,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Order Reference" %}</td>
-        <td>{{ order.reference }}{% include "clip.html"%}</td>
+        <td>{{ order.reference }}{% include "clip.html" %}</td>
     </tr>
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
@@ -134,7 +134,7 @@ src="{% static 'img/blank_image.png' %}"
     {% endif %}
 </div>
 
-{% endblock %}
+{% endblock details %}
 
 {% block details_right %}
 <table class='table table-striped table-condensed'>
@@ -143,14 +143,14 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Customer" %}</td>
-        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td>
+        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if order.customer_reference %}
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Customer Reference" %}</td>
-        <td>{{ order.customer_reference }}{% include "clip.html"%}</td>
+        <td>{{ order.customer_reference }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     <tr>
@@ -238,7 +238,7 @@ src="{% static 'img/blank_image.png' %}"
         </td>
     </tr>
 </table>
-{% endblock %}
+{% endblock details_right %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -304,7 +304,7 @@ $('#print-order-report').click(function() {
 $('#show-qr-code').click(function() {
     showQRDialog(
         '{% trans "Sales Order QR Code" %}',
-        '{"salesorder": {{ order.pk }}}'
+        '{"salesorder": {{ order.pk }} }'
     );
 });
 
@@ -332,4 +332,4 @@ $('#export-order').click(function() {
     exportOrder('{% url "so-export" order.id %}');
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index 055f85f046..ede1e30711 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -6,8 +6,8 @@
 {% load static %}
 
 {% block sidebar %}
-{% include "order/so_sidebar.html"  %}
-{% endblock %}
+{% include "order/so_sidebar.html" %}
+{% endblock sidebar %}
 
 {% block page_content %}
 {% settings_value "SALESORDER_EDIT_COMPLETED_ORDERS" as allow_extra_editing %}
@@ -158,7 +158,7 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -297,7 +297,6 @@
         });
     });
 
-
     loadOrderTotal(
         '#soTotalPrice',
         {
@@ -307,4 +306,4 @@
 
     enableSidebar('salesorder');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/order/templates/order/sales_orders.html b/InvenTree/order/templates/order/sales_orders.html
index 99e53f1a0e..86c64fbe54 100644
--- a/InvenTree/order/templates/order/sales_orders.html
+++ b/InvenTree/order/templates/order/sales_orders.html
@@ -6,14 +6,14 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Sales Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block heading %}
 {% trans "Sales Orders" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.sales_order.add %}
@@ -21,7 +21,7 @@
     <span class='fas fa-plus-circle'></span> {% trans "New Sales Order" %}
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 
@@ -40,7 +40,7 @@
     <div id='sales-order-calendar'></div>
 </div>
 
-{% endblock %}
+{% endblock page_info %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -53,4 +53,4 @@ $("#so-create").click(function() {
     createSalesOrder();
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 839ffe4233..2c36111310 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -5,7 +5,7 @@
 
 {% block sidebar %}
 {% include 'part/category_sidebar.html' %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block breadcrumb_tree %}
 <div id="breadcrumb-tree"></div>
@@ -22,7 +22,7 @@
 {% else %}
 {% trans "Parts" %}
 {% endif %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if category and user.is_staff and roles.part_category.change %}
@@ -69,7 +69,7 @@
 </div>
 {% endif %}
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block details_left %}
 <table class='table table-striped table-condensed'>
@@ -245,11 +245,11 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_load %}
 {{ block.super }}
-{% endblock %}
+{% endblock js_load %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -352,7 +352,6 @@
         editCategory({{ category.pk }});
     });
 
-
     $('#cat-delete').click(function() {
         deletePartCategory({{ category.pk }}, {
             {% if category.parent %}
@@ -384,4 +383,4 @@
     // Enable left-hand navigation sidebar
     enableSidebar('category');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/copy_part.html b/InvenTree/part/templates/part/copy_part.html
index 49a45f5b3a..92f0c789aa 100644
--- a/InvenTree/part/templates/part/copy_part.html
+++ b/InvenTree/part/templates/part/copy_part.html
@@ -22,4 +22,4 @@
 </ul>
 {% endif %}
 
-{% endblock %}
+{% endblock pre_form_content %}
diff --git a/InvenTree/part/templates/part/create_part.html b/InvenTree/part/templates/part/create_part.html
index 4aed2bbd48..998ec2ae6e 100644
--- a/InvenTree/part/templates/part/create_part.html
+++ b/InvenTree/part/templates/part/create_part.html
@@ -21,4 +21,4 @@
 </div>
 {% endif %}
 
-{% endblock %}
+{% endblock pre_form_content %}
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 01831d62d5..c4018e3055 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -6,7 +6,7 @@
 
 {% block sidebar %}
 {% include 'part/part_sidebar.html' %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block breadcrumb_tree %}
 <div id="breadcrumb-tree"></div>
@@ -431,11 +431,11 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_load %}
 {{ block.super }}
-{% endblock %}
+{% endblock js_load %}
 
 {% block js_ready %}
     {{ block.super }}
@@ -733,7 +733,7 @@
         $('#new-variant').click(function() {
 
             duplicatePart(
-                {{ part.pk}},
+                {{ part.pk }},
                 {
                     variant: true,
                 }
@@ -757,7 +757,6 @@
         });
     });
 
-
     $("#part-order2").click(function() {
         inventreeGet(
             '{% url "api-part-detail" part.pk %}',
@@ -926,4 +925,4 @@
         }
     });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html b/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html
index 380fe0a12e..3d31911570 100644
--- a/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html
+++ b/InvenTree/part/templates/part/import_wizard/ajax_match_fields.html
@@ -86,4 +86,4 @@ $('.fieldselect').select2({
     matcher: partialMatcher,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/import_wizard/ajax_match_references.html b/InvenTree/part/templates/part/import_wizard/ajax_match_references.html
index 405a21e845..c773bb01a3 100644
--- a/InvenTree/part/templates/part/import_wizard/ajax_match_references.html
+++ b/InvenTree/part/templates/part/import_wizard/ajax_match_references.html
@@ -81,4 +81,4 @@ $('.currencyselect').select2({
     dropdownAutoWidth: true,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/import_wizard/ajax_part_upload.html b/InvenTree/part/templates/part/import_wizard/ajax_part_upload.html
index 86303c1002..ad3dbf0df0 100644
--- a/InvenTree/part/templates/part/import_wizard/ajax_part_upload.html
+++ b/InvenTree/part/templates/part/import_wizard/ajax_part_upload.html
@@ -30,4 +30,4 @@
     </div>
 {% endif %}
 </div>
-{% endblock %}
+{% endblock form %}
diff --git a/InvenTree/part/templates/part/import_wizard/match_fields.html b/InvenTree/part/templates/part/import_wizard/match_fields.html
index c1d802e9ee..77d364f445 100644
--- a/InvenTree/part/templates/part/import_wizard/match_fields.html
+++ b/InvenTree/part/templates/part/import_wizard/match_fields.html
@@ -96,4 +96,4 @@ $('.fieldselect').select2({
     matcher: partialMatcher,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/import_wizard/match_references.html b/InvenTree/part/templates/part/import_wizard/match_references.html
index ece8211c1e..fff58924fa 100644
--- a/InvenTree/part/templates/part/import_wizard/match_references.html
+++ b/InvenTree/part/templates/part/import_wizard/match_references.html
@@ -88,4 +88,4 @@ $('.currencyselect').select2({
     dropdownAutoWidth: true,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/import_wizard/part_upload.html b/InvenTree/part/templates/part/import_wizard/part_upload.html
index d32b2ea5bc..7c4050766f 100644
--- a/InvenTree/part/templates/part/import_wizard/part_upload.html
+++ b/InvenTree/part/templates/part/import_wizard/part_upload.html
@@ -7,7 +7,7 @@
 {% url 'part-index' as url %}
 {% trans "Return to Parts" as text %}
 {% include "sidebar_link.html" with url=url text=text icon="fa-undo" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block content %}
     {% trans "Import Parts from File" as header_text %}
@@ -66,7 +66,7 @@
         {% endif %}
         </div>
     </div>
-{% endblock %}
+{% endblock content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -113,4 +113,4 @@ function downloadPartImportTemplate(options={}) {
     });
 }
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html
index c7b38f9cc2..fbb06b2aef 100644
--- a/InvenTree/part/templates/part/part_app_base.html
+++ b/InvenTree/part/templates/part/part_app_base.html
@@ -11,7 +11,7 @@
 {% else %}
 {% inventree_title %} | {% trans "Part List" %}
 {% endif %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumbs %}
 <a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><span class="fas fa-bars"></span></a>
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 208dc8404a..5e26f6d020 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -6,15 +6,15 @@
 
 {% block sidebar %}
 {% include "part/part_sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block thumbnail %}
 {% include "part/part_thumb.html" %}
-{% endblock %}
+{% endblock thumbnail %}
 
 {% block heading %}
 {{ part.full_name }}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <!-- Admin View -->
@@ -104,7 +104,7 @@
     </ul>
 </div>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block details %}
 
@@ -170,7 +170,7 @@
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
         <td>{% trans "Description" %}</td>
-        <td>{{ part.description }}{% include "clip.html"%}</td>
+        <td>{{ part.description }}{% include "clip.html" %}</td>
     </tr>
 
     {% if part.variant_of %}
@@ -269,7 +269,7 @@
             <tr>
                 <td><span class='fas fa-tag'></span></td>
                 <td>{% trans "IPN" %}</td>
-                <td>{{ part.IPN }}{% include "clip.html"%}</td>
+                <td>{{ part.IPN }}{% include "clip.html" %}</td>
             </tr>
             {% endif %}
             {% settings_value "PART_ENABLE_REVISION" as show_revision %}
@@ -277,7 +277,7 @@
             <tr>
                 <td><span class='fas fa-code-branch'></span></td>
                 <td>{% trans "Revision" %}</td>
-                <td>{{ part.revision }}{% include "clip.html"%}</td>
+                <td>{{ part.revision }}{% include "clip.html" %}</td>
             </tr>
             {% endif %}
             {% if part.units %}
@@ -298,7 +298,7 @@
             <tr>
                 <td><span class='fas fa-key'></span></td>
                 <td>{% trans "Keywords" %}</td>
-                <td>{{ part.keywords }}{% include "clip.html"%}</td>
+                <td>{{ part.keywords }}{% include "clip.html" %}</td>
             </tr>
             {% endif %}
             {% include "barcode_data.html" with instance=part %}
@@ -444,7 +444,7 @@
     $("#show-qr-code").click(function() {
         showQRDialog(
             '{% trans "Part QR Code" %}',
-            '{"part": {{ part.pk }}}',
+            '{"part": {{ part.pk }} }',
         );
     });
 
@@ -567,7 +567,6 @@
         )
     });
 
-
     function onSelectImage(response) {
         // Callback when the image-selection modal form is displayed
         // Populate the form with image data (requested via AJAX)
@@ -591,7 +590,7 @@
                     title: 'Image',
                     searchable: true,
                     formatter: function(value, row, index, field) {
-                        return "<img src='/media/" + value + "' class='grid-image'/>"
+                        return "<img src='/media/" + value + "' alt='image' class='grid-image'/>"
                     }
                 }
             ],
@@ -694,4 +693,4 @@
         findStockItemBySerialNumber({{ part.pk }});
     });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/part/templates/part/part_pricing.html b/InvenTree/part/templates/part/part_pricing.html
index 52c7e44525..18e1b7f7b4 100644
--- a/InvenTree/part/templates/part/part_pricing.html
+++ b/InvenTree/part/templates/part/part_pricing.html
@@ -10,7 +10,7 @@
 <table class='table table-striped table-condensed table-price-two'>
     <tr>
         <td><strong>{% trans 'Part' %}</strong></td>
-        <td>{{ part  }}</td>
+        <td>{{ part }}</td>
     </tr>
     <tr>
         <td><strong>{% trans 'Quantity' %}</strong></td>
@@ -124,4 +124,4 @@
 </div>
 {% endif %}
 <hr>
-{% endblock %}
+{% endblock pre_form_content %}
diff --git a/InvenTree/part/templates/part/part_thumb.html b/InvenTree/part/templates/part/part_thumb.html
index d676e4ce9a..5cfd475d3c 100644
--- a/InvenTree/part/templates/part/part_thumb.html
+++ b/InvenTree/part/templates/part/part_thumb.html
@@ -17,7 +17,7 @@
         </div>
     </div>
     {% endif %}
-    <img class="part-thumb" id='part-image'
+    <img class="part-thumb" id='part-image' alt="{% trans 'Part image' %}"
         {% if part.image %}
         src="{{ part.image.preview.url }}"
         {% else %}
diff --git a/InvenTree/part/templates/part/prices.html b/InvenTree/part/templates/part/prices.html
index f788e4f36d..62f082b69d 100644
--- a/InvenTree/part/templates/part/prices.html
+++ b/InvenTree/part/templates/part/prices.html
@@ -233,7 +233,6 @@
 </div>
 {% endif %}
 
-
 {% if part.assembly and part.has_bom %}
 <a class="anchor" id="bom-cost"></a>
 <div class='panel-heading'>
diff --git a/InvenTree/part/templates/part/pricing_javascript.html b/InvenTree/part/templates/part/pricing_javascript.html
index 7385d60b7c..94592b2af1 100644
--- a/InvenTree/part/templates/part/pricing_javascript.html
+++ b/InvenTree/part/templates/part/pricing_javascript.html
@@ -22,7 +22,7 @@ $('#part-pricing-refresh').click(function() {
 // Internal Pricebreaks
 {% if show_internal_price and roles.sales_order.view %}
 initPriceBreakSet($('#internal-price-break-table'), {
-    part_id: {{part.id}},
+    part_id: {{ part.id }},
     pb_human_name: 'internal price break',
     pb_url_slug: 'internal-price',
     pb_url: '{% url 'api-part-internal-price-list' %}',
@@ -63,7 +63,7 @@ loadVariantPricingChart({
     initPriceBreakSet(
         $('#price-break-table'),
         {
-            part_id: {{part.id}},
+            part_id: {{ part.id }},
             pb_human_name: 'sale price break',
             pb_url_slug: 'sale-price',
             pb_url: "{% url 'api-part-sale-price-list' %}",
diff --git a/InvenTree/part/templates/part/select_image.html b/InvenTree/part/templates/part/select_image.html
index c7506fe47e..e75a282c2f 100644
--- a/InvenTree/part/templates/part/select_image.html
+++ b/InvenTree/part/templates/part/select_image.html
@@ -4,8 +4,7 @@
 
 {{ block.super }}
 
-
-{% endblock %}
+{% endblock pre_form_content %}
 
 {% block form %}
 <form method='post' action='' class='js-modal-form' enctype='multipart/form-data'>
@@ -18,4 +17,4 @@
 </table>
 
 </form>
-{% endblock %}
+{% endblock form %}
diff --git a/InvenTree/part/templates/part/upload_bom.html b/InvenTree/part/templates/part/upload_bom.html
index 68ec20f5e2..542d6a4074 100644
--- a/InvenTree/part/templates/part/upload_bom.html
+++ b/InvenTree/part/templates/part/upload_bom.html
@@ -7,11 +7,11 @@
 {% url "part-detail" part.id as url %}
 {% trans "Return to BOM" as text %}
 {% include "sidebar_link.html" with url=url text=text icon="fa-undo" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block heading %}
 {% trans "Upload Bill of Materials" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <!--
@@ -28,7 +28,7 @@
 <button type='button' class='btn btn-success' id='bom-submit' style='display: none;'>
     <span class='fas fa-sign-in-alt' id='bom-submit-icon'></span> {% trans "Submit BOM Data" %}
 </button>
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 <div class='panel-content'>
diff --git a/InvenTree/part/templates/part/variant_part.html b/InvenTree/part/templates/part/variant_part.html
index 413e2ff1f3..c964c0d4e8 100644
--- a/InvenTree/part/templates/part/variant_part.html
+++ b/InvenTree/part/templates/part/variant_part.html
@@ -10,4 +10,4 @@
     {% trans "Create a new variant part from this template" %}
 </div>
 
-{% endblock %}
+{% endblock pre_form_content %}
diff --git a/InvenTree/report/templates/report/inventree_bill_of_materials_report.html b/InvenTree/report/templates/report/inventree_bill_of_materials_report.html
index da0881c68b..aa9cfe2a1e 100644
--- a/InvenTree/report/templates/report/inventree_bill_of_materials_report.html
+++ b/InvenTree/report/templates/report/inventree_bill_of_materials_report.html
@@ -8,15 +8,15 @@
 {% block page_margin %}
 margin: 2cm;
 margin-top: 4cm;
-{% endblock %}
+{% endblock page_margin %}
 
 {% block bottom_left %}
-content: "v{{report_revision}} - {{ date.isoformat }}";
-{% endblock %}
+content: "v{{ report_revision }} - {{ date.isoformat }}";
+{% endblock bottom_left %}
 
 {% block bottom_center %}
 content: "{% inventree_version shortstring=True %}";
-{% endblock %}
+{% endblock bottom_center %}
 
 {% block style %}
 
@@ -90,7 +90,7 @@ table td.expand {
     display: inline;
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block header_content %}
 
@@ -100,7 +100,7 @@ table td.expand {
         <h3>{% trans "Bill of Materials" %}</h3>
     </div>
 
-    {% endblock %}
+{% endblock header_content %}
 
 {% block page_content %}
 
@@ -123,7 +123,7 @@ table td.expand {
             </td>
             <td>
                 <div class='part-logo'>
-                    <img src='{% part_image part %}' class='part-logo'>
+                    <img src='{% part_image part %}' alt='{% trans "Image" %}' class='part-logo'>
                 </div>
             </td>
         </tr>
@@ -145,7 +145,7 @@ table td.expand {
         <tr>
             <td>
                 <div class='thumb-container'>
-                    <img src='{% part_image line.sub_part %}' class='part-thumb'>
+                    <img src='{% part_image line.sub_part %}' alt='{% trans "Image" %}' class='part-thumb'>
                 </div>
                 <div class='part-text'>
                     {{ line.sub_part.full_name }}
@@ -159,4 +159,4 @@ table td.expand {
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock page_content %}
diff --git a/InvenTree/report/templates/report/inventree_build_order_base.html b/InvenTree/report/templates/report/inventree_build_order_base.html
index 20f72e58ee..b60d38173f 100644
--- a/InvenTree/report/templates/report/inventree_build_order_base.html
+++ b/InvenTree/report/templates/report/inventree_build_order_base.html
@@ -9,7 +9,7 @@
 {% block page_margin %}
 margin: 2cm;
 margin-top: 4cm;
-{% endblock %}
+{% endblock page_margin %}
 
 {% block style %}
 
@@ -71,11 +71,11 @@ margin-top: 4cm;
     border-bottom: 1px solid #555;
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block bottom_left %}
-content: "v{{report_revision}} - {{ date.isoformat }}";
-{% endblock %}
+content: "v{{ report_revision }} - {{ date.isoformat }}";
+{% endblock bottom_left %}
 
 {% block header_content %}
     <img class='logo' src="{% logo_image %}" alt="logo" width="150">
@@ -89,13 +89,13 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
     </div>
 
     <hr>
-{% endblock %}
+{% endblock header_content %}
 
 {% block page_content %}
 
 <div class='details'>
     <div class='details-image'>
-        <img class='part-image' src="{% part_image part %}">
+        <img class='part-image' alt="{% trans 'Part image' %}" src="{% part_image part %}">
     </div>
 
     <div class='details-container'>
@@ -175,4 +175,4 @@ content: "v{{report_revision}} - {{ date.isoformat }}";
 {{ build.notes|markdownify }}
 {% endif %}
 
-{% endblock %}
+{% endblock page_content %}
diff --git a/InvenTree/report/templates/report/inventree_order_report_base.html b/InvenTree/report/templates/report/inventree_order_report_base.html
index f9adc114cd..ceaf3edd7e 100644
--- a/InvenTree/report/templates/report/inventree_order_report_base.html
+++ b/InvenTree/report/templates/report/inventree_order_report_base.html
@@ -9,15 +9,15 @@
 {% block page_margin %}
 margin: 2cm;
 margin-top: 4cm;
-{% endblock %}
+{% endblock page_margin %}
 
 {% block bottom_left %}
-content: "v{{report_revision}} - {{ date.isoformat }}";
-{% endblock %}
+content: "v{{ report_revision }} - {{ date.isoformat }}";
+{% endblock bottom_left %}
 
 {% block bottom_center %}
 content: "{% inventree_version shortstring=True %}";
-{% endblock %}
+{% endblock bottom_center %}
 
 {% block style %}
 
@@ -36,7 +36,6 @@ content: "{% inventree_version shortstring=True %}";
     display: inline;
 }
 
-
 .part-thumb {
     max-width: 32px;
     max-height: 32px;
@@ -67,4 +66,4 @@ table td.expand {
     width: 99%
 }
 
-{% endblock %}
+{% endblock style %}
diff --git a/InvenTree/report/templates/report/inventree_po_report_base.html b/InvenTree/report/templates/report/inventree_po_report_base.html
index 88eb5cb2c4..847fe656e2 100644
--- a/InvenTree/report/templates/report/inventree_po_report_base.html
+++ b/InvenTree/report/templates/report/inventree_po_report_base.html
@@ -15,7 +15,7 @@
         {% if supplier %}{{ supplier.name }}{% else %}{% trans "Supplier was deleted" %}{% endif %}
     </div>
 
-{% endblock %}
+{% endblock header_content %}
 
 {% block page_content %}
 
@@ -37,7 +37,7 @@
         <tr>
             <td>
                 <div class='thumb-container'>
-                    <img src='{% part_image line.part.part %}' class='part-thumb'>
+                    <img src='{% part_image line.part.part %}' class='part-thumb' alt="{% trans 'Part image' %}">
                 </div>
                 <div class='part-text'>
                     {{ line.part.part.full_name }}
@@ -77,5 +77,4 @@
     </tbody>
 </table>
 
-
-{% endblock %}
+{% endblock page_content %}
diff --git a/InvenTree/report/templates/report/inventree_report_base.html b/InvenTree/report/templates/report/inventree_report_base.html
index 2146053513..115af8d7b1 100644
--- a/InvenTree/report/templates/report/inventree_report_base.html
+++ b/InvenTree/report/templates/report/inventree_report_base.html
@@ -91,17 +91,17 @@
 
     <div class='header'>
         {% block header_content %}
-        {% endblock %}
+        {% endblock header_content %}
     </div>
 
     <div class='content'>
         {% block page_content %}
-        {% endblock %}
+        {% endblock page_content %}
     </div>
 
     <div class='footer'>
         {% block footer_content %}
-        {% endblock %}
+        {% endblock footer_content %}
     </div>
 
 </body>
diff --git a/InvenTree/report/templates/report/inventree_return_order_report_base.html b/InvenTree/report/templates/report/inventree_return_order_report_base.html
index 93b2f30c06..c6e24b4741 100644
--- a/InvenTree/report/templates/report/inventree_return_order_report_base.html
+++ b/InvenTree/report/templates/report/inventree_return_order_report_base.html
@@ -32,7 +32,7 @@
         <tr>
             <td>
                 <div class='thumb-container'>
-                    <img src='{% part_image line.item.part %}' class='part-thumb'>
+                    <img src='{% part_image line.item.part %}' alt='{% trans "Image" %}' class='part-thumb'>
                 </div>
                 <div class='part-text'>
                     {{ line.item.part.full_name }}
diff --git a/InvenTree/report/templates/report/inventree_so_report_base.html b/InvenTree/report/templates/report/inventree_so_report_base.html
index daeace7b1d..4a39a7402d 100644
--- a/InvenTree/report/templates/report/inventree_so_report_base.html
+++ b/InvenTree/report/templates/report/inventree_so_report_base.html
@@ -15,7 +15,7 @@
         {{ customer.name }}
     </div>
 
-{% endblock %}
+{% endblock header_content %}
 
 {% block page_content %}
 
@@ -37,7 +37,7 @@
         <tr>
             <td>
                 <div class='thumb-container'>
-                    <img src='{% part_image line.part %}' class='part-thumb'>
+                    <img src='{% part_image line.part %}' alt='{% trans "Part image" %}' class='part-thumb'>
                 </div>
                 <div class='part-text'>
                     {{ line.part.full_name }}
@@ -76,5 +76,4 @@
     </tbody>
 </table>
 
-
-{% endblock %}
+{% endblock page_content %}
diff --git a/InvenTree/report/templates/report/inventree_test_report_base.html b/InvenTree/report/templates/report/inventree_test_report_base.html
index fbb5f34d3f..0242ffe0c9 100644
--- a/InvenTree/report/templates/report/inventree_test_report_base.html
+++ b/InvenTree/report/templates/report/inventree_test_report_base.html
@@ -11,15 +11,15 @@
 
 {% block bottom_left %}
 content: "{{ date.isoformat }}";
-{% endblock %}
+{% endblock bottom_left %}
 
 {% block bottom_center %}
 content: "{% inventree_version shortstring=True %}";
-{% endblock %}
+{% endblock bottom_center %}
 
 {% block top_center %}
 content: "{% trans 'Stock Item Test Report' %}";
-{% endblock %}
+{% endblock top_center %}
 
 .test-row {
     padding: 3px;
@@ -63,11 +63,11 @@ content: "{% trans 'Stock Item Test Report' %}";
     height: 4cm;
 }
 
-{% endblock %}
+{% endblock style %}
 
 {% block pre_page_content %}
 
-{% endblock %}
+{% endblock pre_page_content %}
 
 {% block page_content %}
 
@@ -81,7 +81,7 @@ content: "{% trans 'Stock Item Test Report' %}";
         <p><em>Stock Item ID: {{ stock_item.pk }}</em></p>
     </div>
     <div class='img-right'>
-        <img class='part-img' src="{% part_image part %}">
+        <img class='part-img' alt='{% trans "Part image" %}' src="{% part_image part %}">
         <hr>
         <h4>
             {% if stock_item.is_serialized %}
@@ -160,7 +160,7 @@ content: "{% trans 'Stock Item Test Report' %}";
     {% for sub_item in installed_items %}
         <tr>
             <td>
-                <img src='{% part_image sub_item.part %}' class='part-img' style='max-width: 24px; max-height: 24px;'>
+                <img src='{% part_image sub_item.part %}' class='part-img' alt='{% trans "Part image" %}' style='max-width: 24px; max-height: 24px;'>
                 {{ sub_item.part.full_name }}
             </td>
             <td>
@@ -177,8 +177,8 @@ content: "{% trans 'Stock Item Test Report' %}";
 
 {% endif %}
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block post_page_content %}
 
-{% endblock %}
+{% endblock post_page_content %}
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index a886e71b6c..cd08abbe0d 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -7,7 +7,7 @@
 
 {% block sidebar %}
 {% include "stock/stock_sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block page_content %}
 
@@ -165,7 +165,7 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -334,4 +334,4 @@
 
     enableSidebar('stockitem');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index db50bfd571..45484d0701 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -8,19 +8,19 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Stock Item" %} - {{ item }}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumbs %}
 <a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><span class="fas fa-bars"></span></a>
 {% include 'stock/loc_link.html' with location=item.location %}
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block breadcrumb_tree %}
 <div id="breadcrumb-tree"></div>
 {% endblock breadcrumb_tree %}
 
 {% block heading %}
-    {% trans "Stock Item" %}: {{ item.part.full_name}}
+    {% trans "Stock Item" %}: {{ item.part.full_name }}
 {% endblock heading %}
 
 {% block actions %}
@@ -131,7 +131,7 @@
 {% endblock actions %}
 
 {% block thumbnail %}
-<img class='part-thumb' {% if item.part.image %}src="{{ item.part.image.preview.url }}"{% else %}src="{% static 'img/blank_image.png' %}"{% endif %}/>
+<img class='part-thumb' alt='{% trans "Image" %}' {% if item.part.image %}src="{{ item.part.image.preview.url }}"{% else %}src="{% static 'img/blank_image.png' %}"{% endif %}/>
 {% endblock thumbnail %}
 
 {% block details %}
@@ -446,11 +446,9 @@
         {% endif %}
     </tr>
 
-
 </table>
 {% endblock details_right %}
 
-
 {% block js_ready %}
 {{ block.super }}
 
@@ -531,7 +529,7 @@ $('#stock-edit-status').click(function () {
 $("#show-qr-code").click(function() {
     showQRDialog(
         '{% trans "Stock Item QR Code" %}',
-        '{"stockitem": {{ item.pk }}}',
+        '{"stockitem": {{ item.pk }} }',
     );
 });
 
@@ -704,4 +702,4 @@ enableBreadcrumbTree({
     }
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/stock/templates/stock/item_serialize.html b/InvenTree/stock/templates/stock/item_serialize.html
index 0d79d489f0..6be4d260b2 100644
--- a/InvenTree/stock/templates/stock/item_serialize.html
+++ b/InvenTree/stock/templates/stock/item_serialize.html
@@ -5,4 +5,4 @@
 {% trans "Create serialized items from this stock item." %}
 <br>
 {% trans "Select quantity to serialize, and unique serial numbers." %}
-{% endblock %}
+{% endblock pre_form_content %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index b97194899e..93e653053c 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -6,7 +6,7 @@
 
 {% block sidebar %}
 {% include "stock/location_sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block breadcrumb_tree %}
 <div id="breadcrumb-tree"></div>
@@ -23,7 +23,7 @@
 {% else %}
 {% trans "Stock" %}
 {% endif %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 
@@ -111,7 +111,7 @@
 {% endif %}
 {% endif %}
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block details_left %}
 <table class='table table-striped table-condensed'>
@@ -230,7 +230,7 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -375,7 +375,7 @@
     $('#show-qr-code').click(function() {
         showQRDialog(
             '{% trans "Stock Location QR Code" %}',
-            '{"stocklocation": {{ location.pk }}}'
+            '{"stocklocation": {{ location.pk }} }'
         );
     });
 
@@ -396,7 +396,6 @@
         });
     });
 
-
     {% endif %}
 
     {% endif %}
@@ -446,4 +445,4 @@
         defaultIcon: global_settings.STOCK_LOCATION_DEFAULT_ICON,
     });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/stock/templates/stock/stock_app_base.html b/InvenTree/stock/templates/stock/stock_app_base.html
index cf30a3221a..16e31ff732 100644
--- a/InvenTree/stock/templates/stock/stock_app_base.html
+++ b/InvenTree/stock/templates/stock/stock_app_base.html
@@ -9,13 +9,13 @@
 {% else %}
 {% inventree_title %} | {% trans "Stock" %}
 {% endif %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block sidenav %}
 <div id='stock-tree'>
     {% trans "Loading..." %}
 </div>
-{% endblock %}
+{% endblock sidenav %}
 
 {% block breadcrumbs %}
 <a href='#' id='breadcrumb-tree-toggle' class="breadcrumb-item"><span class="fas fa-bars"></span></a>
diff --git a/InvenTree/templates/403.html b/InvenTree/templates/403.html
index e5185b15d0..fb76ba5976 100644
--- a/InvenTree/templates/403.html
+++ b/InvenTree/templates/403.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Permission Denied" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block content %}
 
@@ -16,4 +16,4 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/403_csrf.html b/InvenTree/templates/403_csrf.html
index 7eb98ff4a1..e9441cb613 100644
--- a/InvenTree/templates/403_csrf.html
+++ b/InvenTree/templates/403_csrf.html
@@ -5,7 +5,7 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Permission Denied" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block content %}
 <h3>{% trans "Authentication Failure" %}</h3>
@@ -20,4 +20,4 @@
     </a>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/404.html b/InvenTree/templates/404.html
index c96ae7568e..15531651bc 100644
--- a/InvenTree/templates/404.html
+++ b/InvenTree/templates/404.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Page Not Found" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block content %}
 
@@ -16,4 +16,4 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/500.html b/InvenTree/templates/500.html
index bd58bbf988..33a0ad2c6b 100644
--- a/InvenTree/templates/500.html
+++ b/InvenTree/templates/500.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Internal Server Error" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block content %}
 
@@ -17,4 +17,4 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/503.html b/InvenTree/templates/503.html
index c5d3f034f0..8630d794a0 100644
--- a/InvenTree/templates/503.html
+++ b/InvenTree/templates/503.html
@@ -5,13 +5,13 @@
 
 {% block head %}
 <meta http-equiv="refresh" content="30">
-{% endblock %}
+{% endblock head %}
 
 {% block page_title %}
 {% trans 'Site is in Maintenance' %}
-{% endblock %}
+{% endblock page_title %}
 
-{% block body_class %}login-screen' style='background: url({% inventree_splash %}); background-size: cover;{% endblock %}
+{% block body_class %}login-screen' style='background: url({% inventree_splash %}); background-size: cover;{% endblock body_class %}
 
 {% block body %}
 
@@ -23,30 +23,29 @@
 
     <div class='main body-wrapper login-screen d-flex'>
 
-
         <div class='login-container'>
         <div class="row">
             <div class='container-fluid'>
 
                 <div class='clearfix content-heading login-header d-flex flex-wrap'>
-                    <img class="pull-left" src="{% inventree_logo %}" width="60" height="60"/>
+                    <img class="pull-left" alt='{% trans "Image" %}' src="{% inventree_logo %}" width="60" height="60"/>
                     {% include "spacer.html" %}
-                    <span class='float-right'><h3>{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock %}</h3></span>
+                    <span class='float-right'><h3>{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock body_title %}</h3></span>
                 </div>
             </div>
                 <div class='container-fluid'>
                     <hr>
                     {% block content %}
                     {% trans 'The site is currently in maintenance and should be up again soon!' %}
-                    {% endblock %}
+                    {% endblock content %}
                 </div>
         </div>
         </div>
 
         {% block extra_body %}
-        {% endblock %}
+        {% endblock extra_body %}
     </div>
-{% endblock %}
+{% endblock body %}
 
 {% block js_base %}
 <script type='text/javascript'>
@@ -67,6 +66,6 @@ $(document).ready(function () {
     inventreeDocReady();
 });
 </script>
-{% endblock %}
+{% endblock js_base %}
 </body>
 </html>
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 037cd1b4ba..2bad58f61c 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -5,21 +5,21 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Index" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block sidebar %}
 <!-- Sidebar data is filled dynamically for the index page-->
-{% endblock %}
+{% endblock sidebar %}
 
 {% block content %}
 
 <div id='detail-panels'>
 </div>
 
-{% endblock %}
+{% endblock content %}
 
 {% block js_ready %}
 
@@ -203,7 +203,6 @@ loadSimplePartTable("#table-stock-to-build", "{% url 'api-part-list' %}", {
 });
 {% endif %}
 
-
 {% if expiry %}
 
 {% if setting_stock_expired %}
@@ -349,4 +348,4 @@ enableSidebar(
     }
 );
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/templates/InvenTree/notifications/history.html b/InvenTree/templates/InvenTree/notifications/history.html
index 4623f7fc4f..adccdd88a1 100644
--- a/InvenTree/templates/InvenTree/notifications/history.html
+++ b/InvenTree/templates/InvenTree/notifications/history.html
@@ -3,17 +3,17 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}history{% endblock %}
+{% block label %}history{% endblock label %}
 
 {% block heading %}
 {% trans "Notification History" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <div class='btn btn-danger' type='button' id='history-delete' title='{% trans "Delete Notifications" %}'>
     <span class='fas fa-trash-alt'></span> {% trans "Delete Notifications" %}
 </div>
-{% endblock %}
+{% endblock actions %}
 
 {% block content %}
 
@@ -29,4 +29,4 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/notifications/inbox.html b/InvenTree/templates/InvenTree/notifications/inbox.html
index be994727b1..832807ae1e 100644
--- a/InvenTree/templates/InvenTree/notifications/inbox.html
+++ b/InvenTree/templates/InvenTree/notifications/inbox.html
@@ -3,17 +3,17 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}inbox{% endblock %}
+{% block label %}inbox{% endblock label %}
 
 {% block heading %}
 {% trans "Pending Notifications" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <div class='btn btn-outline-secondary' type='button' id='mark-all' title='{% trans "Mark all as read" %}'>
     <span class='fa fa-bookmark'></span> {% trans "Mark all as read" %}
 </div>
-{% endblock %}
+{% endblock actions %}
 
 {% block content %}
 
@@ -28,4 +28,4 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/notifications/notifications.html b/InvenTree/templates/InvenTree/notifications/notifications.html
index db9593cf23..7f95103a28 100644
--- a/InvenTree/templates/InvenTree/notifications/notifications.html
+++ b/InvenTree/templates/InvenTree/notifications/notifications.html
@@ -4,20 +4,20 @@
 {% load inventree_extras %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Notifications" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block sidebar %}
     {% include "InvenTree/notifications/sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block content %}
     {% include "InvenTree/notifications/inbox.html" %}
     {% include "InvenTree/notifications/history.html" %}
-{% endblock %}
+{% endblock content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -29,7 +29,6 @@ function updateNotificationTables() {
 // this allows the global notification panel to update the tables
 window.updateNotifications = updateNotificationTables
 
-
 loadNotificationTable("#inbox-table", {
     name: 'inbox',
     url: '{% url 'api-notifications-list' %}',
@@ -59,7 +58,6 @@ loadNotificationTable("#history-table", {
     no_matches: function() { return '{% trans "No notification history found" %}'; },
 }, true);
 
-
 $('#history-delete').click(function() {
 
     var html = `
@@ -96,4 +94,4 @@ $("#history-table").on('click', '.notification-delete', function() {
 });
 
 enableSidebar('notifications');
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/templates/InvenTree/password.html b/InvenTree/templates/InvenTree/password.html
index 46bd097be7..4ff12bc1cc 100644
--- a/InvenTree/templates/InvenTree/password.html
+++ b/InvenTree/templates/InvenTree/password.html
@@ -4,4 +4,4 @@
 
 {{ block.super }}
 
-{% endblock %}
+{% endblock pre_form_content %}
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index 4596fb9f7f..b25275b749 100644
--- a/InvenTree/templates/InvenTree/search.html
+++ b/InvenTree/templates/InvenTree/search.html
@@ -6,10 +6,10 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Search Results" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block content %}
 
@@ -22,7 +22,7 @@
 <div id='detail-panels'>
 </div>
 
-{% endblock %}
+{% endblock content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -236,4 +236,4 @@
         }
     );
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/templates/InvenTree/settings/barcode.html b/InvenTree/templates/InvenTree/settings/barcode.html
index 6a9b74e3cf..3e6fb6835b 100644
--- a/InvenTree/templates/InvenTree/settings/barcode.html
+++ b/InvenTree/templates/InvenTree/settings/barcode.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}barcodes{% endblock %}
+{% block label %}barcodes{% endblock label %}
 
 {% block heading %}
 {% trans "Barcode Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -18,4 +18,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/build.html b/InvenTree/templates/InvenTree/settings/build.html
index 5c168f4354..cee6d1c349 100644
--- a/InvenTree/templates/InvenTree/settings/build.html
+++ b/InvenTree/templates/InvenTree/settings/build.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}build-order{% endblock %}
+{% block label %}build-order{% endblock label %}
 
 {% block heading %}
 {% trans "Build Order Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -16,4 +16,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/category.html b/InvenTree/templates/InvenTree/settings/category.html
index d6c5c872b0..9645faadb7 100644
--- a/InvenTree/templates/InvenTree/settings/category.html
+++ b/InvenTree/templates/InvenTree/settings/category.html
@@ -1,17 +1,17 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}category{% endblock %}
+{% block label %}category{% endblock label %}
 
 {% block heading %}
 {% trans "Category Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 <button class='btn btn-success' id='new-cat-param'>
     <div class='fas fa-plus-circle'></div> {% trans "New Parameter" %}
 </button>
-{% endblock %}
+{% endblock actions %}
 
 {% block content %}
 
@@ -30,4 +30,4 @@
 <table class='table table-striped table-condensed' id='cat-param-table' data-toolbar='#cat-param-buttons'>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/global.html b/InvenTree/templates/InvenTree/settings/global.html
index 901d0b2a66..8161b5d7fd 100644
--- a/InvenTree/templates/InvenTree/settings/global.html
+++ b/InvenTree/templates/InvenTree/settings/global.html
@@ -2,12 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}server{% endblock %}
-
+{% block label %}server{% endblock label %}
 
 {% block heading %}
 {% trans "Server Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -34,4 +33,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/label.html b/InvenTree/templates/InvenTree/settings/label.html
index 7d7dd8a5eb..a3e0aeef6c 100644
--- a/InvenTree/templates/InvenTree/settings/label.html
+++ b/InvenTree/templates/InvenTree/settings/label.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}labels{% endblock %}
+{% block label %}labels{% endblock label %}
 
 {% block heading %}
 {% trans "Label Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -17,4 +17,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/login.html b/InvenTree/templates/InvenTree/settings/login.html
index a914c94036..2cdd7784f1 100644
--- a/InvenTree/templates/InvenTree/settings/login.html
+++ b/InvenTree/templates/InvenTree/settings/login.html
@@ -2,12 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}login{% endblock %}
-
+{% block label %}login{% endblock label %}
 
 {% block heading %}
 {% trans "Login Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -41,4 +40,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/mixins/urls.html b/InvenTree/templates/InvenTree/settings/mixins/urls.html
index 0a7b029762..8b1bf799e9 100644
--- a/InvenTree/templates/InvenTree/settings/mixins/urls.html
+++ b/InvenTree/templates/InvenTree/settings/mixins/urls.html
@@ -18,9 +18,9 @@
     <tbody>
         {% for key, entry in plugin.urlpatterns.reverse_dict.items %}{% if key %}
         <tr>
-            <td>{{key}}</td>
-            <td>{{entry.1}}</td>
-            <td><a class="btn btn-primary btn-small" href="/{{ base }}{{entry.1}}" target="_blank">{% trans 'Open in new tab' %}</a></td>
+            <td>{{ key }}</td>
+            <td>{{ entry.1 }}</td>
+            <td><a class="btn btn-primary btn-small" href="/{{ base }}{{ entry.1 }}" target="_blank">{% trans 'Open in new tab' %}</a></td>
         </tr>
         {% endif %}{% endfor %}
     </tbody>
diff --git a/InvenTree/templates/InvenTree/settings/notifications.html b/InvenTree/templates/InvenTree/settings/notifications.html
index 96bf294362..90ae93f2b4 100644
--- a/InvenTree/templates/InvenTree/settings/notifications.html
+++ b/InvenTree/templates/InvenTree/settings/notifications.html
@@ -26,7 +26,7 @@
                 <td>
                     {{ method.name }}
                     {% if method.plugin %}
-                    <a class='sidebar-selector' id='select-plugin-{{method.plugin.slug}}' data-bs-parent="#sidebar">
+                    <a class='sidebar-selector' id='select-plugin-{{ method.plugin.slug }}' data-bs-parent="#sidebar">
                         <span class='badge bg-dark badge-right rounded-pill'>{{ method.plugin.slug }}</span>
                     </a>
                     {% endif %}
diff --git a/InvenTree/templates/InvenTree/settings/part.html b/InvenTree/templates/InvenTree/settings/part.html
index 20aa76c3f8..f79c508d92 100644
--- a/InvenTree/templates/InvenTree/settings/part.html
+++ b/InvenTree/templates/InvenTree/settings/part.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}parts{% endblock %}
+{% block label %}parts{% endblock label %}
 
 {% block heading %}
 {% trans "Part Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -22,7 +22,7 @@
         <tr><td colspan='5'></td></tr>
         {% include "InvenTree/settings/setting.html" with key="PART_TEMPLATE" icon="fa-clone" %}
         {% include "InvenTree/settings/setting.html" with key="PART_ASSEMBLY" icon="fa-tools" %}
-        {% include "InvenTree/settings/setting.html" with key="PART_COMPONENT" icon="fa-th"%}
+        {% include "InvenTree/settings/setting.html" with key="PART_COMPONENT" icon="fa-th" %}
         {% include "InvenTree/settings/setting.html" with key="PART_TRACKABLE" icon="fa-directions" %}
         {% include "InvenTree/settings/setting.html" with key="PART_PURCHASEABLE" icon="fa-shopping-cart" %}
         {% include "InvenTree/settings/setting.html" with key="PART_SALABLE" icon="fa-dollar-sign" %}
@@ -70,4 +70,4 @@
 <table class='table table-striped table-condensed' id='param-table' data-toolbar='#param-buttons'>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/part_stocktake.html b/InvenTree/templates/InvenTree/settings/part_stocktake.html
index 3db0630358..ad9e563a93 100644
--- a/InvenTree/templates/InvenTree/settings/part_stocktake.html
+++ b/InvenTree/templates/InvenTree/settings/part_stocktake.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}stocktake{% endblock %}
+{% block label %}stocktake{% endblock label %}
 
 {% block heading %}
 {% trans "Stocktake Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block panel_content %}
 
diff --git a/InvenTree/templates/InvenTree/settings/plugin.html b/InvenTree/templates/InvenTree/settings/plugin.html
index 4776c9d1f0..923790ed7f 100644
--- a/InvenTree/templates/InvenTree/settings/plugin.html
+++ b/InvenTree/templates/InvenTree/settings/plugin.html
@@ -3,12 +3,11 @@
 {% load inventree_extras %}
 {% load plugin_extras %}
 
-{% block label %}plugin{% endblock %}
-
+{% block label %}plugin{% endblock label %}
 
 {% block heading %}
 {% trans "Plugin Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -86,7 +85,6 @@
 </table>
 </div>
 
-
 {% plugin_errors as pl_errors %}
 {% if pl_errors %}
 <div class='panel-heading'>
@@ -123,4 +121,4 @@
     </div>
 {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/plugin_details.html b/InvenTree/templates/InvenTree/settings/plugin_details.html
index 6e76370f7b..f61bb775b1 100644
--- a/InvenTree/templates/InvenTree/settings/plugin_details.html
+++ b/InvenTree/templates/InvenTree/settings/plugin_details.html
@@ -21,7 +21,7 @@
 
         {% if mixin_list %}
         {% for mixin in mixin_list %}
-        <a class='sidebar-selector' id='select-plugin-{{plugin_key}}' data-bs-parent="#sidebar">
+        <a class='sidebar-selector' id='select-plugin-{{ plugin_key }}' data-bs-parent="#sidebar">
             <span class='badge bg-dark badge-right rounded-pill'>{{ mixin.human_name }}</span>
         </a>
         {% endfor %}
@@ -34,7 +34,7 @@
         {% endif %}
 
         {% if plugin.is_sample %}
-        <a class='sidebar-selector' id='select-plugin-{{plugin_key}}' data-bs-parent="#sidebar">
+        <a class='sidebar-selector' id='select-plugin-{{ plugin_key }}' data-bs-parent="#sidebar">
             <span class='badge bg-info rounded-pill badge-right'>{% trans "Sample" %}</span>
         </a>
         {% endif %}
diff --git a/InvenTree/templates/InvenTree/settings/plugin_settings.html b/InvenTree/templates/InvenTree/settings/plugin_settings.html
index 6a095ead2d..d83b408867 100644
--- a/InvenTree/templates/InvenTree/settings/plugin_settings.html
+++ b/InvenTree/templates/InvenTree/settings/plugin_settings.html
@@ -3,12 +3,11 @@
 {% load inventree_extras %}
 {% load plugin_extras %}
 
-{% block label %}plugin-{{plugin_key}}{% endblock %}
-
+{% block label %}plugin-{{ plugin_key }}{% endblock label %}
 
 {% block heading %}
 {% trans "Plugin" %}: <em>{{ plugin.human_name }}</em>
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -123,14 +122,14 @@
             {% settings_value "PLUGIN_CHECK_SIGNATURES" as signatures %}
             {% if signatures %}
             <tr>
-                <td><span class='text-{{plugin.sign_color}} fas fa-check'></span></td>
+                <td><span class='text-{{ plugin.sign_color }} fas fa-check'></span></td>
                 <td>{% trans "Sign Status" %}</td>
-                <td class="bg-{{plugin.sign_color}}">{% if plugin.package.verified %}{{ plugin.package.verified }}: {% endif%}{{ plugin.sign_state.msg }}</td>
+                <td class="bg-{{ plugin.sign_color }}">{% if plugin.package.verified %}{{ plugin.package.verified }}: {% endif %}{{ plugin.sign_state.msg }}</td>
             </tr>
             <tr>
-                <td><span class='text-{{plugin.sign_color}} fas fa-key'></span></td>
+                <td><span class='text-{{ plugin.sign_color }} fas fa-key'></span></td>
                 <td>{% trans "Sign Key" %}</td>
-                <td class="bg-{{plugin.sign_color}}">{{ plugin.package.key }}{% include "clip.html" %}</td>
+                <td class="bg-{{ plugin.sign_color }}">{{ plugin.package.key }}{% include "clip.html" %}</td>
             </tr>
             {% endif %}
         </table>
@@ -150,4 +149,4 @@
 
 {% include 'InvenTree/settings/mixins/settings_content.html' %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/po.html b/InvenTree/templates/InvenTree/settings/po.html
index 201d2e1a68..aaaba2bd06 100644
--- a/InvenTree/templates/InvenTree/settings/po.html
+++ b/InvenTree/templates/InvenTree/settings/po.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}purchase-order{% endblock %}
+{% block label %}purchase-order{% endblock label %}
 
 {% block heading %}
 {% trans "Purchase Order Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 <table class='table table-striped table-condensed'>
@@ -14,4 +14,4 @@
         {% include "InvenTree/settings/setting.html" with key="PURCHASEORDER_EDIT_COMPLETED_ORDERS" icon='fa-edit' %}
     </tbody>
 </table>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/pricing.html b/InvenTree/templates/InvenTree/settings/pricing.html
index 0c0ceece15..fbcf9ff9d4 100644
--- a/InvenTree/templates/InvenTree/settings/pricing.html
+++ b/InvenTree/templates/InvenTree/settings/pricing.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}pricing{% endblock %}
+{% block label %}pricing{% endblock label %}
 
 {% block heading %}
 {% trans "Pricing Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block panel_content %}
 <div class='panel-content'>
diff --git a/InvenTree/templates/InvenTree/settings/project_codes.html b/InvenTree/templates/InvenTree/settings/project_codes.html
index cb9d972a3c..c4e762884d 100644
--- a/InvenTree/templates/InvenTree/settings/project_codes.html
+++ b/InvenTree/templates/InvenTree/settings/project_codes.html
@@ -7,8 +7,6 @@
 
 {% block heading %}{% trans "Project Code Settings" %}{% endblock heading %}
 
-
-
 {% block content %}
 
 <!-- Project code settings -->
diff --git a/InvenTree/templates/InvenTree/settings/report.html b/InvenTree/templates/InvenTree/settings/report.html
index 030d5fa48d..baf57c9bfc 100644
--- a/InvenTree/templates/InvenTree/settings/report.html
+++ b/InvenTree/templates/InvenTree/settings/report.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}reporting{% endblock %}
+{% block label %}reporting{% endblock label %}
 
 {% block heading %}
 {% trans "Report Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -20,4 +20,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/returns.html b/InvenTree/templates/InvenTree/settings/returns.html
index 48092c0e7a..306bb95873 100644
--- a/InvenTree/templates/InvenTree/settings/returns.html
+++ b/InvenTree/templates/InvenTree/settings/returns.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}return-order{% endblock %}
+{% block label %}return-order{% endblock label %}
 
 {% block heading %}
 {% trans "Return Order Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -17,4 +17,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html
index 34f2a39173..13b0ea9c5e 100644
--- a/InvenTree/templates/InvenTree/settings/setting.html
+++ b/InvenTree/templates/InvenTree/settings/setting.html
@@ -45,7 +45,7 @@
                     pk='{{ setting.pk }}'
                     setting='{{ setting.key.upper }}'
                     {% if plugin %}plugin='{{ plugin.slug }}'{% endif %}
-                    {% if user_setting or notification_setting %}user='{{request.user.id}}'{% endif %}
+                    {% if user_setting or notification_setting %}user='{{ request.user.id }}'{% endif %}
                     {% if notification_setting %}
                     notification=true
                     method='{{ setting.method }}'
diff --git a/InvenTree/templates/InvenTree/settings/setting_boolean.html b/InvenTree/templates/InvenTree/settings/setting_boolean.html
index c97b46bbcc..6f0d0c5ffd 100644
--- a/InvenTree/templates/InvenTree/settings/setting_boolean.html
+++ b/InvenTree/templates/InvenTree/settings/setting_boolean.html
@@ -4,7 +4,7 @@
         fieldname='{{ setting.key.upper }}'
         pk='{{ setting.pk }}'
         setting='{{ setting.key.upper }}'
-        id='setting-value-{{setting.pk }}-{{ setting.typ }}'
+        id='setting-value-{{ setting.pk }}-{{ setting.typ }}'
         type='checkbox'
         {% if setting.as_bool %}checked=''{% endif %}
         {{ reference }}
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index 5b8937b673..b6e8e59eb3 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -6,15 +6,15 @@
 {% load plugin_extras %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Settings" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block sidebar %}
 {% include "InvenTree/settings/sidebar.html" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block content %}
 
@@ -55,11 +55,11 @@
 
 {% endif %}
 
-{% endblock %}
+{% endblock content %}
 
 {% block js_load %}
 {{ block.super }}
-{% endblock %}
+{% endblock js_load %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -78,4 +78,4 @@
 
 enableSidebar('settings');
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/templates/InvenTree/settings/settings_staff_js.html b/InvenTree/templates/InvenTree/settings/settings_staff_js.html
index 16e7e10731..2c3a984ccb 100644
--- a/InvenTree/templates/InvenTree/settings/settings_staff_js.html
+++ b/InvenTree/templates/InvenTree/settings/settings_staff_js.html
@@ -272,7 +272,6 @@ onPanelLoad('category', function() {
         });
     }
 
-
     // Initially load table with *all* categories
     loadTemplateTable();
 
@@ -303,7 +302,6 @@ onPanelLoad('category', function() {
     });
 });
 
-
 // Javascript for the Part settings panel
 onPanelLoad('parts', function() {
     $("#param-table").inventreeTable({
@@ -405,7 +403,6 @@ onPanelLoad('parts', function() {
     });
 });
 
-
 // Javascript for the Stocktake settings panel
 onPanelLoad('stocktake', function() {
 
diff --git a/InvenTree/templates/InvenTree/settings/so.html b/InvenTree/templates/InvenTree/settings/so.html
index f45cccd630..c97a47cc18 100644
--- a/InvenTree/templates/InvenTree/settings/so.html
+++ b/InvenTree/templates/InvenTree/settings/so.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}sales-order{% endblock %}
+{% block label %}sales-order{% endblock label %}
 
 {% block heading %}
 {% trans "Sales Order Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -17,4 +17,4 @@
     </tbody>
 </table>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/stock.html b/InvenTree/templates/InvenTree/settings/stock.html
index 2826b4429d..8beaac4620 100644
--- a/InvenTree/templates/InvenTree/settings/stock.html
+++ b/InvenTree/templates/InvenTree/settings/stock.html
@@ -1,11 +1,11 @@
 {% extends "panel.html" %}
 {% load i18n %}
 
-{% block label %}stock{% endblock %}
+{% block label %}stock{% endblock label %}
 
 {% block heading %}
 {% trans "Stock Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -24,4 +24,4 @@
 
     </tbody>
 </table>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index 07d0dc77f1..ca1c1fdc18 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -6,11 +6,11 @@
 {% load crispy_forms_tags %}
 {% load user_sessions i18n %}
 
-{% block label %}account{% endblock %}
+{% block label %}account{% endblock label %}
 
 {% block heading %}
 {% trans "Account Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% inventree_customize 'hide_password_reset' as hide_password_reset %}
@@ -22,7 +22,7 @@
 <div class='btn btn-primary' type='button' id='edit-user' title='{% trans "Edit User Information" %}'>
     <span class='fas fa-user-cog'></span> {% trans "Edit" %}
 </div>
-{% endblock %}
+{% endblock actions %}
 
 {% block content %}
 {% mail_configured as mail_conf %}
@@ -60,9 +60,9 @@
             {% for emailaddress in user.emailaddress_set.all %}
             <div>
             <div class="ctrlHolder">
-                <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+                <label for="email_radio_{{ forloop.counter }}" class="{% if emailaddress.primary %}primary_email{% endif %}">
 
-                    <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked" {%endif %} value="{{emailaddress.email}}" />
+                    <input id="email_radio_{{ forloop.counter }}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked" {% endif %} value="{{ emailaddress.email }}" />
 
                     {% if emailaddress.primary %}
                     <strong>{{ emailaddress.email }}</strong>
@@ -92,7 +92,7 @@
 
     {% else %}
     <div class='alert alert-block alert-danger'>
-        <strong>{% trans 'Warning:'%}</strong>
+        <strong>{% trans 'Warning:' %}</strong>
         {% trans "You currently do not have any email address set up. You should really add an email address so you can receive notifications, reset your password, etc." %}
     </div>
 
@@ -138,7 +138,7 @@
                             value="{{ base_account.id }}" />
                         <span class="socialaccount_provider {{ base_account.provider }} {{ account.get_brand.id }}">
                             <span class='brand-icon'
-                                brand_name='{{account.get_brand.id}}'></span>{{account.get_brand.name}}</span>
+                                brand_name='{{ account.get_brand.id }}'></span>{{ account.get_brand.name }}</span>
                         {{ account }}
                     </label>
                 </div>
@@ -265,7 +265,7 @@
         </table>
     </div>
 </div>
-{% endblock %}
+{% endblock content %}
 
 {% block js_ready %}
 (function() {
@@ -279,4 +279,4 @@ e.preventDefault();
 });
 }
 })();
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/templates/InvenTree/settings/user_display.html b/InvenTree/templates/InvenTree/settings/user_display.html
index 5ca3b6e316..1e916b1e95 100644
--- a/InvenTree/templates/InvenTree/settings/user_display.html
+++ b/InvenTree/templates/InvenTree/settings/user_display.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}user-display{% endblock %}
+{% block label %}user-display{% endblock label %}
 
 {% block heading %}
 {% trans "Display Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -43,7 +43,7 @@
                     {% get_available_themes as themes %}
                     {% get_user_color_theme request.user.username as user_theme %}
                     {% for theme in themes %}
-                    <option value='{{ theme.key }}'{% if theme.key == user_theme %} selected{% endif%}>{{ theme.name }}</option>
+                    <option value='{{ theme.key }}'{% if theme.key == user_theme %} selected{% endif %}>{{ theme.name }}</option>
                     {% endfor %}
                 </select>
                 <div class='input-group-append'>
@@ -76,7 +76,7 @@
                         {% define language.code as lang_code %}
                         {% define locale_stats|keyvalue:lang_code as lang_translated %}
                         {% if lang_translated > 10 or lang_code == 'en' or lang_code == LANGUAGE_CODE %}{% define True as use_lang %}{% else %}{% define False as use_lang %}{% endif %}
-                        {% if ALL_LANG or use_lang  %}
+                        {% if ALL_LANG or use_lang %}
                         <option value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
                             {{ language.name_local }} ({{ lang_code }})
                             {% if lang_translated %}
@@ -110,4 +110,4 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/user_homepage.html b/InvenTree/templates/InvenTree/settings/user_homepage.html
index 2bc2c7d778..9265484d37 100644
--- a/InvenTree/templates/InvenTree/settings/user_homepage.html
+++ b/InvenTree/templates/InvenTree/settings/user_homepage.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}user-home{% endblock %}
+{% block label %}user-home{% endblock label %}
 
 {% block heading %}
 {% trans "Home Page Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -42,4 +42,4 @@
         </tbody>
     </table>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/user_labels.html b/InvenTree/templates/InvenTree/settings/user_labels.html
index 85492a2b98..11e59975f0 100644
--- a/InvenTree/templates/InvenTree/settings/user_labels.html
+++ b/InvenTree/templates/InvenTree/settings/user_labels.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}user-labels{% endblock %}
+{% block label %}user-labels{% endblock label %}
 
 {% block heading %}
 {% trans "Label Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -20,4 +20,4 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/user_reporting.html b/InvenTree/templates/InvenTree/settings/user_reporting.html
index 44c63a5d50..c04045ba15 100644
--- a/InvenTree/templates/InvenTree/settings/user_reporting.html
+++ b/InvenTree/templates/InvenTree/settings/user_reporting.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}user-reports{% endblock %}
+{% block label %}user-reports{% endblock label %}
 
 {% block heading %}
 {% trans "Report Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -21,4 +21,4 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/user_search.html b/InvenTree/templates/InvenTree/settings/user_search.html
index aab1e2338a..96d52f966f 100644
--- a/InvenTree/templates/InvenTree/settings/user_search.html
+++ b/InvenTree/templates/InvenTree/settings/user_search.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}user-search{% endblock %}
+{% block label %}user-search{% endblock label %}
 
 {% block heading %}
 {% trans "Search Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -34,9 +34,8 @@
             {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_SHOW_RETURN_ORDERS" user_setting=True icon='fa-truck' %}
             {% include "InvenTree/settings/setting.html" with key="SEARCH_PREVIEW_EXCLUDE_INACTIVE_RETURN_ORDERS" user_setting=True icon='fa-eye-slash' %}
 
-
         </tbody>
     </table>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/InvenTree/settings/user_settings.html b/InvenTree/templates/InvenTree/settings/user_settings.html
index 80c01f6919..012d12c745 100644
--- a/InvenTree/templates/InvenTree/settings/user_settings.html
+++ b/InvenTree/templates/InvenTree/settings/user_settings.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 {% load inventree_extras %}
 
-{% block label %}user-settings{% endblock %}
+{% block label %}user-settings{% endblock label %}
 
 {% block heading %}
 {% trans "User Settings" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block content %}
 
@@ -17,4 +17,4 @@
     </table>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/base.html b/InvenTree/templates/account/base.html
index fc56fbdeb4..079734dd39 100644
--- a/InvenTree/templates/account/base.html
+++ b/InvenTree/templates/account/base.html
@@ -40,13 +40,12 @@
 
 <link rel="stylesheet" href="{% get_color_theme_css user.get_username %}">
 
-
 <title>
-    {% inventree_title %} | {% block head_title %}{% endblock %}
+    {% inventree_title %} | {% block head_title %}{% endblock head_title %}
 </title>
 
 {% block extra_head %}
-{% endblock %}
+{% endblock extra_head %}
 </head>
 
 <body class='login-screen' style='background: url({% inventree_splash %}); background-size: cover;'>
@@ -59,13 +58,12 @@
 
     <div class='main body-wrapper login-screen d-flex'>
 
-
         <div class='login-container'>
         <div class="row">
             <div class='container-fluid'>
 
                 <div class='clearfix content-heading login-header d-flex flex-wrap'>
-                    <img class="pull-left" src="{% inventree_logo %}" width="60" height="60"/>
+                    <img class="pull-left" src="{% inventree_logo %}" alt='{% trans "InvenTree logo" %}' width="60" height="60"/>
                     {% include "spacer.html" %}
                     <span class='float-right'><h3>{% inventree_title %}</h3></span>
                 </div>
@@ -73,14 +71,14 @@
                 <div class='container-fluid'>
                     <hr>
                     {% block content %}
-                    {% endblock %}
+                    {% endblock content %}
                 </div>
         </div>
 
         </div>
 
         {% block extra_body %}
-        {% endblock %}
+        {% endblock extra_body %}
     </div>
 
 
diff --git a/InvenTree/templates/account/email_confirm.html b/InvenTree/templates/account/email_confirm.html
index b602126366..3144a86e60 100644
--- a/InvenTree/templates/account/email_confirm.html
+++ b/InvenTree/templates/account/email_confirm.html
@@ -3,8 +3,7 @@
 {% load i18n %}
 {% load account %}
 
-{% block head_title %}{% trans "Confirm Email Address" %}{% endblock %}
-
+{% block head_title %}{% trans "Confirm Email Address" %}{% endblock head_title %}
 
 {% block content %}
 <h1>{% trans "Confirm Email Address" %}</h1>
@@ -31,4 +30,4 @@
 
 {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/login.html b/InvenTree/templates/account/login.html
index 3e9d62865c..b31b183b31 100644
--- a/InvenTree/templates/account/login.html
+++ b/InvenTree/templates/account/login.html
@@ -3,7 +3,7 @@
 {% load inventree_extras %}
 {% load i18n account socialaccount crispy_forms_tags inventree_extras %}
 
-{% block head_title %}{% trans "Sign In" %}{% endblock %}
+{% block head_title %}{% trans "Sign In" %}{% endblock head_title %}
 
 {% block content %}
 
@@ -26,7 +26,7 @@
   {% endif %}
 </div>
 
-<form class="login" method="POST" action="{% url 'account_login' %}">
+<form class="login" method="post" action="{% url 'account_login' %}">
   {% csrf_token %}
   {{ form|crispy }}
   {% if redirect_field_value %}
@@ -42,7 +42,7 @@
   <div>{{ login_message | safe }}<hr></div>
   {% endif %}
   {% if mail_conf and enable_pwd_forgot %}
-  <a class="" href="{% url 'account_reset_password' %}"><small>{% trans "Forgot Password?" %}</small></a>
+  <a href="{% url 'account_reset_password' %}"><small>{% trans "Forgot Password?" %}</small></a>
   {% endif %}
 </form>
 
@@ -60,4 +60,4 @@
 {% include "socialaccount/snippets/login_extra.html" %}
 {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/logout.html b/InvenTree/templates/account/logout.html
index 37df8d7577..9ff5b5e8e1 100644
--- a/InvenTree/templates/account/logout.html
+++ b/InvenTree/templates/account/logout.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Sign Out" %}{% endblock %}
+{% block head_title %}{% trans "Sign Out" %}{% endblock head_title %}
 
 {% block content %}
 <h3>{% trans "Sign Out" %}</h3>
@@ -28,4 +28,4 @@
   </a>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/password_reset.html b/InvenTree/templates/account/password_reset.html
index 1eeb5c6179..61e2c5cf76 100644
--- a/InvenTree/templates/account/password_reset.html
+++ b/InvenTree/templates/account/password_reset.html
@@ -2,7 +2,7 @@
 
 {% load i18n account crispy_forms_tags inventree_extras %}
 
-{% block head_title %}{% trans "Password Reset" %}{% endblock %}
+{% block head_title %}{% trans "Password Reset" %}{% endblock head_title %}
 
 {% block content %}
 
@@ -17,7 +17,7 @@
     {% if mail_conf and enable_pwd_forgot %}
     <p>{% trans "Forgotten your password? Enter your email address below, and we'll send you an email allowing you to reset it." %}</p>
 
-    <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
+    <form method="post" action="{% url 'account_reset_password' %}" class="password_reset">
         {% csrf_token %}
         {{ form|crispy }}
         <input type="submit" class="btn btn-primary btn-block" value="{% trans 'Reset My Password' %}" />
@@ -27,4 +27,4 @@
         <p>{% trans "This function is currently disabled. Please contact an administrator." %}</p>
     </div>
     {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/password_reset_from_key.html b/InvenTree/templates/account/password_reset_from_key.html
index c75543f67f..acb0eac5fe 100644
--- a/InvenTree/templates/account/password_reset_from_key.html
+++ b/InvenTree/templates/account/password_reset_from_key.html
@@ -1,7 +1,7 @@
 {% extends "account/base.html" %}
 
 {% load i18n crispy_forms_tags %}
-{% block head_title %}{% trans "Change Password" %}{% endblock %}
+{% block head_title %}{% trans "Change Password" %}{% endblock head_title %}
 
 {% block content %}
     <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
@@ -11,7 +11,7 @@
         <p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used.  Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p>
     {% else %}
         {% if form %}
-            <form method="POST" action="{{ action_url }}">
+            <form method="post" action="{{ action_url }}">
                 {% csrf_token %}
                 {{ form|crispy }}
                 <div class='btn-group float-right' role='group'>
@@ -22,4 +22,4 @@
             <p>{% trans 'Your password is now changed.' %}</p>
         {% endif %}
     {% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/signup.html b/InvenTree/templates/account/signup.html
index 07aac91cab..d697c8f1b8 100644
--- a/InvenTree/templates/account/signup.html
+++ b/InvenTree/templates/account/signup.html
@@ -2,7 +2,7 @@
 
 {% load i18n crispy_forms_tags inventree_extras %}
 
-{% block head_title %}{% trans "Signup" %}{% endblock %}
+{% block head_title %}{% trans "Signup" %}{% endblock head_title %}
 
 {% block content %}
 {% settings_value 'LOGIN_ENABLE_REG' as enable_reg %}
@@ -38,4 +38,4 @@
 </div>
 {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/account/signup_closed.html b/InvenTree/templates/account/signup_closed.html
index 3ac9cf8896..a9b21c2911 100644
--- a/InvenTree/templates/account/signup_closed.html
+++ b/InvenTree/templates/account/signup_closed.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
+{% block head_title %}{% trans "Sign Up Closed" %}{% endblock head_title %}
 
 {% block content %}
 <h3>{% trans "Sign Up Closed" %}</h3>
@@ -16,4 +16,4 @@
     </a>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/allauth_2fa/authenticate.html b/InvenTree/templates/allauth_2fa/authenticate.html
index d28ef77f51..891d5ab5eb 100644
--- a/InvenTree/templates/allauth_2fa/authenticate.html
+++ b/InvenTree/templates/allauth_2fa/authenticate.html
@@ -13,4 +13,4 @@
     <span class='fas fa-check-circle'></span> {% trans 'Authenticate' %}
   </button>
 </form>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/allauth_2fa/backup_tokens.html b/InvenTree/templates/allauth_2fa/backup_tokens.html
index fac32e3e2c..35cc8c5b42 100644
--- a/InvenTree/templates/allauth_2fa/backup_tokens.html
+++ b/InvenTree/templates/allauth_2fa/backup_tokens.html
@@ -36,4 +36,4 @@
   </a>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/allauth_2fa/remove.html b/InvenTree/templates/allauth_2fa/remove.html
index aab3915fa8..67c9c05286 100644
--- a/InvenTree/templates/allauth_2fa/remove.html
+++ b/InvenTree/templates/allauth_2fa/remove.html
@@ -24,4 +24,4 @@
     <span class='fas fa-undo-alt'></span> {% trans "Return to Site" %}
   </a>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/allauth_2fa/setup.html b/InvenTree/templates/allauth_2fa/setup.html
index 027cef905d..1fd4635fc0 100644
--- a/InvenTree/templates/allauth_2fa/setup.html
+++ b/InvenTree/templates/allauth_2fa/setup.html
@@ -15,7 +15,7 @@
 </p>
 
 <div class="bg-light rounded">
-<img src="{{ qr_code_url }}" class="mx-auto d-block"/>
+<img src="{{ qr_code_url }}" alt="{% trans 'QC Code' %}" class="mx-auto d-block"/>
 </div>
 <br>
 
@@ -44,4 +44,4 @@
     <span class='fas fa-undo-alt'></span> {% trans "Return to Site" %}
   </a>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/barcode_data.html b/InvenTree/templates/barcode_data.html
index 4e95bbd9d1..dd3845dcee 100644
--- a/InvenTree/templates/barcode_data.html
+++ b/InvenTree/templates/barcode_data.html
@@ -4,7 +4,7 @@
     <td><span class='fas fa-barcode'></span></td>
     <td>{% trans "Barcode Identifier" %}</td>
     <td {% if instance.barcode_data %}title='{{ instance.barcode_data }}'{% endif %}>
-        {{ instance.barcode_hash}}
+        {{ instance.barcode_hash }}
     </td>
 </tr>
 {% endif %}
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 7dcf7ea7ba..0e395c3168 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -59,15 +59,15 @@
 <style>
     {% block css %}
     <!-- Custom CSS style goes here -->
-    {% endblock %}
+    {% endblock css %}
 </style>
 {% block head %}
-{% endblock %}
+{% endblock head %}
 
 <title>
 {% block page_title %}
 {% inventree_title %}
-{% endblock %}
+{% endblock page_title %}
 </title>
 </head>
 
@@ -84,7 +84,7 @@
                     <ul id='sidebar-list-group' class='list-group sidebar-list-group'>
                         {% block sidebar %}
                         <!-- Sidebar goes here -->
-                        {% endblock %}
+                        {% endblock sidebar %}
                         {% include "plugin/panel_menu.html" %}
                         {% include "sidebar_toggle.html" with target='sidebar' %}
                     </ul>
@@ -107,28 +107,28 @@
                 </div>
                 {% endif %}
             </div>
-            {% endblock %}
+            {% endblock alerts %}
 
             {% block breadcrumb_list %}
             <div class='container-fluid navigation' id='breadcrumb-div'>
                 <nav aria-label='breadcrumb'>
                     <ol class='breadcrumb' id='breadcrumb-list'>
                         {% block breadcrumbs %}
-                        {% endblock %}
+                        {% endblock breadcrumbs %}
                     </ol>
                 </nav>
 
                 <div id='breadcrumb-tree-collapse' class='collapse collapse-horizontal show border' style='display: none;'>
                     {% block breadcrumb_tree %}
-                    {% endblock %}
+                    {% endblock breadcrumb_tree %}
                 </div>
             </div>
 
-            {% endblock %}
+            {% endblock breadcrumb_list %}
 
             {% block content %}
                 <!-- Each view fills in here.. -->
-            {% endblock %}
+            {% endblock content %}
         </main>
     </div>
 
@@ -180,7 +180,7 @@
 <script defer type='text/javascript' src="{% i18n_static 'notification.js' %}"></script>
 
 {% block js_load %}
-{% endblock %}
+{% endblock js_load %}
 
 <script defer type='text/javascript'>
 
@@ -189,7 +189,7 @@ $(document).ready(function () {
     {% include "plugin/panel_js.html" %}
 
 {% block js_ready %}
-{% endblock %}
+{% endblock js_ready %}
 
     inventreeDocReady();
 
@@ -217,7 +217,7 @@ $(document).ready(function () {
 </script>
 
 {% block js %}
-{% endblock %}
+{% endblock js %}
 
 </body>
 </html>
diff --git a/InvenTree/templates/email/email.html b/InvenTree/templates/email/email.html
index 710203aed9..69058dd11e 100644
--- a/InvenTree/templates/email/email.html
+++ b/InvenTree/templates/email/email.html
@@ -8,36 +8,36 @@
     <tr style='background: #eef3f7; height: 4rem; text-align: center;'>
         <th colspan="100%" style="padding-bottom: 1rem; color: #68686a;">
             {% block header_row %}
-            <p style='font-size: 1.25rem;'>{% block title %}<!-- email title goes here -->{% endblock %}</p>
+            <p style='font-size: 1.25rem;'>{% block title %}<!-- email title goes here -->{% endblock title %}</p>
             {% block subtitle %}
             <!-- email subtitle goes here -->
-            {% endblock %}
-            {% endblock %}
+            {% endblock subtitle %}
+            {% endblock header_row %}
         </th>
 
     </tr>
-    {% endblock %}
+    {% endblock header %}
 
     {% block body %}
     <tr style="height: 3rem; border-bottom: 1px solid #68686a;">
         {% block body_row %}
         <!-- email body goes here -->
-        {% endblock %}
+        {% endblock body_row %}
     </tr>
-    {% endblock %}
+    {% endblock body %}
 
     {% block footer %}
     <tr style='background: #eef3f7; height: 2rem;'>
         <td colspan="100%" style="padding-top:1rem; text-align: center">
             {% block footer_prefix %}
             <!-- Custom footer information goes here -->
-            {% endblock %}
+            {% endblock footer_prefix %}
             <p><em><small>{% inventree_version shortstring=True %} - <a href='https://docs.inventree.org'>InvenTree Documentation</a></small></em></p>
             {% block footer_suffix %}
             <!-- Custom footer information goes here -->
-            {% endblock %}
+            {% endblock footer_suffix %}
         </td>
     </tr>
-    {% endblock %}
+    {% endblock footer %}
 
 </table>
diff --git a/InvenTree/templates/email/low_stock_notification.html b/InvenTree/templates/email/low_stock_notification.html
index 01c475cd87..71d8bcaf9f 100644
--- a/InvenTree/templates/email/low_stock_notification.html
+++ b/InvenTree/templates/email/low_stock_notification.html
@@ -10,7 +10,6 @@
 {% endif %}
 {% endblock title %}
 
-
 {% block body %}
 <tr style="height: 3rem; border-bottom: 1px solid">
     <th>{% trans "Part" %}</th>
diff --git a/InvenTree/templates/hover_image.html b/InvenTree/templates/hover_image.html
index a1c8224f3c..d6925f1861 100644
--- a/InvenTree/templates/hover_image.html
+++ b/InvenTree/templates/hover_image.html
@@ -4,9 +4,9 @@
     {% if hover %}
     <a class='hover-icon'>
     {% endif %}
-        <img class='hover-img-thumb' {% if image %}src='{{ image.url }}'{% else %}src='{% static "img/blank_image.png" %}'{% endif %}>
+        <img class='hover-img-thumb' alt='{% trans "Image" %}' {% if image %}src='{{ image.url }}'{% else %}src='{% static "img/blank_image.png" %}'{% endif %}>
     {% if hover and image %}
-        <img class='hover-img-large' {% if image %}src='{{ image.url }}'{% else %}src='{% static "img/blank_image.png" %}'{% endif %}>
+        <img class='hover-img-large' alt='{% trans "Image" %}' {% if image %}src='{{ image.url }}'{% else %}src='{% static "img/blank_image.png" %}'{% endif %}>
     </a>
     {% endif %}
 </div>
diff --git a/InvenTree/templates/mail.html b/InvenTree/templates/mail.html
index fe4d213ebe..02f46e39fa 100644
--- a/InvenTree/templates/mail.html
+++ b/InvenTree/templates/mail.html
@@ -1 +1 @@
-<a href="mailto:{{ mail }}">{{ mail }}</a>{% include "clip.html"%}
+<a href="mailto:{{ mail }}">{{ mail }}</a>{% include "clip.html" %}
diff --git a/InvenTree/templates/modal_form.html b/InvenTree/templates/modal_form.html
index b423c23ba5..5d7de520ce 100644
--- a/InvenTree/templates/modal_form.html
+++ b/InvenTree/templates/modal_form.html
@@ -14,7 +14,7 @@
 </div>
 
 {% block pre_form_content %}
-{% endblock %}
+{% endblock pre_form_content %}
 
 {% block form %}
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
@@ -22,13 +22,13 @@
   {% load crispy_forms_tags %}
 
   {% block form_data %}
-  {% endblock %}
+  {% endblock form_data %}
 
   {% crispy form %}
 
 </form>
 
-{% endblock %}
+{% endblock form %}
 
 {% block post_form_content %}
-{% endblock %}
+{% endblock post_form_content %}
diff --git a/InvenTree/templates/modals.html b/InvenTree/templates/modals.html
index 31e94640ed..bf555de9b2 100644
--- a/InvenTree/templates/modals.html
+++ b/InvenTree/templates/modals.html
@@ -3,7 +3,7 @@
 <div class='modal fade modal-image' role='dialog' id='modal-image-dialog'>
   <span class='modal-close' id='modal-image-close'>&times;</span>
 
-  <img class='modal-image-content' id='modal-image'>
+  <img class='modal-image-content' alt='{% trans "Image" %}' id='modal-image'>
 
 </div>
 
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 1be812c509..ccd60393c1 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -14,7 +14,7 @@
 <nav class="navbar {% if sticky %}fixed-top{% endif %} navbar-expand-lg navbar-light">
   <div class="container-fluid">
     <div class="navbar-header clearfix content-heading">
-      <a class="navbar-brand" id='logo' href="{% url 'index' %}" style="padding-top: 7px; padding-bottom: 5px;"><img src="{% inventree_logo %}" width="32" height="32" style="display:block; margin: auto;"/></a>
+      <a class="navbar-brand" id='logo' href="{% url 'index' %}" style="padding-top: 7px; padding-bottom: 5px;"><img src="{% inventree_logo %}" alt="{% trans 'InvenTree logo' %}" width="32" height="32" style="display:block; margin: auto;"/></a>
     </div>
     <div class="navbar-collapse collapse" id="navbar-objects">
       <ul class="navbar-nav">
@@ -75,13 +75,13 @@
           {% if navigation %}
           <li class='nav-item dropdown'>
             <a class='nav-link dropdown-toggle' data-bs-toggle="dropdown" aria-expanded="false" href='#'>
-              <span class='{{plugin.navigation_icon}} icon-header'></span>{{plugin.navigation_name}}
+              <span class='{{ plugin.navigation_icon }} icon-header'></span>{{ plugin.navigation_name }}
             </a>
             <ul class='dropdown-menu'>
              {% for nav_item in plugin.navigation %}
                 {% safe_url nav_item.link as nav_link %}
                 {% if nav_link %}
-                <li><a href="{{ nav_link }}" class="dropdown-item"><span class='{{nav_item.icon}} icon-header'></span>{{nav_item.name}}</a>
+                <li><a href="{{ nav_link }}" class="dropdown-item"><span class='{{ nav_item.icon }} icon-header'></span>{{ nav_item.name }}</a>
                 {% endif %}
              {% endfor %}
             </ul>
diff --git a/InvenTree/templates/page_base.html b/InvenTree/templates/page_base.html
index 13462bc4ec..9d7838a652 100644
--- a/InvenTree/templates/page_base.html
+++ b/InvenTree/templates/page_base.html
@@ -11,13 +11,13 @@
             <h4>
                 {% block heading %}
                 <i>-- page header goes here --</i>
-                {% endblock %}
+                {% endblock heading %}
             </h4>
             {% include "spacer.html" %}
             <div id='page-actions' class='btn-group' role='group'>
                 {% block actions %}
                 <i>-- actions go here --</i>
-                {% endblock %}
+                {% endblock actions %}
             </div>
         </div>
     </div>
@@ -56,13 +56,13 @@
             </div>
         </div>
     </div>
-    {% endblock %}
+    {% endblock page_info %}
 
 </div>
 
 {% block page_content %}
 <!-- Custom page content goes here-->
-{% endblock %}
+{% endblock page_content %}
 {% include "plugin/panel_content.html" %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/panel.html b/InvenTree/templates/panel.html
index c674c9a94f..51ca5d23d1 100644
--- a/InvenTree/templates/panel.html
+++ b/InvenTree/templates/panel.html
@@ -1,20 +1,20 @@
-<div class='panel panel-hidden' id='panel-{% block label %}name{% endblock %}'>
+<div class='panel panel-hidden' id='panel-{% block label %}name{% endblock label %}'>
     {% block panel_heading %}
     <div class='panel-heading'>
         <div class='d-flex flex-wrap'>
-            <h4>{% block heading %}HEADING{% endblock %}</h4>
+            <h4>{% block heading %}HEADING{% endblock heading %}</h4>
             {% include "spacer.html" %}
             <div class='btn-group' role='group'>
                 {% block actions %}
-                {% endblock %}
+                {% endblock actions %}
             </div>
         </div>
     </div>
-    {% endblock %}
+    {% endblock panel_heading %}
     {% block panel_content %}
     <div class='panel-content'>
         {% block content %}
-        {% endblock %}
+        {% endblock content %}
     </div>
-    {% endblock %}
+    {% endblock panel_content %}
 </div>
diff --git a/InvenTree/templates/patterns/wizard/match_fields.html b/InvenTree/templates/patterns/wizard/match_fields.html
index a28708ce0b..967345e9cd 100644
--- a/InvenTree/templates/patterns/wizard/match_fields.html
+++ b/InvenTree/templates/patterns/wizard/match_fields.html
@@ -95,4 +95,4 @@ $('.fieldselect').select2({
     matcher: partialMatcher,
 });
 
-{% endblock %}
+{% endblock js_ready %}
diff --git a/InvenTree/templates/qr_code.html b/InvenTree/templates/qr_code.html
index 7ecd4e345e..5865a950bd 100644
--- a/InvenTree/templates/qr_code.html
+++ b/InvenTree/templates/qr_code.html
@@ -4,7 +4,7 @@
 <div class='container' style='width: 80%;'>
     {% if qr_data %}
     <div class='d-flex justify-content-center'>
-        <img src="{% qrcode qr_data %}">
+        <img alt='{% trans "QR code" %}' src="{% qrcode qr_data %}">
     </div>
     {% else %}
     <div class='alert alert-block alert-warning'>
diff --git a/InvenTree/templates/registration/logged_out.html b/InvenTree/templates/registration/logged_out.html
index 8b018fa7b4..db0202e2c3 100644
--- a/InvenTree/templates/registration/logged_out.html
+++ b/InvenTree/templates/registration/logged_out.html
@@ -7,4 +7,4 @@
 
 <p><a href="{% url 'admin:index' %}">{% translate 'Log in again' %}</a></p>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/sample/sample.html b/InvenTree/templates/sample/sample.html
index 5515bda1fe..3ef097899a 100644
--- a/InvenTree/templates/sample/sample.html
+++ b/InvenTree/templates/sample/sample.html
@@ -1 +1 @@
-<h1>{{abc}}</h1>
+<h1>{{ abc }}</h1>
diff --git a/InvenTree/templates/skeleton.html b/InvenTree/templates/skeleton.html
index 3609a44874..6a71ba8d1e 100644
--- a/InvenTree/templates/skeleton.html
+++ b/InvenTree/templates/skeleton.html
@@ -39,32 +39,32 @@
 <link rel="stylesheet" href="{% static 'css/inventree.css' %}">
 
 {% block head_css %}
-{% endblock %}
+{% endblock head_css %}
 
 <style>
     {% block css %}
-    {% endblock %}
+    {% endblock css %}
 </style>
 
 {% block head %}
-{% endblock %}
+{% endblock head %}
 
 <title>
 {% block page_title %}
-{% endblock %}
+{% endblock page_title %}
 </title>
 </head>
 
-<body class='{% block body_class %}{% endblock %}'>
+<body class='{% block body_class %}{% endblock body_class %}'>
 {% block body %}
-{% endblock %}
+{% endblock body %}
 
 <!-- Scripts -->
 <script type="text/javascript" src="{% static 'script/jquery_3.3.1_jquery.min.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/jquery-ui/jquery-ui.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}"></script>
 {% block body_scripts_general %}
-{% endblock %}
+{% endblock body_scripts_general %}
 
 {% include "third_party_js.html" %}
 
@@ -73,7 +73,7 @@
 <script type='text/javascript' src="{% static 'script/inventree/message.js' %}"></script>
 <script type='text/javascript' src="{% i18n_static 'notification.js' %}"></script>
 {% block body_scripts_inventree %}
-{% endblock %}
+{% endblock body_scripts_inventree %}
 
 <!-- fontawesome -->
 <script type='text/javascript' src="{% static 'fontawesome/js/solid.js' %}"></script>
@@ -81,13 +81,13 @@
 <script type='text/javascript' src="{% static 'fontawesome/js/fontawesome.js' %}"></script>
 
 {% block js_load %}
-{% endblock %}
+{% endblock js_load %}
 
 {% block js_base %}
-{% endblock %}
+{% endblock js_base %}
 
 {% block js %}
-{% endblock %}
+{% endblock js %}
 
 </body>
 </html>
diff --git a/InvenTree/templates/socialaccount/authentication_error.html b/InvenTree/templates/socialaccount/authentication_error.html
index b154388472..047ccdb760 100644
--- a/InvenTree/templates/socialaccount/authentication_error.html
+++ b/InvenTree/templates/socialaccount/authentication_error.html
@@ -2,7 +2,7 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %}
+{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock head_title %}
 
 {% block content %}
 <h3>{% trans "Account Login Failure" %}</h3>
@@ -20,4 +20,4 @@
     </a>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/socialaccount/login.html b/InvenTree/templates/socialaccount/login.html
index 2d83c6e393..0cd0360ad0 100644
--- a/InvenTree/templates/socialaccount/login.html
+++ b/InvenTree/templates/socialaccount/login.html
@@ -1,7 +1,7 @@
 {% extends "socialaccount/base.html" %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Sign In" %}{% endblock %}
+{% block head_title %}{% trans "Sign In" %}{% endblock head_title %}
 
 {% block content %}
 {% if process == "connect" %}
@@ -25,4 +25,4 @@
         {% trans "Return to login page" %}
     </a>
 </div>
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/socialaccount/signup.html b/InvenTree/templates/socialaccount/signup.html
index 9dd5c02107..7c217ff86b 100644
--- a/InvenTree/templates/socialaccount/signup.html
+++ b/InvenTree/templates/socialaccount/signup.html
@@ -2,7 +2,7 @@
 
 {% load i18n crispy_forms_tags inventree_extras %}
 
-{% block head_title %}{% trans "Signup" %}{% endblock %}
+{% block head_title %}{% trans "Signup" %}{% endblock head_title %}
 
 {% block content %}
     <h3>{% trans "Sign Up" %}</h3>
@@ -28,4 +28,4 @@
     </a>
 </div>
 
-{% endblock %}
+{% endblock content %}
diff --git a/InvenTree/templates/socialaccount/snippets/provider_list.html b/InvenTree/templates/socialaccount/snippets/provider_list.html
index b49fd05014..ae7b728c77 100644
--- a/InvenTree/templates/socialaccount/snippets/provider_list.html
+++ b/InvenTree/templates/socialaccount/snippets/provider_list.html
@@ -7,16 +7,16 @@
 <li class='sso-provider-link'>
 {% if provider.id == "openid" %}
 {% for brand in provider.get_brands %}
-  <a title="{{brand.name}}" brand_name='{{ provider.id }}'
-     class="btn btn-light socialaccount_provider {{provider.id}} {{brand.id}}"
+  <a title="{{ brand.name }}" brand_name='{{ provider.id }}'
+     class="btn btn-light socialaccount_provider {{ provider.id }} {{ brand.id }}"
      href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
-     <span class='brand-icon' brand_name='{{provider.id}}'></span> {{ brand.name }}</a>
+     <span class='brand-icon' brand_name='{{ provider.id }}'></span> {{ brand.name }}</a>
 {% endfor %}
 {% endif %}
-  <a title="{{provider.name}}" brand_name='{{ provider.id }}'
-     class="btn btn-light socialaccount_provider {{provider.id}}"
+  <a title="{{ provider.name }}" brand_name='{{ provider.id }}'
+     class="btn btn-light socialaccount_provider {{ provider.id }}"
      href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"
-     ><span class='brand-icon' brand_name='{{provider.id}}'></span> {{ provider.name }}</a>
+     ><span class='brand-icon' brand_name='{{ provider.id }}'></span> {{ provider.name }}</a>
 </li>
 {% endfor %}
 </ul>
diff --git a/InvenTree/templates/tel.html b/InvenTree/templates/tel.html
index 9a5389f82c..41083bb6a7 100644
--- a/InvenTree/templates/tel.html
+++ b/InvenTree/templates/tel.html
@@ -1 +1 @@
-<a href="tel:{{ tel }}">{{ tel }}</a>{% include "clip.html"%}
+<a href="tel:{{ tel }}">{{ tel }}</a>{% include "clip.html" %}
diff --git a/docs/_includes/img.html b/docs/_includes/img.html
index 9d0983c90c..620e41f447 100644
--- a/docs/_includes/img.html
+++ b/docs/_includes/img.html
@@ -1,7 +1,7 @@
 {% if 'http' in url %}
 {% set img_url = url %}
 {% else %}
-{% set img_url = config.assets_dir  + '/images/' + url %}
+{% set img_url = config.assets_dir + '/images/' + url %}
 {% endif %}
 
 <figure class='image image-inventree'>
diff --git a/docs/_includes/overrides/404.html b/docs/_includes/overrides/404.html
index c80a35d57f..e0eae12040 100644
--- a/docs/_includes/overrides/404.html
+++ b/docs/_includes/overrides/404.html
@@ -3,10 +3,10 @@
 {% block tabs %}
 {{ super() }}
 
-{% endblock %}
+{% endblock tabs %}
 
 {% block site_nav %}
-{% endblock %}
+{% endblock site_nav %}
 
 {% block content %}
 <style>
@@ -26,4 +26,4 @@
   </div>
 </section>
 
-{% endblock %}
+{% endblock content %}
diff --git a/docs/_includes/overrides/home.html b/docs/_includes/overrides/home.html
index 244f8f8f91..48b4a89f23 100644
--- a/docs/_includes/overrides/home.html
+++ b/docs/_includes/overrides/home.html
@@ -3,7 +3,7 @@
 {% block tabs %}
 {{ super() }}
 
-{% endblock %}
+{% endblock tabs %}
 
 {% block content %}
 
@@ -44,4 +44,4 @@
     </div>
   </section>
 
-{% endblock %}
+{% endblock content %}
diff --git a/docs/_includes/overrides/main.html b/docs/_includes/overrides/main.html
index 9b3bb9261d..e6bcd5b914 100644
--- a/docs/_includes/overrides/main.html
+++ b/docs/_includes/overrides/main.html
@@ -3,4 +3,4 @@
 {% block header %}
 {% include "partials/version_banner.html" %}
 {% include "partials/header.html" %}
-{% endblock %}
+{% endblock header %}
diff --git a/docs/_includes/splide_image.html b/docs/_includes/splide_image.html
index 3dc90ed306..48d5cbb2d4 100644
--- a/docs/_includes/splide_image.html
+++ b/docs/_includes/splide_image.html
@@ -2,9 +2,9 @@
 {% if 'http' in src %}
 {% set img_url = src %}
 {% else %}
-{% set img_url = config.assets_dir  + '/images/' + src %}
+{% set img_url = config.assets_dir + '/images/' + src %}
 {% endif %}
 
 <li class='splide__slide'>
-    <img src='{{ img_url }}'>
+    <img alt='Image' src='{{ img_url }}'>
 </li>
diff --git a/package-lock.json b/package-lock.json
index 279494f236..4e1ea862a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,104 +6,7 @@
     "": {
       "dependencies": {
         "eslint": "^8.39.0",
-        "eslint-config-google": "^0.14.0",
-        "markuplint": "^3.8.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
-      "dependencies": {
-        "@babel/highlight": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "eslint-config-google": "^0.14.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -188,205 +91,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
     },
-    "node_modules/@markuplint/config-presets": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/config-presets/-/config-presets-3.6.0.tgz",
-      "integrity": "sha512-adozCMTmVzl71243acl50SkBbInSetSZP0w60CSJZo+Jkvr9xLzv2EI/yZiuoWwQYv8xK0yAGoAZcmm5XScdcg=="
-    },
-    "node_modules/@markuplint/create-rule-helper": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/create-rule-helper/-/create-rule-helper-3.8.0.tgz",
-      "integrity": "sha512-vdQ0DgN72RDAW2cO42SXT16L97DA+XZ3Br9ioBjoHyl+qISwtpUI+NjVaTkpIQanT/BGWGAnGaixIDLEaxCAiA==",
-      "dependencies": {
-        "@markuplint/ml-core": "3.8.0",
-        "glob": "^8.0.3",
-        "prettier": "^2.8.1",
-        "tslib": "^2.4.1",
-        "typescript": "^4.9.4"
-      }
-    },
-    "node_modules/@markuplint/file-resolver": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/file-resolver/-/file-resolver-3.8.0.tgz",
-      "integrity": "sha512-WrBcY+kTO+YBnlWMYIWs71f7iWXD7XcDLiHBlW/HIFFGHt/C1yuatilSnNgS9eHS9+Ui2xTylnDQihLL52iDvg==",
-      "dependencies": {
-        "@markuplint/html-parser": "3.6.1",
-        "@markuplint/ml-ast": "3.1.0",
-        "@markuplint/ml-config": "3.7.0",
-        "@markuplint/ml-core": "3.8.0",
-        "@markuplint/ml-spec": "3.7.0",
-        "@markuplint/shared": "3.5.0",
-        "cosmiconfig": "^8.0.0",
-        "glob": "^8.0.3",
-        "jsonc": "^2.0.0",
-        "minimatch": "^5.1.1",
-        "tslib": "^2.4.1"
-      }
-    },
-    "node_modules/@markuplint/file-resolver/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@markuplint/file-resolver/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@markuplint/html-parser": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/@markuplint/html-parser/-/html-parser-3.6.1.tgz",
-      "integrity": "sha512-C92toyo8vQ16o75KljANUYncTG9pg3rYgfZKKtlgS+q1QJTEsISbC96mmRrOYYvpWmx5wFR6xPo9U0wUsYkg/Q==",
-      "dependencies": {
-        "@markuplint/ml-ast": "3.1.0",
-        "@markuplint/parser-utils": "3.6.1",
-        "parse5": "7.1.2",
-        "tslib": "^2.4.1"
-      }
-    },
-    "node_modules/@markuplint/html-spec": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/html-spec/-/html-spec-3.7.0.tgz",
-      "integrity": "sha512-j13VkSUcPn4dgJRapF3SaO83hVwvSm8EVn8W3hJNyhW0/D/IeIjo4Gg9Ia/Z98kLSOVIWvEVlwZp3hh/myzEdQ==",
-      "dependencies": {
-        "@markuplint/ml-spec": "3.7.0"
-      }
-    },
-    "node_modules/@markuplint/i18n": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/i18n/-/i18n-3.7.0.tgz",
-      "integrity": "sha512-4LLittRpY+gERXVJdlK8knGpZuKysCeiTCSqSlEydx+nTCUFQMPB6e1/3p2EAbn3k/wU8QJVYzMGherfrx6rMw=="
-    },
-    "node_modules/@markuplint/ml-ast": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/ml-ast/-/ml-ast-3.1.0.tgz",
-      "integrity": "sha512-RDk7V16ObmqtAY8jTS1vgFTly1BNVW/tAlYZcah7Y0OJF9itE42nufYmwKdTNKRS9pq09vMHS39icXBYxpXPZw=="
-    },
-    "node_modules/@markuplint/ml-config": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/ml-config/-/ml-config-3.7.0.tgz",
-      "integrity": "sha512-slFXO3iEn6tr2G7WcU6DBQy1R2szLWr5jyh8WGTqPLKK1cTh4GBxvAulvd+j2lQE/OTKg6kw0FiGurcRTrOoxQ==",
-      "dependencies": {
-        "@markuplint/selector": "3.7.0",
-        "deepmerge": "^4.2.2",
-        "is-plain-object": "^5.0.0",
-        "mustache": "^4.2.0",
-        "type-fest": "^3.6.1"
-      }
-    },
-    "node_modules/@markuplint/ml-config/node_modules/type-fest": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.8.0.tgz",
-      "integrity": "sha512-FVNSzGQz9Th+/9R6Lvv7WIAkstylfHN2/JYxkyhhmKFYh9At2DST8t6L6Lref9eYO8PXFTfG9Sg1Agg0K3vq3Q==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@markuplint/ml-core": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/ml-core/-/ml-core-3.8.0.tgz",
-      "integrity": "sha512-2AibeKEbKzxdCHIgbnx8Ap0kwnWMut57DSMXPU4J+hKb5U4QqRjQaFJ08V5DSz131Es1d6u4hBY9aETPEUaRqQ==",
-      "dependencies": {
-        "@markuplint/config-presets": "3.6.0",
-        "@markuplint/html-parser": "3.6.1",
-        "@markuplint/html-spec": "3.7.0",
-        "@markuplint/i18n": "3.7.0",
-        "@markuplint/ml-ast": "3.1.0",
-        "@markuplint/ml-config": "3.7.0",
-        "@markuplint/ml-spec": "3.7.0",
-        "@markuplint/parser-utils": "3.6.1",
-        "@markuplint/selector": "3.7.0",
-        "debug": "^4.3.4",
-        "is-plain-object": "^5.0.0",
-        "tslib": "^2.4.1"
-      }
-    },
-    "node_modules/@markuplint/ml-spec": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/ml-spec/-/ml-spec-3.7.0.tgz",
-      "integrity": "sha512-43oAZvEDzBLJ2DVm/jE+eFW2EDhHVePghvufjtlyP/1FZFswFo5Db7iq/KjxZGAVpAZbUEf3pbVx6r3sFTsXzg==",
-      "dependencies": {
-        "@markuplint/ml-ast": "3.1.0",
-        "dom-accessibility-api": "^0.5.14",
-        "is-plain-object": "^5.0.0",
-        "tslib": "^2.4.1"
-      }
-    },
-    "node_modules/@markuplint/parser-utils": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/@markuplint/parser-utils/-/parser-utils-3.6.1.tgz",
-      "integrity": "sha512-m8Ce2pxd3LDg9EZOTxnV9wRJO7tS/R81oJU0LFKg1DN7Wzvr2DVqBRtLjqg0ROoLtbsT7vvl49z81f54m5Z7kQ==",
-      "dependencies": {
-        "@markuplint/ml-ast": "3.1.0",
-        "@markuplint/types": "3.5.1",
-        "tslib": "^2.4.1",
-        "uuid": "^9.0.0"
-      },
-      "peerDependencies": {
-        "@markuplint/ml-core": "3.x"
-      }
-    },
-    "node_modules/@markuplint/rules": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/rules/-/rules-3.8.0.tgz",
-      "integrity": "sha512-0hQa5arA792vWUcxGWf+DVKMNUxGQrPMyae6sCOA7Lk6m9LK7rdFz1fidNZ3y0uQlMtf0qBhPzdeTt0H7+cuLA==",
-      "dependencies": {
-        "@markuplint/html-spec": "3.7.0",
-        "@markuplint/ml-core": "3.8.0",
-        "@markuplint/ml-spec": "3.7.0",
-        "@markuplint/selector": "3.7.0",
-        "@markuplint/shared": "3.5.0",
-        "@markuplint/types": "3.5.1",
-        "@ungap/structured-clone": "^1.0.1",
-        "ansi-colors": "^4.1.3",
-        "chrono-node": "^2.5.0",
-        "debug": "^4.3.4",
-        "tslib": "^2.4.1"
-      }
-    },
-    "node_modules/@markuplint/selector": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/selector/-/selector-3.7.0.tgz",
-      "integrity": "sha512-N2liwCLd355q7DRswrU+rzZHHQZAcLP+NtEtUjWCDPOC9ZaZqNkt9/lOnXRU6KlM6dnTULB2kggf8aZ5cvgTTA==",
-      "dependencies": {
-        "@markuplint/ml-spec": "3.7.0",
-        "debug": "^4.3.4",
-        "postcss-selector-parser": "^6.0.11",
-        "tslib": "^2.4.1"
-      }
-    },
-    "node_modules/@markuplint/shared": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@markuplint/shared/-/shared-3.5.0.tgz",
-      "integrity": "sha512-6yzJ4zGSVGy7IgiTycIhpG+6pLQwj1UIk1j1Xwz2k1m7xiLRAifXbUiV3eC4I8MTPrzU2iqt/sN+6hppNY0Ivw==",
-      "dependencies": {
-        "html-entities": "^2.3.3"
-      }
-    },
-    "node_modules/@markuplint/types": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@markuplint/types/-/types-3.5.1.tgz",
-      "integrity": "sha512-84pKd75zikqT5b1YvWcEQ6fh1sZm5JMUjt88h2Wn+q9Ic9qpGeQycdxPfhyQVDBz8NPSQzRgb/0m550Ql+JbeA==",
-      "dependencies": {
-        "bcp-47": "1",
-        "css-tree": "^2.3.1",
-        "debug": "^4.3.4",
-        "leven": "3",
-        "whatwg-mimetype": "2"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -419,21 +123,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@types/minimist": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
-    },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.0.2.tgz",
-      "integrity": "sha512-06PHwE0K24Wi8FBmC8MuMi/+nQ3DTpcXYL3y/IaZz2ScY2GOJXOe8fyMykVXyLOKxpL2Y0frAnJZmm65OxzMLQ=="
-    },
     "node_modules/acorn": {
       "version": "8.8.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
@@ -468,14 +157,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -498,58 +179,16 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
-    "node_modules/bcp-47": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/bcp-47/-/bcp-47-1.0.8.tgz",
-      "integrity": "sha512-Y9y1QNBBtYtv7hcmoX0tR+tUNSFZGZ6OL6vKPObq8BbOhkCoyayF6ogfLTgAli/KuAEbsYHYUNq2AQuY6IuLag==",
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -559,17 +198,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -578,30 +206,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "map-obj": "^4.0.0",
-        "quick-lru": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -617,69 +221,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/chrono-node": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.6.3.tgz",
-      "integrity": "sha512-VkWaaZnNulqzNH9i4XCdyI05OX6MFEnCMNKdZOR4w//wS5/E2qkwAss/O5sj6SfTZK84fX4SSOG4pzqjqIseiA==",
-      "dependencies": {
-        "dayjs": "^1.10.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      }
-    },
-    "node_modules/cli-color": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz",
-      "integrity": "sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==",
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.61",
-        "es6-iterator": "^2.0.3",
-        "memoizee": "^0.4.15",
-        "timers-ext": "^0.1.7"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -701,23 +242,6 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
-    "node_modules/cosmiconfig": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
-      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
-      "dependencies": {
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -731,43 +255,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-      "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dependencies": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "node_modules/dayjs": {
-      "version": "1.11.7",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
-      "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
-    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -784,62 +271,11 @@
         }
       }
     },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
-      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/detect-installed": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-installed/-/detect-installed-2.0.4.tgz",
-      "integrity": "sha512-IpGo06Ff/rMGTKjFvVPbY9aE4mRT2XP3eYHC/ZS25LKDr2h8Gbv74Ez2q/qd7IYDqD9ZjI/VGedHNXsbKZ/Eig==",
-      "dependencies": {
-        "get-installed-path": "^2.0.3"
-      },
-      "engines": {
-        "node": ">=4",
-        "npm": ">=2"
-      }
-    },
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -851,98 +287,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/dom-accessibility-api": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
-      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="
-    },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es5-ext": {
-      "version": "0.10.62",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-      "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.3",
-        "next-tick": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "node_modules/es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dependencies": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "node_modules/es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1063,18 +407,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esquery": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
@@ -1113,80 +445,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/event-emitter": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-      "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
-      "dependencies": {
-        "d": "1",
-        "es5-ext": "~0.10.14"
-      }
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/execa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ext": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
-      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
-      "dependencies": {
-        "type": "^2.7.2"
-      }
-    },
-    "node_modules/ext/node_modules/type": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-      "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
-    },
-    "node_modules/extend-shallow": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1202,11 +460,6 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
-    "node_modules/fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
-    },
     "node_modules/fastq": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
@@ -1226,17 +479,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -1274,75 +516,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/get-installed-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-2.1.1.tgz",
-      "integrity": "sha512-Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA==",
-      "dependencies": {
-        "global-modules": "1.0.0"
-      }
-    },
-    "node_modules/get-stdin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/glob": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -1354,64 +527,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/globals": {
       "version": "13.20.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
@@ -1426,69 +541,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
     "node_modules/grapheme-splitter": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
     },
-    "node_modules/gray-matter": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
-      "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
-      "dependencies": {
-        "js-yaml": "^3.13.1",
-        "kind-of": "^6.0.2",
-        "section-matter": "^1.0.0",
-        "strip-bom-string": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/gray-matter/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/gray-matter/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1497,49 +554,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="
-    },
-    "node_modules/human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "engines": {
-        "node": ">=8.12.0"
-      }
-    },
     "node_modules/ignore": {
       "version": "5.2.4",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
@@ -1571,14 +585,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -1593,88 +599,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/invert-kv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-3.0.1.tgz",
-      "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/invert-kv?sponsor=1"
-      }
-    },
-    "node_modules/is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dependencies": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1694,14 +618,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
@@ -1710,46 +626,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -1764,11 +640,6 @@
         "url": "https://opencollective.com/js-sdsl"
       }
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -1780,16 +651,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1800,61 +661,6 @@
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
-    "node_modules/jsonc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jsonc/-/jsonc-2.0.0.tgz",
-      "integrity": "sha512-B281bLCT2TRMQa+AQUQY5AGcqSOXBOKaYGP4wDzoA/+QswUfN8sODektbPEs9Baq7LGKun5jQbNFpzwGuVYKhw==",
-      "dependencies": {
-        "fast-safe-stringify": "^2.0.6",
-        "graceful-fs": "^4.1.15",
-        "mkdirp": "^0.5.1",
-        "parse-json": "^4.0.0",
-        "strip-bom": "^4.0.0",
-        "strip-json-comments": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jsonc/node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/lcid": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-3.1.1.tgz",
-      "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
-      "dependencies": {
-        "invert-kv": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1867,11 +673,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -1891,186 +692,6 @@
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lru-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-      "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
-      "dependencies": {
-        "es5-ext": "~0.10.2"
-      }
-    },
-    "node_modules/map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dependencies": {
-        "p-defer": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/markuplint": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/markuplint/-/markuplint-3.8.0.tgz",
-      "integrity": "sha512-XV18iKC2+blfWwZtjshg/hOhQiIy/0mEle61n8/7euHyQ+HQiBW5PIhakVYiKinZpbOpowf61g9ccfUF70Fzpw==",
-      "dependencies": {
-        "@markuplint/create-rule-helper": "3.8.0",
-        "@markuplint/file-resolver": "3.8.0",
-        "@markuplint/html-parser": "3.6.1",
-        "@markuplint/html-spec": "3.7.0",
-        "@markuplint/i18n": "3.7.0",
-        "@markuplint/ml-ast": "3.1.0",
-        "@markuplint/ml-config": "3.7.0",
-        "@markuplint/ml-core": "3.8.0",
-        "@markuplint/ml-spec": "3.7.0",
-        "@markuplint/rules": "3.8.0",
-        "@markuplint/shared": "3.5.0",
-        "chokidar": "^3.5.3",
-        "cli-color": "^2.0.3",
-        "debug": "^4.3.4",
-        "detect-installed": "^2.0.4",
-        "eastasianwidth": "^0.2.0",
-        "enquirer": "^2.3.6",
-        "get-stdin": "8",
-        "gray-matter": "^4.0.3",
-        "has-yarn": "2",
-        "meow": "9",
-        "node-fetch": "2",
-        "os-locale": "5",
-        "strict-event-emitter": "^0.2.8",
-        "strip-ansi": "6",
-        "tslib": "^2.4.1",
-        "type-fest": "^3.6.1",
-        "uuid": "^9.0.0"
-      },
-      "bin": {
-        "markuplint": "bin/markuplint"
-      }
-    },
-    "node_modules/markuplint/node_modules/type-fest": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.8.0.tgz",
-      "integrity": "sha512-FVNSzGQz9Th+/9R6Lvv7WIAkstylfHN2/JYxkyhhmKFYh9At2DST8t6L6Lref9eYO8PXFTfG9Sg1Agg0K3vq3Q==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
-    },
-    "node_modules/mem": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
-      "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
-      "dependencies": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^2.1.0",
-        "p-is-promise": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/memoizee": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-      "dependencies": {
-        "d": "^1.0.1",
-        "es5-ext": "^0.10.53",
-        "es6-weak-map": "^2.0.3",
-        "event-emitter": "^0.3.5",
-        "is-promise": "^2.2.2",
-        "lru-queue": "^0.1.0",
-        "next-tick": "^1.1.0",
-        "timers-ext": "^0.1.7"
-      }
-    },
-    "node_modules/meow": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dependencies": {
-        "@types/minimist": "^1.2.0",
-        "camelcase-keys": "^6.2.2",
-        "decamelize": "^1.2.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.0",
-        "read-pkg-up": "^7.0.1",
-        "redent": "^3.0.0",
-        "trim-newlines": "^3.0.0",
-        "type-fest": "^0.18.0",
-        "yargs-parser": "^20.2.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/meow/node_modules/type-fest": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2082,113 +703,16 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/mustache": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
-      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
-      "bin": {
-        "mustache": "bin/mustache"
-      }
-    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
-    "node_modules/next-tick": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -2197,20 +721,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -2227,38 +737,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/os-locale": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
-      "integrity": "sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==",
-      "dependencies": {
-        "execa": "^4.0.0",
-        "lcid": "^3.0.0",
-        "mem": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -2287,14 +765,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -2306,42 +776,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-      "dependencies": {
-        "entities": "^4.4.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
-      }
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -2366,42 +800,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
-      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -2410,29 +808,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
@@ -2460,183 +835,6 @@
         }
       ]
     },
-    "node_modules/quick-lru": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^2.5.0",
-        "parse-json": "^5.0.0",
-        "type-fest": "^0.6.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dependencies": {
-        "find-up": "^4.1.0",
-        "read-pkg": "^5.2.0",
-        "type-fest": "^0.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
-      "dependencies": {
-        "is-core-module": "^2.11.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -2709,32 +907,6 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/section-matter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
-      "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
-      "dependencies": {
-        "extend-shallow": "^2.0.1",
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2754,60 +926,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
-      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "node_modules/strict-event-emitter": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.2.8.tgz",
-      "integrity": "sha512-KDf/ujU8Zud3YaLtMCcTI4xkZlZVIYxTLr+XIULexP+77EEVWixeXroLUXQXiVtH4XH2W7jr/3PT1v3zBuvc3A==",
-      "dependencies": {
-        "events": "^3.3.0"
-      }
-    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -2819,41 +937,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -2876,65 +959,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
-    "node_modules/timers-ext": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-      "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dependencies": {
-        "es5-ext": "~0.10.46",
-        "next-tick": "1"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "node_modules/trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
-    },
-    "node_modules/type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -2957,18 +986,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -2977,47 +994,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "node_modules/uuid": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
-      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -3045,19 +1021,6 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/package.json b/package.json
index cec9de4773..528de372ac 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "eslint": "^8.39.0",
-    "eslint-config-google": "^0.14.0",
-    "markuplint": "^3.8.0"
+    "eslint-config-google": "^0.14.0"
   }
 }