diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 5264244033..3c2a654f08 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
@@ -33,42 +33,38 @@ msgstr "Keine passende Aktion gefunden"
 msgid "Enter date"
 msgstr "Datum eingeben"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "Löschung bestätigen"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "Löschung von Position bestätigen"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "Neues Passwort bestätigen"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "Thema anwenden"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "Kategorie auswählen"
 
@@ -122,8 +118,8 @@ msgstr "Kommentar"
 msgid "File comment"
 msgstr "Datei-Kommentar"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr "Überschuss darf 100% nicht überschreiten"
 msgid "Overage must be an integer value or a percentage"
 msgstr "Überschuss muss eine Ganzzahl oder ein Prozentwert sein"
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr "Element löschen"
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr "Häkchen setzen um Löschung von Objekt zu bestätigen"
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr "Benutzerinformationen bearbeiten"
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr "Passwort eingeben"
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr "Systeminformationen"
 
@@ -522,7 +518,7 @@ msgstr "Zieldatum für Bauauftrag-Fertigstellung."
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr "Bauauftrag"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr "Bauaufträge"
 
@@ -1542,7 +1539,7 @@ msgstr "{name.title()} Datei"
 msgid "Select {name} file to upload"
 msgstr "{name} Datei zum Hochladen auswählen"
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr "Einstellungs-Schlüssel (muss einzigartig sein, Groß-/ Kleinschreibung wird nicht beachtet)"
 
@@ -1678,388 +1675,388 @@ msgstr "Kategorie-Parametervorlage kopieren"
 msgid "Copy category parameter templates when creating a part"
 msgstr "Kategorie-Parameter Vorlagen kopieren wenn ein Teil angelegt wird"
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr "Aktuelle Teile-Stände"
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr "Anzahl der neusten Teile auf der Startseite"
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr "Vorlage"
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr "Teile sind standardmäßig Vorlagen"
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr "Baugruppe"
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr "Teile können standardmäßig aus anderen Teilen angefertigt werden"
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr "Komponente"
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr "Teile können standardmäßig in Baugruppen benutzt werden"
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr "Kaufbar"
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr "Artikel sind grundsätzlich kaufbar"
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr "Verkäuflich"
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr "Artikel sind grundsätzlich verkaufbar"
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr "Nachverfolgbar"
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr "Artikel sind grundsätzlich verfolgbar"
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr "Teile sind grundsätzlich virtuell"
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr "zeige Bestand in Eingabemasken"
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr "Zeige den verfügbaren Bestand in einigen Eingabemasken"
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr "Import in Ansichten anzeigen"
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr "Importassistent in einigen Teil-Ansichten anzeigen"
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr "Preis in Formularen anzeigen"
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr "Teilpreis in einigen Formularen anzeigen"
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr "Verwandte Teile anzeigen"
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr "Verwandte Teile eines Teils anzeigen"
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr "Ausgangsbestand erstellen"
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr "Ausgangsbestand beim Erstellen von Teilen erstellen"
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr "Interne Preise"
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr "Interne Preise für Teile aktivieren"
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr "Interner Preis als Stückliste-Preis"
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr "Interner Preis (falls vorhanden) in Stücklisten-Preisberechnungen verwenden"
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr "Entwickler-Modus"
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr "Berichte im Entwickler-Modus generieren (als HTML)"
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr "Seitengröße"
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr "Standardseitenformat für PDF-Bericht"
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr "Test-Berichte"
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr "Erstellung von Test-Berichten aktivieren"
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr "Anzahl Suchergebnisse"
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr "Anzahl der Ergebnisse, die in der Vorschau angezeigt werden sollen"
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr "Bestands-Ablauf"
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr "Ablaufen von Bestand ermöglichen"
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr "Abgelaufenen Bestand verkaufen"
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr "Verkauf von abgelaufenem Bestand erlaubt"
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr "Bestands-Stehzeit"
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr "Anzahl an Tagen, an denen Bestand als abgestanden markiert wird, bevor sie ablaufen"
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr "Tage"
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr "Abgelaufenen Bestand verbauen"
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr "Verbauen von abgelaufenen Bestand erlaubt"
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr "Bestands-Eigentümerkontrolle"
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr "Eigentümerkontrolle für Lagerorte und Teile aktivieren"
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr "Gruppieren nach Teil"
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr "Bestand in Tabellen anhand von Teil-Referenz gruppieren"
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr "aktueller Bestand"
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr "Anzahl des geänderten Bestands auf der Startseite"
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr "Bauauftrag-Referenz Präfix"
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr "Präfix für Bauauftrag-Referenz"
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr "Bauauftrag-Referenz RegEx"
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr "RegEx Muster für die Zuordnung von Bauauftrag-Referenzen"
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr "Auftrags-Referenz Präfix"
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr "Präfix für Auftrags-Referenz"
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr "Bestellungs-Referenz Präfix"
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr "Präfix für Bestellungs-Referenz"
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr "Aktuelle Teile-Stände"
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr "Anzahl der neusten Teile auf der Startseite"
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr "aktueller Bestand"
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr "Anzahl des geänderten Bestands auf der Startseite"
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr "Anzahl Suchergebnisse"
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr "Anzahl der Ergebnisse, die in der Vorschau angezeigt werden sollen"
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr "Preisstaffelungs Anzahl"
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr "Preis"
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr "Stückpreis für die angegebene Anzahl"
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr "Standard"
 
@@ -2071,19 +2068,19 @@ msgstr "Aktueller Wert"
 msgid "Change Setting"
 msgstr "Einstellungen ändern"
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr "Angegebener Wert nicht erlaubt"
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr "Angegebener Wert muss ein Wahrheitswert sein"
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr "Datei hochgeladen"
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr "Datei hochgeladen"
 msgid "Match Fields"
 msgstr "Übereinstimmende Felder"
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr "Positionen zuordnen"
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr "Felder zuteilen fehlgeschlagen"
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr "Teile importiert"
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr "Zulieferer-Bestand"
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr "Bestellungen"
@@ -2524,7 +2522,8 @@ msgstr "Neue Bestellung"
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr "Aufträge"
@@ -2625,8 +2624,8 @@ msgstr "Parameter"
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr "Neuer Parameter"
 
@@ -2659,7 +2658,8 @@ msgstr "Herstellerteil-Bestand"
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr "Ausstehende Teile für <b>%(order)s</b> - <i>%(desc)s</i> empfangen"
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr "Schlüsselworte um die Sichtbarkeit in Suchergebnissen zu verbessern"
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr "Kategorie"
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr "Einheit des Parameters"
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr "Parameter Vorlage"
 
@@ -4187,7 +4189,7 @@ msgstr "Wert"
 msgid "Parameter Value"
 msgstr "Parameter Wert"
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr "Standard-Wert"
 
@@ -6146,125 +6148,146 @@ msgstr "an Kunde versand"
 msgid "No stock location set"
 msgstr "Kein Lagerort gesetzt"
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr "Anzeige-Einstellungen"
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr "Farbschemata"
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-"\n"
-"\t\tDie CSS Datei \"%(invalid_color_theme)s.css\" für das aktuell ausgewählte Farbschema wurde nicht gefunden.<br>\n"
-"\t\tBitte ein anderes Farbschema auswählen:)\n"
-"\t    "
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr "Sprache"
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr "Sprache festlegen"
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr "Bauauftrag-Einstellungen"
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr "Kategorie-Einstellungen"
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr "Kategorie-Parametervorlagen"
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr "Keine Kategorie-Parametervorlagen gefunden"
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr "Vorlage bearbeiten"
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr "Vorlage löschen"
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr "Währungseinstellungen"
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr "Basiswährung"
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr "Wechselkurse"
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr "Letzte Aktualisierung"
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr "Nie"
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr "Jetzt aktualisieren"
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr "Systemweite InvenTree-Einstellungen"
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr "Barcode-Einstellungen"
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
-msgstr "Sucheinstellungen"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr "Bauauftrag-Einstellungen"
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr "Kategorie-Einstellungen"
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr "Währungseinstellungen"
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr "Basiswährung"
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr "Wechselkurse"
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr "Letzte Aktualisierung"
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr "Nie"
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr "Jetzt aktualisieren"
+
+#: templates/InvenTree/settings/global.html:9
+#, fuzzy
+#| msgid "Sales Order Settings"
+msgid "Server Settings"
+msgstr "Auftrags-Einstellungen"
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr "Einstellungen"
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr "Benutzer-Einstellungen"
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr "Konto"
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr "Suche"
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr "InvenTree-Einstellungen"
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr "Server"
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+#, fuzzy
+#| msgid "Barcode"
+msgid "Barcodes"
+msgstr "Barcode"
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr "Währungen"
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+#, fuzzy
+#| msgid "Report"
+msgid "Reporting"
+msgstr "Bericht"
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr "Kategorien"
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr "Teil-Einstellungen"
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr "Teil-Optionen"
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr "Teileimport"
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr "Teil importieren"
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr "Teil-Parametervorlage"
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr "Keine Teilparametervorlagen gefunden"
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr "Vorlage bearbeiten"
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr "Vorlage löschen"
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr "Bestellungs-Einstellungen"
@@ -6273,95 +6296,87 @@ msgstr "Bestellungs-Einstellungen"
 msgid "Report Settings"
 msgstr "Berichts-Einstellungen"
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr "Kein Wert angegeben"
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr "Einstellungen ändern"
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
-msgstr "Einstellungen"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
+msgstr "Keine Kategorie-Parametervorlagen gefunden"
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr "Auftrags-Einstellungen"
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr "Bestands-Einstellungen"
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
-msgstr "Bestands-Einstellungen "
+#: templates/InvenTree/settings/user.html:9
+#, fuzzy
+#| msgid "Report Settings"
+msgid "Account Settings"
+msgstr "Berichts-Einstellungen"
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr "Benutzer-Einstellungen"
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr "Konto"
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr "Anzeige"
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr "InvenTree-Einstellungen"
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr "Systemweit"
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr "Währungen"
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr "Bericht"
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr "Kategorien"
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr "Benutzerinformation"
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr "Benutzername"
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr "Vorname"
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr "Nachname"
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr "Mail-Adresse"
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr "Anzeige-Einstellungen"
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "Thema anwenden"
+
+#: templates/InvenTree/settings/user.html:70
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Language Settings"
+msgstr "Einstellungen ändern"
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr "Sprache festlegen"
+
+#: templates/InvenTree/settings/user_homepage.html:9
+#, fuzzy
+#| msgid "Part Settings"
+msgid "Home Page Settings"
+msgstr "Teil-Einstellungen"
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Sucheinstellungen"
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr "InvenTree-Versionsinformationen"
@@ -7655,11 +7670,6 @@ msgstr "von"
 msgid "rows"
 msgstr "Zeilen"
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr "Suche"
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr "Keine passenden Ergebnisse gefunden"
@@ -7784,10 +7794,6 @@ msgstr "Eine E-Mail mit Anweisungen zum Zurücksetzen des Passworts wird gesende
 msgid "Send email"
 msgstr "E-Mail senden"
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Server"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr "Instanzname"
@@ -7848,6 +7854,10 @@ msgstr "Barcode Aktionen"
 msgid "Print test reports"
 msgstr "Test-Berichte drucken"
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr "Bestands-Einstellungen "
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr "Zu ausgewählten BestandsObjekten hinzufügen"
@@ -7947,3 +7957,35 @@ msgstr "Berechtigungen Einträge zu ändern"
 #: users/models.py:194
 msgid "Permission to delete items"
 msgstr "Berechtigung Einträge zu löschen"
+
+#~ msgid "Color Themes"
+#~ msgstr "Farbschemata"
+
+#~ msgid ""
+#~ "\n"
+#~ "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
+#~ "        Please select another color theme :)\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\t\tDie CSS Datei \"%(invalid_color_theme)s.css\" für das aktuell ausgewählte Farbschema wurde nicht gefunden.<br>\n"
+#~ "\t\tBitte ein anderes Farbschema auswählen:)\n"
+#~ "\t    "
+
+#~ msgid "Language"
+#~ msgstr "Sprache"
+
+#~ msgid "Category Parameter Templates"
+#~ msgstr "Kategorie-Parametervorlagen"
+
+#~ msgid "Global InvenTree Settings"
+#~ msgstr "Systemweite InvenTree-Einstellungen"
+
+#~ msgid "Appearance"
+#~ msgstr "Anzeige"
+
+#~ msgid "Global"
+#~ msgstr "Systemweit"
+
+#~ msgid "User Information"
+#~ msgstr "Benutzerinformation"
diff --git a/InvenTree/locale/el/LC_MESSAGES/django.po b/InvenTree/locale/el/LC_MESSAGES/django.po
index e1f01fc6ff..d8824faf28 100644
--- a/InvenTree/locale/el/LC_MESSAGES/django.po
+++ b/InvenTree/locale/el/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index cbea9f2909..e6f01b8227 100644
--- a/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,42 +34,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -123,8 +119,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -433,27 +429,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -523,7 +519,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,7 +656,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1543,7 +1540,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1679,388 +1676,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2072,19 +2069,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2094,7 +2091,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2102,19 +2099,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2502,7 +2499,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2525,7 +2523,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2626,8 +2625,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2660,7 +2659,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3450,7 +3450,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3996,7 +3997,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4176,7 +4178,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4188,7 +4190,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6147,121 +6149,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6270,95 +6291,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7652,11 +7657,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7781,10 +7781,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7845,6 +7841,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index a9a1ef238b..d302b079ee 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
@@ -33,42 +33,38 @@ msgstr "No se encontró ninguna acción coincidente"
 msgid "Enter date"
 msgstr "Ingrese la fecha"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "Confirmar eliminación"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "Confirmar borrado de artículo"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "Introduzca contraseña"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "Ingrese su nueva contraseña"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "Confirmar la contraseña"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "Confirmar contraseña nueva"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "Aplicar tema"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "Seleccionar Categoría"
 
@@ -122,8 +118,8 @@ msgstr "Comentario"
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr "Eliminar elemento"
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr "Configurar Contraseña"
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr "Información del sistema"
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr "días"
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,81 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "Aplicar tema"
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7658,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7782,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7842,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/fr/LC_MESSAGES/django.po b/InvenTree/locale/fr/LC_MESSAGES/django.po
index 602198ec7e..36048035f0 100644
--- a/InvenTree/locale/fr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/fr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
@@ -33,42 +33,38 @@ msgstr "Aucune action correspondante trouvée"
 msgid "Enter date"
 msgstr "Entrer la date"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "Confirmer la suppression"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "Confirmer la suppression de cet élément"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "Entrer le mot de passe"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "Entrer le nouveau mot de passe"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "Confirmez le mot de passe"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "Appliquer le thème"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "Sélectionnez une catégorie"
 
@@ -122,8 +118,8 @@ msgstr "Commentaire"
 msgid "File comment"
 msgstr "Commentaire du fichier"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr "Supprimer cet élément"
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr "Modifier les informations utilisateur"
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr "Informations système"
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr "{name.title()} Fichier"
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr "jours"
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,81 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "Appliquer le thème"
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7658,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7782,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7842,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/he/LC_MESSAGES/django.po b/InvenTree/locale/he/LC_MESSAGES/django.po
index c73997832a..9471a35e7b 100644
--- a/InvenTree/locale/he/LC_MESSAGES/django.po
+++ b/InvenTree/locale/he/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/id/LC_MESSAGES/django.po b/InvenTree/locale/id/LC_MESSAGES/django.po
index 1d55ba35f3..4bbf83fda5 100644
--- a/InvenTree/locale/id/LC_MESSAGES/django.po
+++ b/InvenTree/locale/id/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Indonesian\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index 0cf9d77d14..18ae2e2659 100644
--- a/InvenTree/locale/it/LC_MESSAGES/django.po
+++ b/InvenTree/locale/it/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/ja/LC_MESSAGES/django.po b/InvenTree/locale/ja/LC_MESSAGES/django.po
index f9766f016d..b15c9cc487 100644
--- a/InvenTree/locale/ja/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ja/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
@@ -33,42 +33,38 @@ msgstr "一致するアクションが見つかりませんでした"
 msgid "Enter date"
 msgstr "日付を入力する"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "確認"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "削除の確認"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "削除の確認"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "パスワードを入力してください"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "新しいパスワードを入力してください。"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "パスワードの確認"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "新しいパスワードの確認"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "テーマを適用"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "カテゴリの選択"
 
@@ -122,8 +118,8 @@ msgstr "コメント："
 msgid "File comment"
 msgstr "ファイルコメント"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr "テンプレート"
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr "パーツはデフォルトのテンプレートです"
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr "アセンブリ"
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr "パーツはデフォルトで他のコンポーネントから組み立てることができます"
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr "コンポーネント"
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr "パーツはデフォルトでサブコンポーネントとして使用できます"
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr "購入可能"
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr "パーツはデフォルトで購入可能です"
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr "パーツはデフォルトで販売可能です"
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr "追跡可能"
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr "パーツはデフォルトで追跡可能です"
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr "メーカー・パーツの在庫"
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr "<b>%(order)s</b> - <i>%(desc)s</i> の未処理のパーツを受け取
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,81 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "テーマを適用"
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7658,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7782,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7842,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/ko/LC_MESSAGES/django.po b/InvenTree/locale/ko/LC_MESSAGES/django.po
index 424a1d813d..5dc6be9ed6 100644
--- a/InvenTree/locale/ko/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ko/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Korean\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/nl/LC_MESSAGES/django.po b/InvenTree/locale/nl/LC_MESSAGES/django.po
index abd79c5703..e0586ff739 100644
--- a/InvenTree/locale/nl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/nl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/no/LC_MESSAGES/django.po b/InvenTree/locale/no/LC_MESSAGES/django.po
index 1dc014e6a5..d8326002bc 100644
--- a/InvenTree/locale/no/LC_MESSAGES/django.po
+++ b/InvenTree/locale/no/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/pl/LC_MESSAGES/django.po b/InvenTree/locale/pl/LC_MESSAGES/django.po
index 3bca5854a1..b90ee77e6a 100644
--- a/InvenTree/locale/pl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/pl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
@@ -33,42 +33,38 @@ msgstr "Nie znaleziono pasującej akcji"
 msgid "Enter date"
 msgstr "Wprowadź dane"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "Potwierdź usunięcie"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "Potwierdź usuwanie elementu"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "Wprowadź hasło"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "Wprowadź nowe hasło"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "Potwierdź nowe hasło"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "Zastosuj motyw"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "Wybierz kategorię"
 
@@ -122,8 +118,8 @@ msgstr "Komentarz"
 msgid "File comment"
 msgstr "Komentarz pliku"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr "Usuń element"
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr "Zaznacz pole aby potwierdzić usunięcie elementu"
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr "Edytuj informacje użytkownika"
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr "Ustaw hasło"
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr "Hasła muszą być zgodne"
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr "Informacja systemowa"
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr "Zlecenie Budowy"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr "Zlecenia budowy"
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr "Szablon"
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr "Złożenie"
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr "Komponent"
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr "Możliwość zakupu"
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr "Części są domyślnie z możliwością zakupu"
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr "Możliwość sprzedaży"
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr "Części są domyślnie z możliwością sprzedaży"
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr "Możliwość śledzenia"
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr "Części są domyślnie z możliwością śledzenia"
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr "Wirtualny"
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr "Części są domyślnie wirtualne"
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr "Pokaż ilość w formularzach"
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr "Tryb Debugowania"
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr "Rozmiar strony"
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr "Raporty testów"
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr "Włącz generowanie raportów testów"
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr "dni"
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr "Grupuj według komponentu"
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr "Cena"
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr "Domyślny"
 
@@ -2071,19 +2068,19 @@ msgstr "Aktualna wartość"
 msgid "Change Setting"
 msgstr "Zmień ustawienie"
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr "Wyślij plik"
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr "Wyślij plik"
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr "Zapasy dostawcy"
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr "Parametry"
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr "Kategoria"
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr "Dane"
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr "Wartość domyślna"
 
@@ -6146,121 +6148,144 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Server Settings"
+msgstr "Zmień ustawienie"
+
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+#, fuzzy
+#| msgid "Barcode actions"
+msgid "Barcodes"
+msgstr "Akcje kodów kreskowych"
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6294,87 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
-msgstr ""
+#: templates/InvenTree/settings/user.html:9
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Account Settings"
+msgstr "Zmień ustawienie"
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr "Adres e-mail"
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "Zastosuj motyw"
+
+#: templates/InvenTree/settings/user.html:70
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Language Settings"
+msgstr "Zmień ustawienie"
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Home Page Settings"
+msgstr "Zmień ustawienie"
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7668,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7792,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7852,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/ru/LC_MESSAGES/django.po b/InvenTree/locale/ru/LC_MESSAGES/django.po
index 2625c93af8..5b7537c7ba 100644
--- a/InvenTree/locale/ru/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ru/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -33,42 +33,38 @@ msgstr "Соответствующее действие не найдено"
 msgid "Enter date"
 msgstr "Введите дату"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "Подтвердите удаление"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "Подтвердите удаление элемента"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "Введите пароль"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "Введите новый пароль"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "Подтвердить пароль"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "Подтвердите новый пароль"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "Применить тему"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "Выбрать категорию"
 
@@ -122,8 +118,8 @@ msgstr "Комментарий"
 msgid "File comment"
 msgstr "Комментарий к файлу"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr "Перегрузка не может превысить 100%"
 msgid "Overage must be an integer value or a percentage"
 msgstr "Превышение должно быть целым числом или процентом"
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr "Удалить элемент"
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr "Установите флажок для подтверждения удаления элемента"
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr "Редактировать информацию о пользователе"
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr "Установить пароль"
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr "Пароли должны совпадать"
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr "Информация о системе"
 
@@ -522,7 +518,7 @@ msgstr "Целевая дата для сборки. Сборка будет п
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr "Порядок сборки"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr "Порядок сборки"
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,81 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "Применить тему"
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7658,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7782,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7842,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/sv/LC_MESSAGES/django.po b/InvenTree/locale/sv/LC_MESSAGES/django.po
index 9298514d60..c80af339f6 100644
--- a/InvenTree/locale/sv/LC_MESSAGES/django.po
+++ b/InvenTree/locale/sv/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Swedish\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/th/LC_MESSAGES/django.po b/InvenTree/locale/th/LC_MESSAGES/django.po
index 207511ee49..317921cac2 100644
--- a/InvenTree/locale/th/LC_MESSAGES/django.po
+++ b/InvenTree/locale/th/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Thai\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/tr/LC_MESSAGES/django.po b/InvenTree/locale/tr/LC_MESSAGES/django.po
index 69c6d097ff..8e0bc94232 100644
--- a/InvenTree/locale/tr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/tr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
@@ -33,42 +33,38 @@ msgstr "Eşleşen eylem bulunamadı"
 msgid "Enter date"
 msgstr "Tarih giriniz"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "Onay"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "Silmeyi Onayla"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr "Silmeyi onayla"
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "Şifrenizi girin"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "Lütfen Yeni Parolayı Girin"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "Parolayı doğrulayın"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "Yeni parolayı doğrulayın"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "Temayı Uygula"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "Kategori Seçin"
 
@@ -122,8 +118,8 @@ msgstr "Yorum"
 msgid "File comment"
 msgstr "Dosya yorumu"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr "Fazlalık %100'ü geçmemelidir"
 msgid "Overage must be an integer value or a percentage"
 msgstr "Fazlalık bir tamsayı veya yüzde olmalıdır"
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr "Ögeyi Sil"
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr "Öge silme işlemini onaylamak için kutuyu işaretleyin"
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr "Kullanıcı Bilgisini Düzenle"
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr "Şifre Belirle"
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr "Parola alanları eşleşmelidir"
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr "Sistem Bilgisi"
 
@@ -522,7 +518,7 @@ msgstr "Yapım işinin tamamlanması için hedef tarih. Bu tarihten sonra yapım
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr "Yapım İşi Emri"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr "Yapım İşi Emirleri"
 
@@ -1542,7 +1539,7 @@ msgstr "{name.title()} Dosya"
 msgid "Select {name} file to upload"
 msgstr "{name} dosyasını yüklemek için seçin"
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr "Kategori Paremetre Sablonu Kopyala"
 msgid "Copy category parameter templates when creating a part"
 msgstr "Parça oluştururken kategori parametre şablonlarını kopyala"
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr "Şablon"
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr "Parçaları varsayılan olan şablondur"
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr "Montaj"
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr "Parçalar varsayılan olarak başka bileşenlerden monte edilebilir"
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr "Bileşen"
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr "Parçalar varsayılan olarak alt bileşen olarak kullanılabilir"
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr "Satın Alınabilir"
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr "Parçalar varsayılan olarak satın alınabilir"
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr "Satılabilir"
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr "Parçalar varsayılan olarak satılabilir"
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr "Takip Edilebilir"
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr "Parçalar varsayılan olarak takip edilebilir"
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr "Sanal"
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr "Parçalar varsayılan olarak sanaldır"
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr "Stok konumu ve ögeler üzerinde sahiplik kontrolünü etkinleştirin"
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr "Dosya Yükle"
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr "Dosya Yükle"
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr "Tedarikçi Stoku"
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr "Satın Alma Emirleri"
@@ -2524,7 +2522,8 @@ msgstr "Yeni Satın Alma Emri"
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr "Satış Emirleri"
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr "Parametre Şablonu"
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,144 @@ msgstr ""
 msgid "No stock location set"
 msgstr "Stok konumu ayarlanmadı"
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr "Kategori Ayarları"
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr "Kategori Parametre Şablonu"
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr "Kategori parametre şablonu bulunamadı"
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr "Şablonu Düzenle"
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr "Şablonu Sil"
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr "Kategori Ayarları"
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+#, fuzzy
+#| msgid "Category Settings"
+msgid "Server Settings"
+msgstr "Kategori Ayarları"
+
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+#, fuzzy
+#| msgid "Barcode actions"
+msgid "Barcodes"
+msgstr "Barkod işlemleri"
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr "Parça Parametre Şablonu"
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr "Parça parametre şablonu bulunamadı"
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr "Şablonu Düzenle"
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr "Şablonu Sil"
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6294,87 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
-msgstr ""
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
+msgstr "Kategori parametre şablonu bulunamadı"
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
-msgstr ""
+#: templates/InvenTree/settings/user.html:9
+#, fuzzy
+#| msgid "Category Settings"
+msgid "Account Settings"
+msgstr "Kategori Ayarları"
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "Temayı Uygula"
+
+#: templates/InvenTree/settings/user.html:70
+#, fuzzy
+#| msgid "Category Settings"
+msgid "Language Settings"
+msgstr "Kategori Ayarları"
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+#, fuzzy
+#| msgid "Category Settings"
+msgid "Home Page Settings"
+msgstr "Kategori Ayarları"
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7668,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7792,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7852,10 @@ msgstr "Barkod İşlemleri"
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
@@ -7943,3 +7955,6 @@ msgstr ""
 #: users/models.py:194
 msgid "Permission to delete items"
 msgstr ""
+
+#~ msgid "Category Parameter Templates"
+#~ msgstr "Kategori Parametre Şablonu"
diff --git a/InvenTree/locale/vi/LC_MESSAGES/django.po b/InvenTree/locale/vi/LC_MESSAGES/django.po
index 934ceebfd1..0e258fd630 100644
--- a/InvenTree/locale/vi/LC_MESSAGES/django.po
+++ b/InvenTree/locale/vi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Vietnamese\n"
@@ -33,42 +33,38 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr ""
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr ""
 
@@ -122,8 +118,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,79 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Set Theme"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7656,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7780,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7840,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""
diff --git a/InvenTree/locale/zh/LC_MESSAGES/django.po b/InvenTree/locale/zh/LC_MESSAGES/django.po
index c382779fa8..e1af2d4bd8 100644
--- a/InvenTree/locale/zh/LC_MESSAGES/django.po
+++ b/InvenTree/locale/zh/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-27 21:02+0000\n"
+"POT-Creation-Date: 2021-07-28 05:05+0000\n"
 "PO-Revision-Date: 2021-07-27 00:13\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
@@ -33,42 +33,38 @@ msgstr "未找到指定操作"
 msgid "Enter date"
 msgstr "输入日期"
 
-#: InvenTree/forms.py:112 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:169 build/forms.py:185 build/forms.py:227
 #: order/forms.py:30 order/forms.py:41 order/forms.py:52 order/forms.py:63
 #: order/forms.py:74 part/forms.py:109 templates/js/forms.js:526
 msgid "Confirm"
 msgstr "确认"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:127
 msgid "Confirm delete"
 msgstr "确认删除"
 
-#: InvenTree/forms.py:129
+#: InvenTree/forms.py:128
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:161 templates/registration/login.html:76
+#: InvenTree/forms.py:160 templates/registration/login.html:76
 msgid "Enter password"
 msgstr "输入密码"
 
-#: InvenTree/forms.py:162
+#: InvenTree/forms.py:161
 msgid "Enter new password"
 msgstr "输入新密码"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:168
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: InvenTree/forms.py:170
+#: InvenTree/forms.py:169
 msgid "Confirm new password"
 msgstr "确认新密码"
 
-#: InvenTree/forms.py:205
-msgid "Apply Theme"
-msgstr "应用主题"
-
-#: InvenTree/forms.py:235
+#: InvenTree/forms.py:201
 msgid "Select Category"
 msgstr "选择分类"
 
@@ -122,8 +118,8 @@ msgstr "注释"
 msgid "File comment"
 msgstr "文件注释"
 
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:880
-#: common/models.py:881 part/models.py:2097
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:879
+#: common/models.py:880 part/models.py:2097
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:1538
 msgid "User"
@@ -432,27 +428,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:608
+#: InvenTree/views.py:609
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:657
+#: InvenTree/views.py:658
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:672 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:673 templates/InvenTree/settings/user.html:14
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:683 templates/InvenTree/settings/user.html:22
+#: InvenTree/views.py:684 templates/InvenTree/settings/user.html:18
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:702
+#: InvenTree/views.py:703
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:953 templates/navbar.html:95
+#: InvenTree/views.py:897 templates/navbar.html:95
 msgid "System Information"
 msgstr ""
 
@@ -522,7 +518,7 @@ msgstr ""
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:909
+#: build/templates/build/detail.html:34 common/models.py:908
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
 #: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -659,7 +655,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
 #: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/tabs.html:37 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1539,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:259 common/models.py:760 common/models.py:873
+#: common/models.py:259 common/models.py:739 common/models.py:872
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1678,388 +1675,388 @@ msgstr ""
 msgid "Copy category parameter templates when creating a part"
 msgstr ""
 
-#: common/models.py:542
-msgid "Recent Part Count"
-msgstr ""
-
-#: common/models.py:543
-msgid "Number of recent parts to display on index page"
-msgstr ""
-
-#: common/models.py:549 part/models.py:2280 report/models.py:187
+#: common/models.py:542 part/models.py:2280 report/models.py:187
 #: stock/forms.py:225 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:324
 msgid "Template"
 msgstr ""
 
-#: common/models.py:550
+#: common/models.py:543
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:556 part/models.py:865 templates/js/table_filters.js:132
+#: common/models.py:549 part/models.py:865 templates/js/table_filters.js:132
 #: templates/js/table_filters.js:336
 msgid "Assembly"
 msgstr ""
 
-#: common/models.py:557
+#: common/models.py:550
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:563 part/models.py:871 templates/js/table_filters.js:340
+#: common/models.py:556 part/models.py:871 templates/js/table_filters.js:340
 msgid "Component"
 msgstr ""
 
-#: common/models.py:564
+#: common/models.py:557
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:570 part/models.py:882
+#: common/models.py:563 part/models.py:882
 msgid "Purchaseable"
 msgstr ""
 
-#: common/models.py:571
+#: common/models.py:564
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:577 part/models.py:887 templates/js/table_filters.js:348
+#: common/models.py:570 part/models.py:887 templates/js/table_filters.js:348
 msgid "Salable"
 msgstr ""
 
-#: common/models.py:578
+#: common/models.py:571
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:584 part/models.py:877 templates/js/table_filters.js:33
+#: common/models.py:577 part/models.py:877 templates/js/table_filters.js:33
 #: templates/js/table_filters.js:352
 msgid "Trackable"
 msgstr ""
 
-#: common/models.py:585
+#: common/models.py:578
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:591 part/models.py:897 templates/js/table_filters.js:29
+#: common/models.py:584 part/models.py:897 templates/js/table_filters.js:29
 msgid "Virtual"
 msgstr ""
 
-#: common/models.py:592
+#: common/models.py:585
 msgid "Parts are virtual by default"
 msgstr ""
 
-#: common/models.py:598
+#: common/models.py:591
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:599
+#: common/models.py:592
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:605
+#: common/models.py:598
 msgid "Show Import in Views"
 msgstr ""
 
-#: common/models.py:606
+#: common/models.py:599
 msgid "Display the import wizard in some part views"
 msgstr ""
 
-#: common/models.py:612
+#: common/models.py:605
 msgid "Show Price in Forms"
 msgstr ""
 
-#: common/models.py:613
+#: common/models.py:606
 msgid "Display part price in some forms"
 msgstr ""
 
-#: common/models.py:619
+#: common/models.py:612
 msgid "Show related parts"
 msgstr ""
 
-#: common/models.py:620
+#: common/models.py:613
 msgid "Display related parts for a part"
 msgstr ""
 
-#: common/models.py:626
+#: common/models.py:619
 msgid "Create initial stock"
 msgstr ""
 
-#: common/models.py:627
+#: common/models.py:620
 msgid "Create initial stock on part creation"
 msgstr ""
 
-#: common/models.py:633
+#: common/models.py:626
 msgid "Internal Prices"
 msgstr ""
 
-#: common/models.py:634
+#: common/models.py:627
 msgid "Enable internal prices for parts"
 msgstr ""
 
-#: common/models.py:640
+#: common/models.py:633
 msgid "Internal Price as BOM-Price"
 msgstr ""
 
-#: common/models.py:641
+#: common/models.py:634
 msgid "Use the internal price (if set) in BOM-price calculations"
 msgstr ""
 
-#: common/models.py:647 templates/stats.html:25
+#: common/models.py:640 templates/stats.html:25
 msgid "Debug Mode"
 msgstr ""
 
-#: common/models.py:648
+#: common/models.py:641
 msgid "Generate reports in debug mode (HTML output)"
 msgstr ""
 
-#: common/models.py:654
+#: common/models.py:647
 msgid "Page Size"
 msgstr ""
 
-#: common/models.py:655
+#: common/models.py:648
 msgid "Default page size for PDF reports"
 msgstr ""
 
-#: common/models.py:665
+#: common/models.py:658
 msgid "Test Reports"
 msgstr ""
 
-#: common/models.py:666
+#: common/models.py:659
 msgid "Enable generation of test reports"
 msgstr ""
 
-#: common/models.py:672
-msgid "Search Preview Results"
-msgstr ""
-
-#: common/models.py:673
-msgid "Number of results to show in search preview window"
-msgstr ""
-
-#: common/models.py:679
+#: common/models.py:665
 msgid "Stock Expiry"
 msgstr ""
 
-#: common/models.py:680
+#: common/models.py:666
 msgid "Enable stock expiry functionality"
 msgstr ""
 
-#: common/models.py:686
+#: common/models.py:672
 msgid "Sell Expired Stock"
 msgstr ""
 
-#: common/models.py:687
+#: common/models.py:673
 msgid "Allow sale of expired stock"
 msgstr ""
 
-#: common/models.py:693
+#: common/models.py:679
 msgid "Stock Stale Time"
 msgstr ""
 
-#: common/models.py:694
+#: common/models.py:680
 msgid "Number of days stock items are considered stale before expiring"
 msgstr ""
 
-#: common/models.py:696
+#: common/models.py:682
 msgid "days"
 msgstr ""
 
-#: common/models.py:701
+#: common/models.py:687
 msgid "Build Expired Stock"
 msgstr ""
 
-#: common/models.py:702
+#: common/models.py:688
 msgid "Allow building with expired stock"
 msgstr ""
 
-#: common/models.py:708
+#: common/models.py:694
 msgid "Stock Ownership Control"
 msgstr ""
 
-#: common/models.py:709
+#: common/models.py:695
 msgid "Enable ownership control over stock locations and items"
 msgstr ""
 
-#: common/models.py:715
+#: common/models.py:701
 msgid "Group by Part"
 msgstr ""
 
-#: common/models.py:716
+#: common/models.py:702
 msgid "Group stock items by part reference in table views"
 msgstr ""
 
-#: common/models.py:722
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:723
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:729
+#: common/models.py:708
 msgid "Build Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:730
+#: common/models.py:709
 msgid "Prefix value for build order reference"
 msgstr ""
 
-#: common/models.py:735
+#: common/models.py:714
 msgid "Build Order Reference Regex"
 msgstr ""
 
-#: common/models.py:736
+#: common/models.py:715
 msgid "Regular expression pattern for matching build order reference"
 msgstr ""
 
-#: common/models.py:740
+#: common/models.py:719
 msgid "Sales Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:741
+#: common/models.py:720
 msgid "Prefix value for sales order reference"
 msgstr ""
 
-#: common/models.py:746
+#: common/models.py:725
 msgid "Purchase Order Reference Prefix"
 msgstr ""
 
-#: common/models.py:747
+#: common/models.py:726
 msgid "Prefix value for purchase order reference"
 msgstr ""
 
-#: common/models.py:771
+#: common/models.py:750
 msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:772
+#: common/models.py:751
 msgid "Show starred parts on the homepage"
 msgstr ""
 
-#: common/models.py:777
+#: common/models.py:756
 msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:778
+#: common/models.py:757
 msgid "Show latest parts on the homepage"
 msgstr ""
 
-#: common/models.py:783
+#: common/models.py:762
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:763
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:769
 msgid "Show unvalidated BOMs"
 msgstr ""
 
-#: common/models.py:784
+#: common/models.py:770
 msgid "Show BOMs that await validation on the homepage"
 msgstr ""
 
-#: common/models.py:789
+#: common/models.py:775
 msgid "Show recent stock changes"
 msgstr ""
 
-#: common/models.py:790
+#: common/models.py:776
 msgid "Show recently changed stock items on the homepage"
 msgstr ""
 
-#: common/models.py:795
+#: common/models.py:781
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:782
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:787
 msgid "Show low stock"
 msgstr ""
 
-#: common/models.py:796
+#: common/models.py:788
 msgid "Show low stock items on the homepage"
 msgstr ""
 
-#: common/models.py:801
+#: common/models.py:793
 msgid "Show depleted stock"
 msgstr ""
 
-#: common/models.py:802
+#: common/models.py:794
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:807
+#: common/models.py:799
 msgid "Show needed stock"
 msgstr ""
 
-#: common/models.py:808
+#: common/models.py:800
 msgid "Show stock items needed for builds on the homepage"
 msgstr ""
 
-#: common/models.py:813
+#: common/models.py:805
 msgid "Show expired stock"
 msgstr ""
 
-#: common/models.py:814
+#: common/models.py:806
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:819
+#: common/models.py:811
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:820
+#: common/models.py:812
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:825
+#: common/models.py:817
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:826
+#: common/models.py:818
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:831
+#: common/models.py:823
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:832
+#: common/models.py:824
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:837
+#: common/models.py:829
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:838
+#: common/models.py:830
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:843
+#: common/models.py:835
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:844
+#: common/models.py:836
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:849
+#: common/models.py:841
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:850
+#: common/models.py:842
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:855
+#: common/models.py:847
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:856
+#: common/models.py:848
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:910 company/forms.py:43
+#: common/models.py:854
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:855
+msgid "Number of results to show in search preview window"
+msgstr ""
+
+#: common/models.py:909 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:917 company/templates/company/supplier_part.html:231
+#: common/models.py:916 company/templates/company/supplier_part.html:231
 #: templates/js/part.js:1021
 msgid "Price"
 msgstr ""
 
-#: common/models.py:918
+#: common/models.py:917
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1011
+#: common/models.py:1010
 msgid "Default"
 msgstr ""
 
@@ -2071,19 +2068,19 @@ msgstr ""
 msgid "Change Setting"
 msgstr ""
 
-#: common/views.py:102
+#: common/views.py:119
 msgid "Supplied value is not allowed"
 msgstr ""
 
-#: common/views.py:111
+#: common/views.py:128
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: common/views.py:121
+#: common/views.py:138
 msgid "Change User Setting"
 msgstr ""
 
-#: common/views.py:196 order/templates/order/order_wizard/po_upload.html:42
+#: common/views.py:213 order/templates/order/order_wizard/po_upload.html:42
 #: order/templates/order/po_navbar.html:19
 #: order/templates/order/po_navbar.html:22
 #: order/templates/order/purchase_order_detail.html:26 order/views.py:290
@@ -2093,7 +2090,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: common/views.py:197 order/templates/order/order_wizard/match_fields.html:52
+#: common/views.py:214 order/templates/order/order_wizard/match_fields.html:52
 #: order/views.py:291 part/templates/part/bom_upload/match_fields.html:52
 #: part/templates/part/import_wizard/ajax_match_fields.html:45
 #: part/templates/part/import_wizard/match_fields.html:52 part/views.py:635
@@ -2101,19 +2098,19 @@ msgstr ""
 msgid "Match Fields"
 msgstr ""
 
-#: common/views.py:198
+#: common/views.py:215
 msgid "Match Items"
 msgstr ""
 
-#: common/views.py:543
+#: common/views.py:560
 msgid "Fields matching failed"
 msgstr ""
 
-#: common/views.py:598
+#: common/views.py:615
 msgid "Parts imported"
 msgstr ""
 
-#: common/views.py:620 order/templates/order/order_wizard/match_fields.html:27
+#: common/views.py:637 order/templates/order/order_wizard/match_fields.html:27
 #: order/templates/order/order_wizard/match_parts.html:19
 #: order/templates/order/order_wizard/po_upload.html:40
 #: part/templates/part/bom_upload/match_fields.html:27
@@ -2501,7 +2498,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
 #: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/tabs.html:40 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2524,7 +2522,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
 #: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/tabs.html:43 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2625,8 +2624,8 @@ msgstr ""
 
 #: company/templates/company/manufacturer_part.html:133
 #: part/templates/part/detail.html:162
-#: templates/InvenTree/settings/category.html:29
-#: templates/InvenTree/settings/part.html:66
+#: templates/InvenTree/settings/category.html:26
+#: templates/InvenTree/settings/part.html:63
 msgid "New Parameter"
 msgstr ""
 
@@ -2659,7 +2658,8 @@ msgstr ""
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
 #: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/tabs.html:34 templates/js/part.js:269
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85 templates/js/part.js:269
 #: templates/js/part.js:494 templates/js/part.js:654 templates/js/stock.js:123
 #: templates/js/stock.js:926 templates/navbar.html:26
 msgid "Stock"
@@ -3449,7 +3449,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/tabs.html:31 templates/js/part.js:855
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73 templates/js/part.js:855
 #: templates/navbar.html:23 templates/stats.html:80 templates/stats.html:89
 #: users/models.py:41
 msgid "Parts"
@@ -3995,7 +3996,8 @@ msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
 #: part/models.py:755 part/models.py:2323
-#: part/templates/part/set_category.html:15 templates/js/part.js:641
+#: part/templates/part/set_category.html:15
+#: templates/InvenTree/settings/settings.html:165 templates/js/part.js:641
 msgid "Category"
 msgstr ""
 
@@ -4175,7 +4177,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2280 part/models.py:2329 part/models.py:2330
-#: templates/InvenTree/settings/category.html:62
+#: templates/InvenTree/settings/settings.html:160
 msgid "Parameter Template"
 msgstr ""
 
@@ -4187,7 +4189,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2334 templates/InvenTree/settings/category.html:67
+#: part/models.py:2334 templates/InvenTree/settings/settings.html:169
 msgid "Default Value"
 msgstr ""
 
@@ -6146,121 +6148,140 @@ msgstr ""
 msgid "No stock location set"
 msgstr ""
 
-#: templates/InvenTree/settings/appearance.html:10
-msgid "Theme Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:17
-msgid "Color Themes"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:29
-#, python-format
-msgid ""
-"\n"
-"        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
-"        Please select another color theme :)\n"
-"    "
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:39
-msgid "Language"
-msgstr ""
-
-#: templates/InvenTree/settings/appearance.html:61
-msgid "Set Language"
-msgstr ""
-
-#: templates/InvenTree/settings/build.html:10
-msgid "Build Order Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:9
-msgid "Category Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:25
-msgid "Category Parameter Templates"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:52
-msgid "No category parameter templates found"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:70
-#: templates/InvenTree/settings/part.html:103
-msgid "Edit Template"
-msgstr ""
-
-#: templates/InvenTree/settings/category.html:71
-#: templates/InvenTree/settings/part.html:104
-msgid "Delete Template"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:10
-msgid "Currency Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:25
-msgid "Base Currency"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:29
-msgid "Exchange Rates"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:39
-msgid "Last Update"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:45
-msgid "Never"
-msgstr ""
-
-#: templates/InvenTree/settings/currencies.html:50
-msgid "Update Now"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:10
-msgid "Global InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/global.html:26
+#: templates/InvenTree/settings/barcode.html:8
 msgid "Barcode Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/global.html:34
-msgid "Search Settings"
+#: templates/InvenTree/settings/build.html:8
+msgid "Build Order Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/category.html:7
+msgid "Category Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:8
+msgid "Currency Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:23
+msgid "Base Currency"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:27
+msgid "Exchange Rates"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:37
+msgid "Last Update"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:43
+msgid "Never"
+msgstr ""
+
+#: templates/InvenTree/settings/currencies.html:48
+msgid "Update Now"
+msgstr ""
+
+#: templates/InvenTree/settings/global.html:9
+msgid "Server Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/header.html:7
 msgid "Setting"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:9
+#: templates/InvenTree/settings/navbar.html:12
+#: templates/InvenTree/settings/user_settings.html:9
+msgid "User Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:15
+#: templates/InvenTree/settings/navbar.html:17
+msgid "Account"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:21
+#: templates/InvenTree/settings/navbar.html:23
+msgid "Home Page"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:27
+#: templates/InvenTree/settings/navbar.html:29 templates/js/tables.js:351
+#: templates/search_form.html:6 templates/search_form.html:8
+msgid "Search"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:34
+#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
+msgid "Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:44
+msgid "InvenTree Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:47
+#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+msgid "Server"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:53
+#: templates/InvenTree/settings/navbar.html:55
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
+msgid "Categories"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:7
 msgid "Part Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:14
+#: templates/InvenTree/settings/part.html:12
 msgid "Part Options"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:46
+#: templates/InvenTree/settings/part.html:43
 msgid "Part Import"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:49
+#: templates/InvenTree/settings/part.html:46
 msgid "Import Part"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:62
+#: templates/InvenTree/settings/part.html:59
 msgid "Part Parameter Templates"
 msgstr ""
 
-#: templates/InvenTree/settings/part.html:83
+#: templates/InvenTree/settings/part.html:80
 msgid "No part parameter templates found"
 msgstr ""
 
+#: templates/InvenTree/settings/part.html:100
+#: templates/InvenTree/settings/settings.html:172
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/part.html:101
+#: templates/InvenTree/settings/settings.html:173
+msgid "Delete Template"
+msgstr ""
+
 #: templates/InvenTree/settings/po.html:9
 msgid "Purchase Order Settings"
 msgstr ""
@@ -6269,95 +6290,81 @@ msgstr ""
 msgid "Report Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:28
+#: templates/InvenTree/settings/setting.html:29
 msgid "No value set"
 msgstr ""
 
-#: templates/InvenTree/settings/setting.html:36
+#: templates/InvenTree/settings/setting.html:41
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:8
-#: templates/InvenTree/settings/settings.html:14 templates/navbar.html:84
-msgid "Settings"
+#: templates/InvenTree/settings/settings.html:150
+msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/so.html:9
+#: templates/InvenTree/settings/so.html:7
 msgid "Sales Order Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:9
+#: templates/InvenTree/settings/stock.html:7
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/stock.html:13 templates/stock_table.html:50
-msgid "Stock Options"
+#: templates/InvenTree/settings/user.html:9
+msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/tabs.html:3
-#: templates/InvenTree/settings/tabs.html:12
-#: templates/InvenTree/settings/user.html:10
-#: templates/InvenTree/settings/user_settings.html:10
-msgid "User Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:6
-msgid "Account"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:9
-msgid "Appearance"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:16
-msgid "InvenTree Settings"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:19
-msgid "Global"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:22
-msgid "Currencies"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:25
-msgid "Report"
-msgstr ""
-
-#: templates/InvenTree/settings/tabs.html:28
-msgid "Categories"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:16
-msgid "User Information"
-msgstr ""
-
-#: templates/InvenTree/settings/user.html:19
+#: templates/InvenTree/settings/user.html:15
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:21
+#: templates/InvenTree/settings/user.html:17
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:24
 #: templates/registration/login.html:58
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:28
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
+#: templates/InvenTree/settings/user.html:32
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:40
+#: templates/InvenTree/settings/user.html:36
 msgid "Email Address"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:42
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+#, fuzzy
+#| msgid "Apply Theme"
+msgid "Set Theme"
+msgstr "应用主题"
+
+#: templates/InvenTree/settings/user.html:70
+msgid "Language Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:90
+msgid "Set Language"
+msgstr ""
+
+#: templates/InvenTree/settings/user_homepage.html:9
+msgid "Home Page Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr ""
+
 #: templates/about.html:13
 msgid "InvenTree Version Information"
 msgstr ""
@@ -7651,11 +7658,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/tables.js:351 templates/search_form.html:6
-#: templates/search_form.html:8
-msgid "Search"
-msgstr ""
-
 #: templates/js/tables.js:354
 msgid "No matching results"
 msgstr ""
@@ -7780,10 +7782,6 @@ msgstr ""
 msgid "Send email"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -7844,6 +7842,10 @@ msgstr ""
 msgid "Print test reports"
 msgstr ""
 
+#: templates/stock_table.html:50
+msgid "Stock Options"
+msgstr ""
+
 #: templates/stock_table.html:55
 msgid "Add to selected stock items"
 msgstr ""