diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index a681ce321a..6a4f625284 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -1,8 +1,9 @@
 :root {
     --primary-color: #335d88;
-    --secondary-color: #b69c80;
+    --secondary-color: #dcdcda;
     --highlight-color: #f5efe8;
-    --basic-color: #333;
+
+    --border-color: #ccc;
 
     --label-red: #e35a57;
     --label-blue: #4194bd;
@@ -130,6 +131,7 @@
 
 .navbar {
     border-bottom: 1px solid #ccc;
+    background-color: var(--secondary-color);
 }
 
 .navbar-brand {
@@ -652,10 +654,13 @@
 }
 
 .modal-header {
-    border-bottom: 1px solid #ccc;
-    background-color: #dcdcdc;
-    color: #555;
-    padding: 10px;
+    padding: 3px;
+    padding-top: 5px;
+    padding-left: 15px;
+    padding-right: 25px;
+    color: var(--bs-body-color);
+    background-color: var(--secondary-color);
+    border-bottom: 1px solid var(--border-color);
 }
 
 .modal-footer {
@@ -929,25 +934,24 @@ input[type="submit"] {
     padding: 10px;
 }
 
-.panel-group .panel {
+.panel-group {
     border-radius: 2px;
 }
 
 .panel-heading {
-    padding: 5px 10px;
+    padding: 3px;
+    padding-top: 5px;
     padding-left: 15px;
-    padding-top: 10px;
-    color: #333;
-    background-color: #dcdcdc;
-    border-bottom: 1px solid #ccc;
+    color: var(--bs-body-color);
+    background-color: var(--secondary-color);
+    border-bottom: 1px solid var(--border-color);
 }
 
-.panel-inventree {
+.panel {
     box-shadow: 2px 2px #DDD;
     margin-bottom: 20px;
     background-color: #fff;
     border: 1px solid #ccc;
-    border-radius: 5px;
 }
 
 .panel-hidden {
diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html
index c1cfed21bf..ea541899e0 100644
--- a/InvenTree/build/templates/build/detail.html
+++ b/InvenTree/build/templates/build/detail.html
@@ -10,7 +10,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-details'>
+<div class='panel panel-hidden' id='panel-details'>
     <div class='panel-heading'>
         <h4>{% trans "Build Details" %}</h4>
     </div>
@@ -152,7 +152,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-children'>
+<div class='panel panel-hidden' id='panel-children'>
     <div class='panel-heading'>
         <h4>{% trans "Child Build Orders" %}</h4>
     </div>
@@ -168,7 +168,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-allocate'>
+<div class='panel panel-hidden' id='panel-allocate'>
     <div class='panel-heading'>
         <h4>{% trans "Allocate Stock to Build" %}</h4>
     </div>
@@ -219,7 +219,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-outputs'>
+<div class='panel panel-hidden' id='panel-outputs'>
     <div class='panel-heading'>
         <h4>{% trans "Incomplete Build Outputs" %}</h4>
     </div>
@@ -248,7 +248,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-completed'>
+<div class='panel panel-hidden' id='panel-completed'>
     <div class='panel-heading'>
         <h4>
             {% trans "Completed Build Outputs" %}
@@ -260,7 +260,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-attachments'>
+<div class='panel panel-hidden' id='panel-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -269,7 +269,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-notes'>
+<div class='panel panel-hidden' id='panel-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html
index 418fc38e65..8ac4f53af1 100644
--- a/InvenTree/company/templates/company/detail.html
+++ b/InvenTree/company/templates/company/detail.html
@@ -9,7 +9,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-supplier-parts'>
+<div class='panel panel-hidden' id='panel-supplier-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Parts" %}</h4>
     </div>
@@ -53,7 +53,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-manufacturer-parts'>
+<div class='panel panel-hidden' id='panel-manufacturer-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Manufacturer Parts" %}</h4>
     </div>
@@ -96,7 +96,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-company-stock'>
+<div class='panel panel-hidden' id='panel-company-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Stock" %}</h4>
     </div>
@@ -105,7 +105,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-purchase-orders'>
+<div class='panel panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Orders" %}</h4>
     </div>
@@ -127,7 +127,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-sales-orders'>
+<div class='panel panel-hidden' id='panel-sales-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Sales Orders" %}</h4>
     </div>
@@ -150,7 +150,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-assigned-stock'>
+<div class='panel panel-hidden' id='panel-assigned-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Assigned Stock" %}</h4>
     </div>
@@ -166,7 +166,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-company-notes'>
+<div class='panel panel-hidden' id='panel-company-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html
index 6339cb0545..3009b0f141 100644
--- a/InvenTree/company/templates/company/manufacturer_part.html
+++ b/InvenTree/company/templates/company/manufacturer_part.html
@@ -100,7 +100,7 @@ src="{% static 'img/blank_image.png' %}"
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-supplier-parts'>
+<div class='panel panel-hidden' id='panel-supplier-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Suppliers" %}</h4>
     </div>
@@ -124,7 +124,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-parameters'>
+<div class='panel panel-hidden' id='panel-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Parameters" %}</h4>
     </div>
diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html
index b6e3a4507e..73cb5277c6 100644
--- a/InvenTree/company/templates/company/supplier_part.html
+++ b/InvenTree/company/templates/company/supplier_part.html
@@ -133,7 +133,7 @@ src="{% static 'img/blank_image.png' %}"
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-stock'>
+<div class='panel panel-hidden' id='panel-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Part Stock" %}</h4>
     </div>
@@ -142,7 +142,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-purchase-orders'>
+<div class='panel panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Supplier Part Orders" %}</h4>
     </div>
@@ -160,7 +160,7 @@ src="{% static 'img/blank_image.png' %}"
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-pricing'>
+<div class='panel panel-hidden' id='panel-pricing'>
     <div class='panel-heading'>
         <h4>{% trans "Pricing Information" %}</h4>
     </div>
diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html
index 35cf552159..82800525fe 100644
--- a/InvenTree/order/templates/order/order_wizard/po_upload.html
+++ b/InvenTree/order/templates/order/order_wizard/po_upload.html
@@ -21,7 +21,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree' id='panel-upload-file'>
+<div class='panel' id='panel-upload-file'>
     <div class='panel-heading'>
         {% block heading %}
         <h4>{% trans "Upload File for Purchase Order" %}</h4>
diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html
index b3b03fb31d..ceda5fdd02 100644
--- a/InvenTree/order/templates/order/purchase_order_detail.html
+++ b/InvenTree/order/templates/order/purchase_order_detail.html
@@ -12,7 +12,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-items'>
+<div class='panel panel-hidden' id='panel-order-items'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Order Items" %}</h4>
     </div>
@@ -42,7 +42,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-received-items'>
+<div class='panel panel-hidden' id='panel-received-items'>
     <div class='panel-heading'>
         <h4>{% trans "Received Items" %}</h4>
     </div>
@@ -51,7 +51,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-attachments'>
+<div class='panel panel-hidden' id='panel-order-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Order Attachments" %}</h4>
     </div>
@@ -60,7 +60,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-notes'>
+<div class='panel panel-hidden' id='panel-order-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index c6b97b6847..61f08b3032 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -12,7 +12,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-items'>
+<div class='panel panel-hidden' id='panel-order-items'>
     <div class='panel-heading'>
         <h4>{% trans "Sales Order Items" %}</h4>
     </div>
@@ -33,7 +33,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-builds'>
+<div class='panel panel-hidden' id='panel-order-builds'>
     <div class='panel-heading'>
         <h4>{% trans "Build Orders" %}</h4>
     </div>
@@ -42,7 +42,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-attachments'>
+<div class='panel panel-hidden' id='panel-order-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -51,7 +51,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-order-notes'>
+<div class='panel panel-hidden' id='panel-order-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
diff --git a/InvenTree/part/templates/part/bom_upload/upload_file.html b/InvenTree/part/templates/part/bom_upload/upload_file.html
index 38d7792dd1..253dcb04d8 100644
--- a/InvenTree/part/templates/part/bom_upload/upload_file.html
+++ b/InvenTree/part/templates/part/bom_upload/upload_file.html
@@ -21,7 +21,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree' id='panel-upload-file'>
+<div class='panel' id='panel-upload-file'>
     <div class='panel-heading'>
         {% block heading %}
         <h4>{% trans "Upload Bill of Materials" %}</h4>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index e5a22363b2..54f8b81e0a 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -112,7 +112,7 @@
   {% endfor %}
 {% endif %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-parts'>
+<div class='panel panel-hidden' id='panel-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Parts" %}</h4>
     </div>
@@ -157,7 +157,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-parameters'>
+<div class='panel panel-hidden' id='panel-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Part Parameters" %}</h4>
     </div>
@@ -167,7 +167,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-subcategories'>
+<div class='panel panel-hidden' id='panel-subcategories'>
     <div class='panel-heading'>
         <h4>{% trans "Subcategories" %}</h4>
     </div>
diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html
index 1b1da5f14d..0de35ea454 100644
--- a/InvenTree/part/templates/part/detail.html
+++ b/InvenTree/part/templates/part/detail.html
@@ -11,7 +11,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-part-details'>
+<div class='panel panel-hidden' id='panel-part-details'>
     <div class='panel-heading'>
         <h4>{% trans "Part Details" %}</h4>
     </div>
@@ -93,7 +93,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-part-stock'>
+<div class='panel panel-hidden' id='panel-part-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Part Stock" %}</h4>
     </div>
@@ -107,7 +107,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-test-templates'>
+<div class='panel panel-hidden' id='panel-test-templates'>
     <div class='panel-heading'>
         <h4>{% trans "Part Test Templates" %}</h4>
     </div>
@@ -127,7 +127,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-purchase-orders'>
+<div class='panel panel-hidden' id='panel-purchase-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Purchase Orders" %}</h4>
     </div>
@@ -148,7 +148,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-sales-orders'>
+<div class='panel panel-hidden' id='panel-sales-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Sales Orders" %}</h4>
     </div>
@@ -176,11 +176,11 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-pricing'>
+<div class='panel panel-hidden' id='panel-pricing'>
     {% include "part/prices.html" %}
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-part-notes'>
+<div class='panel panel-hidden' id='panel-part-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
@@ -203,11 +203,11 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-pricing'>
+<div class='panel panel-hidden' id='panel-pricing'>
     <!-- TODO -->
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-variants'>
+<div class='panel panel-hidden' id='panel-variants'>
     <div class='panel-heading'>
         <h4>{% trans "Part Variants" %}</h4>
     </div>
@@ -232,7 +232,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-part-parameters'>
+<div class='panel panel-hidden' id='panel-part-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Parameters" %}</h4>
     </div>
@@ -250,7 +250,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-part-attachments'>
+<div class='panel panel-hidden' id='panel-part-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -259,7 +259,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-related-parts'>
+<div class='panel panel-hidden' id='panel-related-parts'>
     <div class='panel-heading'>
         <h4>{% trans "Related Parts" %}</h4>
     </div>
@@ -305,7 +305,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-bom'>
+<div class='panel panel-hidden' id='panel-bom'>
     <div class='panel-heading'>
         <h4>{% trans "Bill of Materials" %}</h4>
     </div>
@@ -314,7 +314,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-used-in'>
+<div class='panel panel-hidden' id='panel-used-in'>
     <div class='panel-heading'>
         <h4>{% trans "Assemblies" %}</h4>
     </div>
@@ -330,7 +330,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-build-orders'>
+<div class='panel panel-hidden' id='panel-build-orders'>
     <div class='panel-heading'>
         <h4>{% trans "Part Builds" %}</h4>
     </div>
@@ -360,7 +360,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-suppliers'>
+<div class='panel panel-hidden' id='panel-suppliers'>
     <div class='panel-heading'>
         <h4>{% trans "Part Suppliers" %}</h4>
     </div>
diff --git a/InvenTree/part/templates/part/import_wizard/part_upload.html b/InvenTree/part/templates/part/import_wizard/part_upload.html
index 344cd3e881..8e4a71b5bf 100644
--- a/InvenTree/part/templates/part/import_wizard/part_upload.html
+++ b/InvenTree/part/templates/part/import_wizard/part_upload.html
@@ -20,7 +20,7 @@
 {% endblock %}
 
 {% block content %}
-    <div class='panel panel-inventree'>
+    <div class='panel'>
         <div class='panel-heading'>
             <h4>
                 {% trans "Import Parts from File" %}
diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html
index 172c0e0a7f..db8de8b495 100644
--- a/InvenTree/stock/templates/stock/item.html
+++ b/InvenTree/stock/templates/stock/item.html
@@ -12,7 +12,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-history'>
+<div class='panel panel-hidden' id='panel-history'>
     <div class='panel-heading'>
         <h4>{% trans "Stock Tracking Information" %}</h4>
     </div>
@@ -38,7 +38,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-children'>
+<div class='panel panel-hidden' id='panel-children'>
     <div class='panel-heading'>
         <h4>{% trans "Child Stock Items" %}</h4>
     </div>
@@ -53,7 +53,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-test-data'>
+<div class='panel panel-hidden' id='panel-test-data'>
     <div class='panel-heading'>
         <h4>{% trans "Test Data" %}</h4>
     </div>
@@ -83,7 +83,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-attachments'>
+<div class='panel panel-hidden' id='panel-attachments'>
     <div class='panel-heading'>
         <h4>{% trans "Attachments" %}</h4>
     </div>
@@ -92,7 +92,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-notes'>
+<div class='panel panel-hidden' id='panel-notes'>
     <div class='panel-heading'>
         <div class='row'>
             <div class='col-sm-6'>
@@ -115,7 +115,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-installed-items'>
+<div class='panel panel-hidden' id='panel-installed-items'>
     <div class='panel-heading'>
         <h4>{% trans "Installed Stock Items" %}</h4>
     </div>
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index 7735be69b8..86e6a91fc0 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -134,7 +134,7 @@
 
 {% block page_content %}
 
-<div class='panel panel-inventree panel-hidden' id='panel-stock'>
+<div class='panel panel-hidden' id='panel-stock'>
     <div class='panel-heading'>
         <h4>{% trans "Stock Items" %}</h4>
     </div>
@@ -143,7 +143,7 @@
     </div>
 </div>
 
-<div class='panel panel-inventree panel-hidden' id='panel-sublocations'>
+<div class='panel panel-hidden' id='panel-sublocations'>
     <div class='panel-heading'>
         <h4>{% trans "Sublocations" %}</h4>
     </div>
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 1eae7ebdc8..147d22d6c3 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -12,14 +12,14 @@
 <hr>
 
 <div class='col-sm-3' id='item-panel'>
-    <div class='panel panel-inventree'>
+    <div class='panel'>
         <ul class='list-group' id='action-item-list'>
         </ul>
     </div>
 </div>
 <div class='col-sm-9' id='details-panel'>
     <ul class='list-group' id='detail-item-list'>
-        <li class='list-group-item panel panel-inventree'>
+        <li class='list-group-item panel'>
             <div class='container'>
                 <img class='index-bg' src='{% static "img/inventree.png" %}'>
             </div>
@@ -56,7 +56,7 @@ function addHeaderAction(label, title, icon, options) {
 
     // Add a detail item to the detail item-panel
     $("#detail-item-list").append(
-        `<li class='list-group-item panel panel-inventree' id='detail-${label}'>
+        `<li class='list-group-item panel' id='detail-${label}'>
             <h4>${title}</h4>
             <table class='table table-condensed table-striped' id='table-${label}'></table>
         </li>`
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index d2cd74ad26..63db62cffa 100644
--- a/InvenTree/templates/InvenTree/search.html
+++ b/InvenTree/templates/InvenTree/search.html
@@ -26,14 +26,14 @@
 {% endif %}
 
 <div class='col-sm-3' id='item-panel'>
-    <div class='panel panel-inventree'>
+    <div class='panel'>
         <ul class='list-group' id='search-item-list'>
         </ul>
     </div>
 </div>
 <div class='col-sm-9' id='details-panel'>
     <ul class='list-group' id='search-result-list'>
-        <li class='list-group-item panel panel-inventree'>
+        <li class='list-group-item panel'>
             <div class='container'>
                 <img class='index-bg' src='{% static "img/inventree.png" %}'>
             </div>
@@ -69,7 +69,7 @@
 
         // Add a results table
         $('#search-result-list').append(
-            `<li class='list-group-item panel panel-inventree' id='search-result-${label}'>
+            `<li class='list-group-item panel' id='search-result-${label}'>
                 <h4>${title}</h4>
                 <table class='table table-condensed table-striped' id='table-${label}'></table>
             </li>`
diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js
index e50970ed23..993fbfb9cf 100644
--- a/InvenTree/templates/js/translated/modals.js
+++ b/InvenTree/templates/js/translated/modals.js
@@ -47,9 +47,9 @@ function createNewModal(options={}) {
         <div class='modal-dialog'>
             <div class='modal-content'>
                 <div class="modal-header">
-                    <h3 id='modal-title' class='modal-title'>
+                    <h4 id='modal-title' class='modal-title'>
                         <!-- Form title to be injected here -->
-                    </h3>
+                    </h4>
                     <button type='button' class='btn-close' data-bs-dismiss='modal' aria-label='{% trans "Close" %}'></button>
                 </div>
                 <div class='modal-body modal-form-content-wrapper'>
diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js
index 9cebec9995..f7a64d2f06 100644
--- a/InvenTree/templates/js/translated/part.js
+++ b/InvenTree/templates/js/translated/part.js
@@ -792,7 +792,7 @@ function partGridTile(part) {
     var html = `
     
     <div class='product-card card'>
-        <div class='panel panel-inventree product-card-panel'>
+        <div class='panel product-card-panel'>
             <div class='panel-heading'>
                 <a href='/part/${part.pk}/'>
                     <b>${part.full_name}</b>
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index 416ad011d3..59f4286b40 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -5,7 +5,7 @@
 {% settings_value 'BARCODE_ENABLE' as barcodes %}
 {% settings_value 'STICKY_HEADER' user=request.user as sticky %}
 
-<nav class="navbar {% if sticky %}fixed-top{% endif %} navbar-expand-lg navbar-light bg-light">
+<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="{% static 'img/inventree.png' %}" width="32" height="32" style="display:block; margin: auto;"/></a>
diff --git a/InvenTree/templates/page_base.html b/InvenTree/templates/page_base.html
index 6104946589..616731da6f 100644
--- a/InvenTree/templates/page_base.html
+++ b/InvenTree/templates/page_base.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 
-<div class='panel panel-inventree'>
+<div class='panel'>
     <div class='panel-content'>
         <div class='row'>
             <div class='col-sm-6' id='detail-panel-left'>
diff --git a/InvenTree/templates/panel.html b/InvenTree/templates/panel.html
index ef2c0fbc0f..1491991e8c 100644
--- a/InvenTree/templates/panel.html
+++ b/InvenTree/templates/panel.html
@@ -1,4 +1,4 @@
-<div class='panel panel-inventree panel-hidden' id='panel-{% block label %}name{% endblock %}'>
+<div class='panel panel-hidden' id='panel-{% block label %}name{% endblock %}'>
     {% block panel_heading %}
     <div class='panel-heading'>
         <h4>{% block heading %}HEADING{% endblock %}</h4>