Merge branch 'master' into photon-style

2026-01-18 23:31:47 -08:00 · 2022-10-17 13:15:59 +09:00 · 2022-10-17 13:15:59 +09:00 · df2b15cdee
commit df2b15cdee
parent d1283a4099 97d8753ec2
68 changed files with 3205 additions and 2890 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -41,18 +41,3 @@ jobs:

      - name: Test
        run: yarn test
-
-  prettier:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Prettify code
-        uses: creyD/prettier_action@v4.1.1
-        with:
-          # This part is also where you can pass other options, for example:
-          prettier_options: --write .
-          only_changed: True
-          commit_message: "Clean: Prettified Code!"
--- a/.prettierignore
+++ b/.prettierignore
@ -5,7 +5,7 @@
 # User.js
 user.js

-# Prettier error exeption
+# Prettier error exception
 src/utils/_each.scss
 # [error] src/utils/_each.scss: SyntaxError: CssSyntaxError: At-rule without name (28:7)
 # [error]   26 |         }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -90,7 +90,7 @@ Even if you copy the code snippet, it is recommended that you leave a link.

 **FAQ**

-If you have any questions about other licenses, please see [Moailla's MPL 2.0 FAQ](https://www.mozilla.org/en-US/MPL/2.0/FAQ/).
+If you have any questions about other licenses, please see [Mozilla's MPL 2.0 FAQ](https://www.mozilla.org/en-US/MPL/2.0/FAQ/).


 ## References
--- a/tests/each.test.scss
+++ b/tests/each.test.scss
@ -68,7 +68,7 @@
  @include test("prefix custom option") {
    @include assert {
      @include output {
-        @include each.AtEach("supports", "userChrome.tab.photon", "-moz-bool-pref", ("seperator": " or ", "quoted": true)) {
+        @include each.AtEach("supports", "userChrome.tab.photon", "-moz-bool-pref", ("separator": " or ", "quoted": true)) {
          @include example;
        }
      }
@ -84,7 +84,7 @@
    @include assert {
      @include output {
        $input: "userChrome.tab.photon" "userChrome.padding.photon";
-        @include each.AtEach("supports", $input, "-moz-bool-pref", ("seperator": " or ", "quoted": true)) {
+        @include each.AtEach("supports", $input, "-moz-bool-pref", ("separator": " or ", "quoted": true)) {
          @include example;
        }
      }
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@ -650,7 +650,7 @@
      --in-content-link-color-hover: var(--blue-70);
      --in-content-link-color-active: var(--blue-80);
      --in-content-link-color-visited: var(--blue-60);
-      /* button background states are also used for checkboxes and radiobuttons */
+      /* button background states are also used for checkboxes and radio buttons */
      --in-content-button-text-color: var(--in-content-text-color);
      --in-content-button-text-color-hover: var(--in-content-text-color);
      --in-content-button-background: rgba(207, 207, 216, 0.33);
@ -1160,7 +1160,7 @@
        /* .developer-hub */
        /* Background */
        /* Border */
-        /* Othres */
+        /* Others */
      }
      body:is(.developer-hub, .statistics) #main-wrapper,
      body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul::after,
@ -2014,7 +2014,7 @@
      border-color: transparent !important;
      outline: 2px solid var(--in-content-focus-outline-color) !important;
      outline-offset: -1px !important;
-      /* Prevents antialising around the corners */
+      /* Prevents antialiasing around the corners */
    }

    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid,
@ -2022,7 +2022,7 @@
      border-color: transparent !important;
      outline: 2px solid var(--in-content-border-invalid) !important;
      outline-offset: -1px !important;
-      /* Prevents antialising around the corners */
+      /* Prevents antialiasing around the corners */
    }

    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled,
@ -2282,7 +2282,7 @@
        list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
      }

-      /* Boomark */
+      /* Bookmark */
      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
        list-style-image: url("chrome://browser/skin/bookmark.svg") !important;
      }
@ -2326,7 +2326,7 @@
        list-style-image: url("../icons/tag-open.svg") !important;
      }

-      /* Boomark */
+      /* Bookmark */
      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) {
        list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important;
      }
@ -2770,7 +2770,7 @@
          color: var(--organizer-selected-color) !important;
        }

-        /*- Radio Button ---------------------------------------------------------*/
+        /*- Radio Button -------------------------------------------------------------*/
        menuitem[type="radio"] {
          /* margin-inline-start: 0 !important; */
          appearance: none !important;
@ -2828,7 +2828,7 @@
          opacity: 0.5 !important;
        }

-        /*- Check Box ------------------------------------------------------------*/
+        /*- Check Box ----------------------------------------------------------------*/
        /* From checkbox.css */
        menuitem[type="checkbox"] {
          appearance: none !important;
@ -2985,7 +2985,7 @@
          opacity: 0.4 !important;
        }

-        /*- Menu Separtor --------------------------------------------------------*/
+        /*- Menu Separator -----------------------------------------------------------*/
        menuseparator {
          appearance: none !important;
          min-width: 2px;
@ -3011,96 +3011,14 @@
  }
 }
 /** Menu - Icons Layout *******************************************************/
-@supports -moz-bool-pref("userChrome.icon.menu") {
-  @-moz-document url("chrome://browser/content/places/places.xhtml"),
+@supports not -moz-bool-pref("userChrome.icon.disabled") {
+  @supports -moz-bool-pref("userChrome.icon.menu") {
+    @-moz-document url("chrome://browser/content/places/places.xhtml"),
               url("about:downloads") {
-    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
-    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) {
-      -moz-appearance: none !important;
-      /* Linux: menulist */
-    }
-
-    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-      menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-      menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-    menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-      /* Color */
-      -moz-context-properties: fill, fill-opacity !important;
-      fill: currentColor !important;
-      /* Layout */
-      background-size: 16px !important;
-      background-repeat: no-repeat !important;
-      background-image: var(--menuitem-image);
-    }
-
-    /* For native context menus */
-    @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
-      :not(menu, #ContentSelectDropdown)
-        > menupopup
-        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-        list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
-      }
-    }
-
-    /* Padding */
-    :root {
-      --uc-menu-background-position: left;
-      --context-menu-background-padding-default: 5px;
-      --context-menu-background-padding: var(--context-menu-background-padding-default);
-    }
-    :root:-moz-locale-dir(rtl) {
-      --uc-menu-background-position: right;
-    }
-
-    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-      menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-      menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-    menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-      > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-      background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
-      padding-inline-start: var(--context-menu-background-padding) !important;
-    }
-
-    /* Padding - Windows */
-    @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
-      :root {
-        --context-menu-background-padding-default: 2px;
-      }
-    }
-    @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
-      :root {
-        --context-menu-background-padding-default: 3px;
-      }
-    }
-    @media (-moz-os-version: windows-win7),
-      (-moz-platform: windows-win7),
-      (-moz-os-version: windows-win8),
-      (-moz-platform: windows-win8) {
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-        background-position: left var(--context-menu-background-padding) center !important;
-        padding-inline-start: 0 !important;
-      }
-    }
-    @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
-      :root {
-        --context-menu-background-padding: 1em;
-        --context-menu-text-padding: 24px;
-        /* 16px + 8px */
-        --menu-background-padding-default: calc(
-          var(--context-menu-background-padding) + var(--context-menu-text-padding)
-        );
+      menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
+      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) {
+        -moz-appearance: none !important;
+        /* Linux: menulist */
      }

      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
@ -3110,297 +3028,383 @@
      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-        padding-inline-start: var(--menu-background-padding-default) !important;
-        margin-left: 0 !important;
-      }
-    }
-    /* Padding - Linux */
-    @media (-moz-gtk-csd-available) {
-      :root {
-        --context-menu-background-padding-default: 6px;
+        /* Color */
+        -moz-context-properties: fill, fill-opacity !important;
+        fill: currentColor !important;
+        /* Layout */
+        background-size: 16px !important;
+        background-repeat: no-repeat !important;
+        background-image: var(--menuitem-image);
      }

-      /* Contextmenu Checkbox Unset */
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
-        margin-inline: 0 !important;
-      }
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menuitem[type="checkbox"]
-        > .menu-iconic-left
-        > .menu-iconic-icon {
-        margin-inline-end: 0 !important;
-      }
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menuitem[type="checkbox"]:not([checked="true"])
-        > .menu-iconic-left
-        > .menu-iconic-icon {
-        border: none !important;
-        background-color: unset !important;
-      }
-    }
-    /* Padding - Mac */
-    @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
-      :root {
-        --context-menu-background-padding-default: 10px;
-        --context-menu-mac-padding: 21px;
-      }
-
-      /* context menu width */
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-        padding-inline-end: var(--context-menu-background-padding) !important;
-      }
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
-        > .menu-text,
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-        menu:not(.menu-iconic, .in-menulist, [checked="true"])
-        > .menu-text {
-        /* text position */
-        padding-inline-start: var(--context-menu-mac-padding) !important;
-      }
-
-      /* Checkbox menuitem, None iconic menu */
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[checked="true"],
-      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menu:not(.menu-iconic) {
-        padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important;
-      }
-    }
-    /*= Context Menu ===========================================================*/
-    @supports -moz-bool-pref("userChrome.icon.context_menu") {
-      /* Icon lists */
-      /*= downloadsContextMenu =====================================================*/
-      .downloadPauseMenuItem {
-        --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
-      }
-
-      .downloadResumeMenuItem {
-        --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
-      }
-
-      .downloadUnblockMenuItem {
-        --menuitem-image: url("../icons/checkmark-circle.svg");
-      }
-
-      .downloadUseSystemDefaultMenuItem {
-        --menuitem-image: url("chrome://browser/skin/open.svg");
-      }
-
-      .downloadAlwaysUseSystemDefaultMenuItem {
-        /* checkbox */
-        --menuitem-image: url("../icons/folder-globe.svg");
-      }
-
-      .downloadAlwaysOpenSimilarFilesMenuItem {
-        /* checkbox */
-        --menuitem-image: url("../icons/fluid.svg");
-      }
-
-      .downloadShowMenuItem {
-        --menuitem-image: url("chrome://global/skin/icons/folder.svg");
-      }
-      @supports -moz-bool-pref("userChrome.icon.library") {
-        .downloadShowMenuItem {
-          --menuitem-image: url("../icons/folder.svg");
+      /* For native context menus */
+      @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
+        :not(menu, #ContentSelectDropdown)
+          > menupopup
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
        }
      }

-      #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem,
-      #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
-        --menuitem-image: url("../icons/link-square.svg");
+      /* Padding */
+      :root {
+        --uc-menu-background-position: left;
+        --context-menu-background-padding-default: 5px;
+        --context-menu-background-padding: var(--context-menu-background-padding-default);
      }
-      #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem,
-      #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] {
-        --menuitem-image: url("../icons/link.svg");
+      :root:-moz-locale-dir(rtl) {
+        --uc-menu-background-position: right;
      }

-      .downloadDeleteFileMenuItem {
-        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
+        padding-inline-start: var(--context-menu-background-padding) !important;
      }

-      .downloadRemoveFromHistoryMenuItem {
-        --menuitem-image: url("../icons/eraser.svg");
+      /* Padding - Windows */
+      @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
+        :root {
+          --context-menu-background-padding-default: 2px;
+        }
      }
+      @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
+        :root {
+          --context-menu-background-padding-default: 3px;
+        }
+      }
+      @media (-moz-os-version: windows-win7),
+        (-moz-platform: windows-win7),
+        (-moz-os-version: windows-win8),
+        (-moz-platform: windows-win8) {
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          background-position: left var(--context-menu-background-padding) center !important;
+          padding-inline-start: 0 !important;
+        }
+      }
+      @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
+        :root {
+          --context-menu-background-padding: 1em;
+          --context-menu-text-padding: 24px;
+          /* 16px + 8px */
+          --menu-background-padding-default: calc(
+            var(--context-menu-background-padding) + var(--context-menu-text-padding)
+          );
+        }

-      #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"],
-      #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] {
-        --menuitem-image: url("../icons/broom.svg");
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          padding-inline-start: var(--menu-background-padding-default) !important;
+          margin-left: 0 !important;
+        }
      }
+      /* Padding - Linux */
+      @media (-moz-gtk-csd-available) {
+        :root {
+          --context-menu-background-padding-default: 6px;
+        }

-      /*= placeContext =============================================================*/
-      #placesContext_open {
-        --menuitem-image: url("../icons/link-square.svg");
+        /* Contextmenu Checkbox Unset */
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
+          margin-inline: 0 !important;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem[type="checkbox"]
+          > .menu-iconic-left
+          > .menu-iconic-icon {
+          margin-inline-end: 0 !important;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem[type="checkbox"]:not([checked="true"])
+          > .menu-iconic-left
+          > .menu-iconic-icon {
+          border: none !important;
+          background-color: unset !important;
+        }
      }
+      /* Padding - Mac */
+      @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+        :root {
+          --context-menu-background-padding-default: 10px;
+          --context-menu-mac-padding: 21px;
+        }

-      #placesContext_openBookmarkContainer\:tabs,
-      #placesContext_openBookmarkLinks\:tabs {
-        --menuitem-image: url("../icons/movetowindow-16.svg");
-      }
+        /* context menu width */
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+          padding-inline-end: var(--context-menu-background-padding) !important;
+        }
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"])
+          > .menu-text,
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"])
+          > .menu-text {
+          /* text position */
+          padding-inline-start: var(--context-menu-mac-padding) !important;
+        }

-      #placesContext_open\:newtab,
-      #placesContext_openContainer\:tabs,
-      #placesContext_openLinks\:tabs {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        /* Checkbox menuitem, None iconic menu */
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[checked="true"],
+        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menu:not(.menu-iconic) {
+          padding-inline-start: calc(
+            var(--context-menu-background-padding) + var(--context-menu-mac-padding)
+          ) !important;
+        }
      }
+      /*= Context Menu ===========================================================*/
+      @supports -moz-bool-pref("userChrome.icon.context_menu") {
+        /* Icon lists */
+        /*= downloadsContextMenu =====================================================*/
+        .downloadPauseMenuItem {
+          --menuitem-image: url("chrome://global/skin/media/pause-fill.svg");
+        }

-      #placesContext_open\:newcontainertab {
-        --menuitem-image: url("../icons/container-openin-16.svg");
-      }
+        .downloadResumeMenuItem {
+          --menuitem-image: url("chrome://global/skin/media/play-fill.svg");
+        }

-      #placesContext_open\:newwindow {
-        --menuitem-image: url("chrome://browser/skin/window.svg");
-      }
+        .downloadUnblockMenuItem {
+          --menuitem-image: url("../icons/checkmark-circle.svg");
+        }

-      #placesContext_open\:newprivatewindow {
-        --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
-      }
+        .downloadUseSystemDefaultMenuItem {
+          --menuitem-image: url("chrome://browser/skin/open.svg");
+        }

-      #placesContext_show_bookmark\:info,
-      #placesContext_show\:info,
-      #placesContext_show_folder\:info {
-        --menuitem-image: url("chrome://global/skin/icons/edit.svg");
-      }
+        .downloadAlwaysUseSystemDefaultMenuItem {
+          /* checkbox */
+          --menuitem-image: url("../icons/folder-globe.svg");
+        }

-      #placesContext_deleteBookmark,
-      #placesContext_deleteFolder,
-      #placesContext_delete,
-      #placesContext_delete_history {
-        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
-      }
+        .downloadAlwaysOpenSimilarFilesMenuItem {
+          /* checkbox */
+          --menuitem-image: url("../icons/fluid.svg");
+        }

-      #placesContext_deleteHost {
-        --menuitem-image: url("../icons/eye-hide.svg");
-      }
+        .downloadShowMenuItem {
+          --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+        }
+        @supports -moz-bool-pref("userChrome.icon.library") {
+          .downloadShowMenuItem {
+            --menuitem-image: url("../icons/folder.svg");
+          }
+        }

-      #placesContext_sortBy\:name {
-        --menuitem-image: url("../icons/text-sort-ascending.svg");
-      }
+        #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem,
+        #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
+          --menuitem-image: url("../icons/link-square.svg");
+        }
+        #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem,
+        #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] {
+          --menuitem-image: url("../icons/link.svg");
+        }

-      #placesContext_cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
-      }
+        .downloadDeleteFileMenuItem {
+          --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+        }

-      #placesContext_copy {
-        --menuitem-image: url("../icons/edit-copy.svg");
-      }
+        .downloadRemoveFromHistoryMenuItem {
+          --menuitem-image: url("../icons/eraser.svg");
+        }

-      #placesContext_paste_group {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
-      }
+        #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"],
+        #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] {
+          --menuitem-image: url("../icons/broom.svg");
+        }

-      #placesContext_new\:bookmark {
-        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
-      }
+        /*= placeContext =============================================================*/
+        #placesContext_open {
+          --menuitem-image: url("../icons/link-square.svg");
+        }
+
+        #placesContext_openBookmarkContainer\:tabs,
+        #placesContext_openBookmarkLinks\:tabs {
+          --menuitem-image: url("../icons/movetowindow-16.svg");
+        }
+
+        #placesContext_open\:newtab,
+        #placesContext_openContainer\:tabs,
+        #placesContext_openLinks\:tabs {
+          --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        }
+
+        #placesContext_open\:newcontainertab {
+          --menuitem-image: url("../icons/container-openin-16.svg");
+        }
+
+        #placesContext_open\:newwindow {
+          --menuitem-image: url("chrome://browser/skin/window.svg");
+        }
+
+        #placesContext_open\:newprivatewindow {
+          --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
+        }
+
+        #placesContext_show_bookmark\:info,
+        #placesContext_show\:info,
+        #placesContext_show_folder\:info {
+          --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+        }
+
+        #placesContext_deleteBookmark,
+        #placesContext_deleteFolder,
+        #placesContext_delete,
+        #placesContext_delete_history {
+          --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+        }
+
+        #placesContext_deleteHost {
+          --menuitem-image: url("../icons/eye-hide.svg");
+        }
+
+        #placesContext_sortBy\:name {
+          --menuitem-image: url("../icons/text-sort-ascending.svg");
+        }
+
+        #placesContext_cut {
+          --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        }
+
+        #placesContext_copy {
+          --menuitem-image: url("../icons/edit-copy.svg");
+        }
+
+        #placesContext_paste_group {
+          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        }
+
+        #placesContext_new\:bookmark {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }

-      #placesContext_showInFolder,
-      #placesContext_new\:folder {
-        --menuitem-image: url("chrome://global/skin/icons/folder.svg");
-      }
-      @supports -moz-bool-pref("userChrome.icon.library") {
        #placesContext_showInFolder,
        #placesContext_new\:folder {
-          --menuitem-image: url("../icons/folder.svg");
+          --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+        }
+        @supports -moz-bool-pref("userChrome.icon.library") {
+          #placesContext_showInFolder,
+          #placesContext_new\:folder {
+            --menuitem-image: url("../icons/folder.svg");
+          }
+        }
+
+        #placesContext_new\:separator {
+          --menuitem-image: url("../icons/vertical-line.svg");
+        }
+
+        #placesContext_paste {
+          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        }
+
+        #placesContext_createBookmark {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }
+
+        #show-other-bookmarks_PersonalToolbar {
+          /* checkbox */
+          --menuitem-image: url("../icons/star-line-horizontal.svg");
+        }
+
+        #placesContext_showAllBookmarks {
+          --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
+        }
+
+        .openintabs-menuitem {
+          --menuitem-image: url("../icons/movetowindow-16.svg");
        }
      }
+      @supports -moz-bool-pref("userChrome.icon.global_menu") {
+        /*= organizeButtonPopup ======================================================*/
+        #newbookmark {
+          --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+        }

-      #placesContext_new\:separator {
-        --menuitem-image: url("../icons/vertical-line.svg");
-      }
-
-      #placesContext_paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
-      }
-
-      #placesContext_createBookmark {
-        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
-      }
-
-      #show-other-bookmarks_PersonalToolbar {
-        /* checkbox */
-        --menuitem-image: url("../icons/star-line-horizontal.svg");
-      }
-
-      #placesContext_showAllBookmarks {
-        --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
-      }
-
-      .openintabs-menuitem {
-        --menuitem-image: url("../icons/movetowindow-16.svg");
-      }
-    }
-    @supports -moz-bool-pref("userChrome.icon.global_menu") {
-      /*= organizeButtonPopup ======================================================*/
-      #newbookmark {
-        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
-      }
-
-      #newfolder {
-        --menuitem-image: url("chrome://global/skin/icons/folder.svg");
-      }
-      @supports -moz-bool-pref("userChrome.icon.library") {
        #newfolder {
-          --menuitem-image: url("../icons/folder.svg");
+          --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+        }
+        @supports -moz-bool-pref("userChrome.icon.library") {
+          #newfolder {
+            --menuitem-image: url("../icons/folder.svg");
+          }
        }
-      }

-      #newseparator {
-        --menuitem-image: url("../icons/vertical-line.svg");
-      }
+        #newseparator {
+          --menuitem-image: url("../icons/vertical-line.svg");
+        }

-      #orgUndo {
-        --menuitem-image: url("../icons/undo.svg");
-      }
+        #orgUndo {
+          --menuitem-image: url("../icons/undo.svg");
+        }

-      #orgCut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
-      }
+        #orgCut {
+          --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        }

-      #orgCopy {
-        --menuitem-image: url("../icons/edit-copy.svg");
-      }
+        #orgCopy {
+          --menuitem-image: url("../icons/edit-copy.svg");
+        }

-      #orgPaste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
-      }
+        #orgPaste {
+          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        }

-      #orgDelete {
-        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
-      }
+        #orgDelete {
+          --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+        }

-      #orgSelectAll {
-        --menuitem-image: url("../icons/select-all-on.svg");
-      }
+        #orgSelectAll {
+          --menuitem-image: url("../icons/select-all-on.svg");
+        }

-      #orgClose {
-        --menuitem-image: url("chrome://global/skin/icons/close.svg");
-      }
+        #orgClose {
+          --menuitem-image: url("chrome://global/skin/icons/close.svg");
+        }

-      /*= viewMenuPopup ============================================================*/
-      #viewColumns {
-        --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg");
-      }
+        /*= viewMenuPopup ============================================================*/
+        #viewColumns {
+          --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg");
+        }

-      #viewSort {
-        --menuitem-image: url("../icons/text-sort-ascending.svg");
-      }
+        #viewSort {
+          --menuitem-image: url("../icons/text-sort-ascending.svg");
+        }

-      /*= maintenanceButtonPopup ===================================================*/
-      #backupBookmarks {
-        --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
-      }
+        /*= maintenanceButtonPopup ===================================================*/
+        #backupBookmarks {
+          --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+        }

-      #fileImport {
-        --menuitem-image: url("chrome://browser/skin/save.svg");
-      }
+        #fileImport {
+          --menuitem-image: url("chrome://browser/skin/save.svg");
+        }

-      #fileExport {
-        --menuitem-image: url("chrome://browser/skin/open.svg");
-      }
+        #fileExport {
+          --menuitem-image: url("chrome://browser/skin/open.svg");
+        }

-      #browserImport {
-        --menuitem-image: url("chrome://browser/skin/import.svg");
+        #browserImport {
+          --menuitem-image: url("chrome://browser/skin/import.svg");
+        }
      }
    }
  }
--- a/docs/Omni_ja.md
+++ b/docs/Omni_ja.md
@ -15,7 +15,7 @@
 - [UDN: omni.ja (formerly omni.jar)](https://udn.realityripple.com/docs/Mozilla/About_omni.ja_(formerly_omni.jar))
 - [Firefox 4: jar jar jar](https://web.archive.org/web/20161003115800/https://blog.mozilla.org/tglek/2010/09/14/firefox-4-jar-jar-jar/)
 - [Firefox's Optimized Zip Format: Reading Zip Files Really Quickly](https://taras.glek.net/post/optimized-zip-format/)
- [How to Optimize or Deoptimize Firefox OMNI.JA File](https://www.raymond.cc/blog/edit-files-inside-firefox-4-omni-jar-to-auto-save-password/)
+- [How to Optimize or De-optimize Firefox OMNI.JA File](https://www.raymond.cc/blog/edit-files-inside-firefox-4-omni-jar-to-auto-save-password/)

 **Explanation**

--- a/docs/Preference.md
+++ b/docs/Preference.md
@ -73,7 +73,7 @@ See [EBNF(Extended Backus-Naur form)](https://en.wikipedia.org/wiki/Extended_Bac

 ## Default Config
 - [`modules/libpref/init/all.js`](https://github.com/mozilla/gecko-dev/blob/master/modules/libpref/init/all.js): all products
- [`browser/app/profile/firefox.js`](https://github.com/mozilla/gecko-dev/blob/master/browser/app/profile/firefox.js): only firefox deskstop
+- [`browser/app/profile/firefox.js`](https://github.com/mozilla/gecko-dev/blob/master/browser/app/profile/firefox.js): only firefox desktop

 In release builds these are all put into [`omni.ja`](./Omni_ja.md).

--- a/docs/Project_Structure.md
+++ b/docs/Project_Structure.md
@ -27,7 +27,7 @@ root
 |- .github: Issue/PR Template, Github Actions
 |- .prettierignore: Exclude coding style
 |- .prettierrc.json: Coding style
-|- install.ps1: Install script write in powersehll
+|- install.ps1: Install script write in powershell
 |- install.sh: Install script write in bash
 |- package.json: Build setup, package dependency
 |- LEPTON: Meta infos (branch, version)
@ -47,7 +47,7 @@ Icons are mainly [FirefoxUX/photon-icons](https://github.com/FirefoxUX/photon-ic
 or [microsoft/fluentui-system-icons](https://github.com/microsoft/fluentui-system-icons).  
 Although not yet used, [tabler/tabler-icons](https://github.com/tabler/tabler-icons) and [feathericons/feather](https://github.com/feathericons/feather) can also be referred to.

-You can see more in the issue, [Unify icon design langauge #213](https://github.com/black7375/Firefox-UI-Fix/issues/213).
+You can see more in the issue, [Unify icon design language #213](https://github.com/black7375/Firefox-UI-Fix/issues/213).

 ## Install Scripts
 ### Meta Info files
--- a/docs/README.md
+++ b/docs/README.md
@ -1,4 +1,4 @@
-# Develper Documents for Firefox Custom
+# Developer Documents for Firefox Custom

 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 **Table of Contents**
@ -62,7 +62,7 @@ yarn build
 You can check test and css validate:
 ```shell
 ## test - When you make mixin or function
-# __tests__ direcory, You can also find out how to use internal utils.
+# __tests__ directory, You can also find out how to use internal utils.
 yarn test

 ## validate - Will be failed, this project uses non-standard features.
@ -93,7 +93,7 @@ This is a rough guideline. (Not forced)
 ### Basics
 `userChrome.css` file is for browser UI, `userContent.css` file is for web contents.

-Unlike [User config](./Preference.md#user-config), they are located in `<FIREFPX_PROFILE>/chrome/`.
+Unlike [User config](./Preference.md#user-config), they are located in `<FIREFOX_PROFILE>/chrome/`.

 Start Guide:
 - [What is userChrome.css? What can it do?](https://www.userchrome.org/what-is-userchrome-css.html)
--- a/docs/Restrictions.md
+++ b/docs/Restrictions.md
@ -100,7 +100,7 @@ Many implementations using `::before`, `::after`.
 - [Dynamic Tab Separator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3394-L3457)
 - [Static Tab Separator](https://github.com/black7375/Firefox-UI-Fix/blob/0f78a73b856e1335954ecded93d377b85134bd61/userChrome.css#L3387-L3428)
 - [Picture In Picture Indicator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3716-L3753)
- [Contaner Indicator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3754-L3852)
+- [Container Indicator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3754-L3852)

 For icons, [`list-style-image`](https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-image) and [`background-image`](https://developer.mozilla.org/en-US/docs/Web/CSS/background-image) are available.

@ -127,7 +127,7 @@ Firefox actively uses [shadow dom](https://developer.mozilla.org/en-US/docs/Web/

 To modify, it is often a roundabout approach or impossible to inherit.

-Onething bypass method is to declare [`var()`](https://developer.mozilla.org/en-US/docs/Web/CSS/var) to shadow root.
+One bypass method is to declare [`var()`](https://developer.mozilla.org/en-US/docs/Web/CSS/var) to shadow root.
 - [Scrollbutton Padding](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L2906-L2924)
 - [Audio, Video Player UI](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userContent.css#L5-L47)
 - [Video Player Twoline UI](https://github.com/black7375/Firefox-UI-Fix/blob/cbf14cd55a9edada7ab2f5f1b626608fb9fe38a2/src/contents/_video_player.scss#L68-L171): It is pretty difficult when the condition becomes complicated.
@ -139,7 +139,7 @@ Another limitation of shadow dom in user style is that you cannot use shadow dom
 - [Bug 1575507 - Shadow parts should work in user-origin stylesheets.](https://bugzilla.mozilla.org/show_bug.cgi?id=1575507)

 ### XUL
-Sometimes firefox can use [XUL](https://en.wikipedia.org/wiki/XUL) that have been written and binded with C++ for performance like a treeview of bookmarks.  
+Sometimes firefox can use [XUL](https://en.wikipedia.org/wiki/XUL) that have been written and bound with C++ for performance like a treeview of bookmarks.  
 XUL's [box model](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Tutorial/The_Box_Model) and [DOM](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Tutorial/Document_Object_Model) are different from HTML.

 There ar few appropriate documents, so we have to read the source code and work. (Ex. [1](https://github.com/mozilla/gecko-dev/blob/master/layout/style/nsCSSAnonBoxList.h), [2](https://github.com/mozilla/gecko-dev/blob/master/layout/xul/tree/nsITreeView.idl))
@ -151,7 +151,7 @@ Example of legacy documents that will help.
 - [UDN: ::-moz-tree-cell-text](https://udn.realityripple.com/docs/Mozilla/Gecko/Chrome/CSS/::-moz-tree-cell-text)

 Another case.  
-Like [`<toolbar align="end"></toolbar>`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute/align), [`attributes`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute) is set and CSS of same property may not be appplied. (Ex. [`box-align: start`](https://udn.realityripple.com/docs/Web/CSS/box-align))
+Like [`<toolbar align="end"></toolbar>`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute/align), [`attributes`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute) is set and CSS of same property may not be applied. (Ex. [`box-align: start`](https://udn.realityripple.com/docs/Web/CSS/box-align))

 ### Supports
 [`@supports`](https://developer.mozilla.org/en-US/docs/Web/CSS/@supports) change in CSS is not detected in real time. (Caching after checking only once)  
--- a/docs/Rules.md
+++ b/docs/Rules.md
@ -46,7 +46,7 @@ It comes from [#109](https://github.com/black7375/Firefox-UI-Fix/issues/109#issu
 Stable: Only bugfix, Documentation.
 - `master`: Common bugfix, documentation.
 - `photon-style`: Bugfix, documentation specified in `photon-style`.
- `proton-sryle`: Bugfix, documentation specified in `proton-style`.
+- `proton-style`: Bugfix, documentation specified in `proton-style`.

 Development: New Features.
 - `dev`: Common new features.
--- a/icons/bookmark-multiple.svg
+++ b/icons/bookmark-multiple.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M9.037 0c-.599 0-1.13.358-1.351.914l-.395.994a1.457 1.457 0 0 1 1.156.117l.276-.697a.326.326 0 0 1 .314-.213.328.328 0 0 1 .313.213l1.28 3.215.483.352 3.453.222a.328.328 0 0 1 .301.235.325.325 0 0 1-.105.365l-.576.476a1.446 1.446 0 0 1 .441.653 1.446 1.446 0 0 1 .07.373l.776-.645a1.446 1.446 0 0 0 .455-1.568 1.446 1.446 0 0 0-1.29-1l-3.1-.201-1.151-2.89A1.445 1.445 0 0 0 9.037 0zM6.963 2.613c-.599 0-1.13.36-1.352.916L4.463 6.418l-3.102.201a1.447 1.447 0 0 0-1.289 1 1.444 1.444 0 0 0 .453 1.567l2.393 1.986-.768 3.012a1.446 1.446 0 0 0 .555 1.535c.255.186.554.279.854.279a1.455 1.455 0 0 0 .777-.225l2.627-1.662 2.627 1.662a1.444 1.444 0 0 0 1.63-.052 1.446 1.446 0 0 0 .555-1.535l-.767-3.012 2.39-1.986a1.446 1.446 0 0 0 .456-1.569 1.446 1.446 0 0 0-1.29-1l-3.101-.201-1.149-2.889a1.45 1.45 0 0 0-1.351-.916zm0 1.116a.328.328 0 0 1 .314.212L8.56 7.156l.482.352 3.453.222a.328.328 0 0 1 .299.235.325.325 0 0 1-.105.363l-2.665 2.211-.183.566.855 3.356a.328.328 0 0 1-.127.355.326.326 0 0 1-.38.014l-2.926-1.85h-.596L3.74 14.83a.324.324 0 0 1-.38-.014.325.325 0 0 1-.13-.355l.856-3.354-.184-.566-2.664-2.213a.325.325 0 0 1-.105-.363.327.327 0 0 1 .299-.233l3.455-.224.482-.35 1.28-3.217a.326.326 0 0 1 .314-.212z"/>
+</svg>
--- a/icons/edit-paste-go.svg
+++ b/icons/edit-paste-go.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M7.432 0a2.5 2.5 0 0 0-2.38 2H3.999a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h3.9l3.33-3.172H5.437c-1.44-.002-1.766-2.065-.98-3.004A.995.995 0 0 1 4 9V5h5.537c.621-.353 1.442-.377 2.133.26L13 6.527V4a2 2 0 0 0-2-2H9.95a2.5 2.5 0 0 0-2.518-2zm.125 1a1.5 1.5 0 0 1 1.412 1.2 1 1 0 0 0 .98.8H11v1H4V3h1.05a1 1 0 0 0 .98-.8A1.5 1.5 0 0 1 7.556 1zM7.5 2c-.785 0 .5 1.285.5.5a.5.5 0 0 0-.5-.5zm-2 4c-.667 0-.667 1 0 1h3.18a1.488 1.488 0 0 1 0-1H5.5zm0 2c-.667 0-.667 1 0 1h2c.667 0 .667-1 0-1h-2z"/>
+  <path d="m15.798 10.678-4.136-4.137a.69.69 0 0 0-.975.975l2.96 2.96H5.658a.69.69 0 0 0 0 1.379h7.987l-2.96 2.96a.69.69 0 1 0 .976.975l4.136-4.137a.69.69 0 0 0 0-.975z"/>
+</svg>
--- a/icons/edit-paste-search.svg
+++ b/icons/edit-paste-search.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M7.455-.002a2.5 2.5 0 0 0-.266.02A2.5 2.5 0 0 0 5.051 2H4a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h7a2 2 0 0 0 1.844-1.236l-1.623-1.616a5.17 5.17 0 0 1-2.666.752 5.17 5.17 0 0 1-5.17-5.17A5.17 5.17 0 0 1 4 6.31V5h.992a5.17 5.17 0 0 1 1.485-1H4V3h1.05a1 1 0 0 0 .98-.8 1.5 1.5 0 0 1 2.939 0 1 1 0 0 0 .98.8H11v1h-.36A5.17 5.17 0 0 1 13 6.09V4a2 2 0 0 0-2-2H9.95A2.5 2.5 0 0 0 7.454-.002zM7.5 2a.5.5 0 1 0 .5.5.5.5 0 0 0-.5-.5z"/>
+  <path d="m15.68 14.706-3.539-3.538a4.417 4.417 0 1 0-1.037 1.037l3.538 3.539a.734.734 0 0 0 1.038-1.038zm-7.123-3.15a2.935 2.935 0 1 1 2.935-2.935 2.935 2.935 0 0 1-2.935 2.935Z" style="stroke-width:.733799"/>
+</svg>
--- a/icons/filter-dismiss.svg
+++ b/icons/filter-dismiss.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M15.94 6.144a4.537 4.537 0 1 1-9.074 0 4.537 4.537 0 0 1 9.074 0zm-5.895-1.942a.413.413 0 0 0-.584.584l1.359 1.358-1.36 1.358a.413.413 0 0 0 .584.583l1.358-1.358 1.358 1.358a.413.413 0 0 0 .583-.583l-1.358-1.358 1.358-1.358a.413.413 0 0 0-.583-.584l-1.358 1.359zm-2.069 6.067A5.392 5.392 0 0 1 6.884 9.03h-3.73a.619.619 0 0 0 0 1.238zM6.04 6.144c0-.426.05-.84.144-1.238H.68a.619.619 0 0 0 0 1.238zm2.063 7.012a.619.619 0 0 1 0 1.237H5.628a.619.619 0 0 1 0-1.237z"/>
+</svg>
--- a/icons/filter-reload.svg
+++ b/icons/filter-reload.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M10.985 1.627a4.537 4.537 0 0 0-4.12 4.518 4.537 4.537 0 1 0 9.075 0 4.537 4.537 0 0 0-4.955-4.518zm.377 1.76a2.727 2.727 0 0 1 1.84.71l.572-.572a.196.196 0 0 1 .334.14V5.23l-.117.118h-1.567a.196.196 0 0 1-.138-.336l.568-.569a2.24 2.24 0 0 0-1.492-.566 2.258 2.258 0 0 0-2.256 2.256 2.258 2.258 0 0 0 2.256 2.256 2.247 2.247 0 0 0 2.246-2.037.25.25 0 0 1 .268-.221.246.246 0 0 1 .22.267 2.735 2.735 0 0 1-2.734 2.48 2.75 2.75 0 0 1-2.746-2.745 2.75 2.75 0 0 1 2.746-2.746zM.68 4.907a.62.62 0 0 0 0 1.238h5.36c0-.426.05-.84.144-1.239H.68zm2.475 4.122a.62.62 0 0 0 0 1.239l4.82.002a5.392 5.392 0 0 1-1.092-1.24H3.155zm2.472 4.127a.619.619 0 0 0 0 1.237h2.475a.619.619 0 0 0 0-1.237H5.627z"/>
+</svg>
--- a/icons/lock-closed.svg
+++ b/icons/lock-closed.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8 0a3.2 3.2 0 0 1 3.2 3.2v1.6h1.4a1.8 1.8 0 0 1 1.8 1.8v7.6a1.8 1.8 0 0 1-1.8 1.8H3.4a1.8 1.8 0 0 1-1.8-1.8V6.6a1.8 1.8 0 0 1 1.8-1.8h1.4V3.2A3.2 3.2 0 0 1 8 0Zm4.6 6H3.4a.6.6 0 0 0-.6.6v7.6a.6.6 0 0 0 .6.6h9.2a.6.6 0 0 0 .6-.6V6.6a.6.6 0 0 0-.6-.6ZM8 9.2a1.2 1.2 0 1 1 0 2.4 1.2 1.2 0 0 1 0-2.4zm0-8a2 2 0 0 0-2 2v1.6h4V3.2a2 2 0 0 0-2-2Z"/>
+</svg>
--- a/icons/new-tab-multiple.svg
+++ b/icons/new-tab-multiple.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M4.04 4.69a2 2 0 0 0-2 2v4.585h-1c-1.334 0-1.334 1.485 0 1.485h7v-.485a1 1 0 0 1 .872-.99h-5.64V8.838h.01v-1.98a1.11 1.11 0 0 1 1.113-1.114h7.035a1.11 1.11 0 0 1 1.113 1.113v1.418h.496a1 1 0 0 1 1 1V6.69a2 2 0 0 0-2-2h-8zm8.5 4.585c-.25 0-.5.167-.5.5v2.5h-2.5c-.668 0-.668 1 0 1h2.5v2.5c0 .667 1 .667 1 0v-2.5h2.5c.666 0 .666-1 0-1h-2.5v-2.5c0-.333-.25-.5-.5-.5z"/>
+  <path d="M12.5 2.721a3.5 3.5 0 0 1 3.5 3.5v2.5c0 .819-.393 1.545-1 2v-4.5a2.5 2.5 0 0 0-2.5-2.5H3c.456-.606 1.182-1 2-1z"/>
+</svg>
--- a/icons/notebook-subsection.svg
+++ b/icons/notebook-subsection.svg
@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
-  <path d="M12.5 3A3.5 3.5 0 0 1 16 6.5V9c0 .818-.393 1.544-1 2V6.5A2.5 2.5 0 0 0 12.5 4H3c.456-.607 1.182-1 2-1h7.5Z"/>
-  <path d="M15.995 12.432 16 12.5c0 .253-.226.462-.519.495L15.4 13H.6c-.331 0-.6-.224-.6-.5 0-.253.226-.462.519-.495L.6 12H1V7a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v5h1.4c.304 0 .555.188.595.432ZM13 7a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v5h11V7Z"/>
-</svg>
--- a/icons/reload-auto.svg
+++ b/icons/reload-auto.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M8.366 0a.475.475 0 0 0-.474.48v1.967l-.016.105v.09c-3.62.074-6.543 3.04-6.543 6.677a6.689 6.689 0 0 0 6.68 6.68 6.652 6.652 0 0 0 6.652-6.033.599.599 0 0 0-.538-.651.604.604 0 0 0-.65.536 5.466 5.466 0 0 1-5.464 4.955 5.493 5.493 0 0 1-5.487-5.487A5.49 5.49 0 0 1 7.89 3.835v1.762c0 .426.515.64.815.339L11.4 3.242v-.405L8.707.14a.469.469 0 0 0-.34-.14Z"/>
+  <path d="m7.554 11.454-2.29-2.29c-.552-.581.29-1.424.87-.872l1.767 1.766 3.405-3.407a.617.617 0 0 1 .872.872L8.25 11.45z"/>
+</svg>
--- a/icons/shield-task.svg
+++ b/icons/shield-task.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M14.6 2.4c-2.13 0-4.206-.754-6.24-2.28a.6.6 0 0 0-.72 0C5.606 1.646 3.53 2.4 1.4 2.4a.6.6 0 0 0-.6.6v4.2c0 4 2.366 6.94 6.98 8.758a.6.6 0 0 0 .44 0C12.834 14.141 15.2 11.2 15.2 7.2V3a.6.6 0 0 0-.6-.6Zm-2.794 3.442-4.8 4.4a.6.6 0 0 1-.83-.018l-2-2a.6.6 0 1 1 .848-.848L6.618 8.97l4.376-4.012a.6.6 0 0 1 .812.884z"/>
+</svg>
--- a/icons/tab-copy.svg
+++ b/icons/tab-copy.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M3.662 4.678a2 2 0 0 0-2 2v4.601H.998c-1.332.002-1.332 1.527 0 1.527h14c1.335.002 1.335-1.527 0-1.527v.002h-1V6.678a2 2 0 0 0-2-2zm.565 1.066h7.035a1.11 1.11 0 0 1 1.113 1.113v4.424H3.113V6.857a1.11 1.11 0 0 1 1.114-1.113z"/>
+  <path d="M12.5 2.721a3.5 3.5 0 0 1 3.5 3.5v2.5c0 .819-.393 1.545-1 2v-4.5a2.5 2.5 0 0 0-2.5-2.5H3c.456-.606 1.182-1 2-1z"/>
+</svg>
--- a/icons/tab-unload.svg
+++ b/icons/tab-unload.svg
@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M4 3a2 2 0 0 0-2 2v6H1a1 1 0 0 0 0 2h5.707a5.297 5.297 0 0 1-.049-.709 5.297 5.297 0 0 1 5.297-5.299A5.297 5.297 0 0 1 14 7.404V5a2 2 0 0 0-2-2Z"/>
+  <path d="M12.098 8.823c-1.423.007-2.729.726-3.408 1.879V9.497c0-.3-.487-.3-.487 0v2.245c0 .124.109.224.243.224h2.435a.225.225 0 0 0 0-.449H9.344a.413.413 0 0 0 .027-.038c1.137-2.817 5.659-2.062 5.659.94 0 3-4.522 3.756-5.659.939-.235-.544-1.121-.239-.912.314 1.104 2.711 5.056 3.162 6.843.781 1.786-2.381-.064-5.633-3.204-5.63Z"/>
+</svg>
--- a/install.ps1
+++ b/install.ps1
@ -31,7 +31,7 @@ Shows this help message

 .PARAMETER WhatIf
 Runs the installer without actioning any file copies/moves
-Equivelant to a dry-run
+Equivalent to a dry-run

 .EXAMPLE
 PS> .\Install.ps1 -u -f C:\Users\someone\ff-profiles
--- a/install.sh
+++ b/install.sh
@ -185,8 +185,8 @@ write_file() {
 get_ini_section() {
  local filePath="$1"

-  local ouput=$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g")
-  echo "${ouput}"
+  local output=$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g")
+  echo "${output}"
 }
 get_ini_value() {
  local filePath="$1"
--- a/src/autohide/_infobar.scss
+++ b/src/autohide/_infobar.scss
@ -1,6 +1,6 @@
 #tab-notification-deck:not([customizing]) > .notificationbox-stack {
  $infobarFixedHeight: 13px + ((1px + 5px) * 2); // button height + (button border + [button.small-button padding]) * 2
-  // fiexedHeight + (button margin * 2) + messagebar margin
+  // fixedHeight + (button margin * 2) + messagebar margin
  --infobar-height: calc(#{ $infobarFixedHeight } + (var(--infobar-button-vertical-margin, 4px) * 2) + var(--infobar-message-vertical-margin, 8px));
 }
 #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message {
--- a/src/autohide/sidebar/_overlap.scss
+++ b/src/autohide/sidebar/_overlap.scss
@ -1,3 +1,4 @@
+#sidebar-header,
 #sidebar {
  min-width: var(--uc-sidebar-width) !important;
  max-width: var(--uc-sidebar-width) !important;
@ -5,9 +6,12 @@
  will-change: min-width, max-width;
 }

-#sidebar-box:is(:hover, :focus-within) > #sidebar {
-  min-width: var(--uc-sidebar-activate-width) !important;
-  max-width: var(--uc-sidebar-activate-width) !important;
+#sidebar-box:is(:hover, :focus-within) > {
+  #sidebar-header,
+  #sidebar {
+    min-width: var(--uc-sidebar-activate-width) !important;
+    max-width: var(--uc-sidebar-activate-width) !important;
+  }
 }

 :root[inFullscreen="true"] #sidebar-box {
@ -29,12 +33,16 @@
 }

@include Animate {
+  #sidebar-header,
  #sidebar {
    transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
  }

-  #sidebar-box:is(:hover, :focus-within) > #sidebar {
-    transition-delay: 0ms !important;
+  #sidebar-box:is(:hover, :focus-within) > {
+    #sidebar-header,
+    #sidebar {
+      transition-delay: 0ms !important;
+    }
  }

  :root[inFullscreen="true"] #sidebar-box {
--- a/src/compatibility/_os.scss
+++ b/src/compatibility/_os.scss
@ -191,12 +191,18 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5);
        /* -moz-default-appearance: -moz-window-titlebar */
        appearance: none !important;
      }
+      @include OS($win7, $win8) {
+        &[sizemode="maximized"] #titlebar {
+          // Only win7, win8 #480
+          padding-top: 8px; // Don't use margin-top for reserved fullscreen animation
+        }
+      }
    }
    @include Option("userChrome.compatibility.os.windows_maximized") {
      &[sizemode="maximized"] #titlebar {
        appearance: none !important;

-        // Prevent sideeffect #370
+        // Prevent side effect #370
        padding-top: 8px; // Don't use margin-top for reserved fullscreen animation
      }
    }
--- a/src/compatibility/_theme.scss
+++ b/src/compatibility/_theme.scss
@ -48,7 +48,7 @@ menu {
 /*= Remove Tab Border ========================================================*/
@mixin _theme_removeTabBorder($options...) {
  %noneBorder {
-    /* Nigtly 96:  1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */
+    /* Nightly 96:  1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */
    border: unset !important;
  }
  @each $prefix, $postfix in $options {
--- a/src/contents/dark_mode/_addons_org.scss
+++ b/src/contents/dark_mode/_addons_org.scss
@ -486,7 +486,7 @@
      background: var(--in-content-border-color) !important;
    }

-    /* Othres */
+    /* Others */
    #promos .view-button a,
    #upload-file-finish.button,
    #upload-file-widget .button.prominent,
--- a/src/contents/proton_contents/_proton_commons.scss
+++ b/src/contents/proton_contents/_proton_commons.scss
@ -191,13 +191,13 @@
  richlistbox:focus-visible {
    border-color: transparent !important;
    outline: 2px solid var(--in-content-focus-outline-color) !important;
-    outline-offset: -1px !important; /* Prevents antialising around the corners */
+    outline-offset: -1px !important; /* Prevents antialiasing around the corners */
  }
  input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid,
  textarea:-moz-ui-invalid {
    border-color: transparent !important;
    outline: 2px solid var(--in-content-border-invalid) !important;
-    outline-offset: -1px !important; /* Prevents antialising around the corners */
+    outline-offset: -1px !important; /* Prevents antialiasing around the corners */
  }
  input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled,
  textarea:disabled,
--- a/src/decoration/_animate.scss
+++ b/src/decoration/_animate.scss
@ -144,7 +144,7 @@ xul|search-textbox.tabsFilter,
  from {
    margin-top: 0;
  }
-  /* Dont' use `to`: Depending on density */
+  /* Don't use `to`: Depending on density */
 }

 /*- Expand - Synced Tabs ---------------------------------------------------*/
--- a/src/fullscreen/_overlap.scss
+++ b/src/fullscreen/_overlap.scss
@ -8,7 +8,7 @@
 }

@include OS($linux) {
-  /* Fix transparent backgorund */
+  /* Fix transparent background */
  :root[tabsintitlebar][sizemode="fullscreen"] #TabsToolbar:not(:-moz-lwtheme) {
    appearance: auto !important;
  }
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@ -230,6 +230,9 @@ menu.share-tab-url-item {
 #sync-reauthitem {
 }

+#menu_openFirefoxView {
+  --menuitem-image: url("chrome://branding/content/icon32.png");
+}
 #webDeveloperMenu, /* Legacy */
 #browserToolsMenu {
  --menuitem-image: url("../icons/developer.svg");
--- a/src/icons/_index.scss
+++ b/src/icons/_index.scss
@ -25,9 +25,15 @@
  }
 }

-/** Libray Menu ***************************************************************/
+/** Library Menu **************************************************************/
@include Option("userChrome.icon.library") {
  @include Option("userChrome.icon.menu") {
    @import "library";
  }
 }
+
+/** Waterfox ******************************************************************/
+@import "waterfox";
+
+/** Tor Browser ***************************************************************/
+@import "tor_browser";
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@ -42,14 +42,14 @@
  }
 }
@include Option("userChrome.icon.panel_sparse") {
-  #appMenu-new-tab-button2,           /* Seperate */
-  #appMenu-passwords-button,          /* Seperate */
+  #appMenu-new-tab-button2,           /* Separate */
+  #appMenu-passwords-button,          /* Separate */
  #appMenu-extensions-themes-button,
-  #appMenu-save-file-button2,         /* Seperate */
+  #appMenu-save-file-button2,         /* Separate */
  #appMenu-find-button2,
-  #appMenu-more-button2,              /* Seperate */
+  #appMenu-more-button2,              /* Separate */
  #appMenu-help-button2,
-  #appMenu-quit-button2               /* Seperate */ {
+  #appMenu-quit-button2               /* Separate */ {
    padding-top: var(--arrowpanel-menuitemblank-padding-block) !important;
    padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important;
  }
--- a/src/icons/context_menu/_content_area.scss
+++ b/src/icons/context_menu/_content_area.scss
@ -261,3 +261,43 @@
    --menuitem-image: url("chrome://browser/skin/bookmark.svg");
  }
 }
+
+/*= Tab Mix Plus =============================================================*/
+#tm-autoreload_menu {
+  --menuitem-image: url("../icons/reload-auto.svg");
+}
+
+#tm-linkWithhistory {
+}
+#tm-openAllLinks {
+  --menuitem-image: url("../icons/new-tab-multiple.svg");
+}
+#tm-openinverselink {
+}
+#context-openlinkinusercontext-menu {
+}
+
+#tm-content-closetab {
+}
+#tm-duplicateTabContext {
+}
+#tm-duplicateinWinContext {
+}
+#tm-detachTabContext {
+}
+#tm-mergeWindows {
+}
+#tm-content-freezeTab {
+}
+#tm-content-protectTab {
+}
+#tm-content-lockTab {
+}
+#tm-tabsList {
+}
+
+#tm-content-undoCloseTab {
+  --menuitem-image: url("../icons/undo.svg");
+}
+#tm-content-undoCloseList {
+}
--- a/src/icons/context_menu/_others.scss
+++ b/src/icons/context_menu/_others.scss
@ -138,6 +138,9 @@
  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
 }
 #paste-and-go {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/edit-paste-go.svg");
+  }
 }
 #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_delete"] {
  --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@ -147,7 +150,7 @@
 }

 /*= textbox-contextmenu ======================================================*/
-/* Browser's Searchbar, Libray's Searchbar, Page Info */
+/* Browser's Searchbar, Library's Searchbar, Page Info */
 .textbox-contextmenu > menuitem[data-l10n-id="text-action-undo"] {
  --menuitem-image: url("../icons/undo.svg");
 }
@ -175,6 +178,9 @@

 /* Only searchbar */
 menuitem.searchbar-paste-and-search {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/edit-paste-search.svg");
+  }
 }
 menuitem.searchbar-clear-history {
  --menuitem-image: url("chrome://browser/skin/forget.svg");
--- a/src/icons/context_menu/_tab_toolbar.scss
+++ b/src/icons/context_menu/_tab_toolbar.scss
@ -55,9 +55,10 @@
 #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
 #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
 #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
-  --menuitem-image: url("../icons/notebook-subsection.svg");
+  --menuitem-image: url("../icons/tab-copy.svg");
 }
 #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
+  --menuitem-image: url("../icons/tab-unload.svg");
 }

 #context_bookmarkTab,
@ -119,10 +120,13 @@
 #sidebartabs_asamuzak_jp-menuitem-_closeTab {
  --menuitem-image: url("chrome://global/skin/icons/close.svg");
 }
+#context_closeTabOptions,
+#treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs,
 #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs,
 #sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs {
-}
-#context_closeTabOptions {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/filter-dismiss.svg");
+  }
 }
 #context_undoCloseTab,
 #treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab,
@ -215,3 +219,53 @@ menuitem.viewCustomizeToolbar {
 #toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] {
  --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
 }
+
+/*= Tab Mix Plus =============================================================*/
+#context_openANewTab.tabmix-newtab-menu-icon {
+  list-style-image: var(--menuitem-image) !important;
+}
+#tm-duplicateinWin {
+}
+#tm-mergeWindowsTab {
+}
+#tm-renameTab {
+}
+#tm-copyTabUrl {
+  --menuitem-image: url("../icons/link.svg");
+}
+
+#tm-autoreloadTab_menu {
+}
+#context_reloadTabOptions {
+  --menuitem-image: url("../icons/reload.svg");
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/filter-reload.svg");
+  }
+  + #context_reloadTab {
+    @include NotOption("userChrome.icon.menu.full") {
+      --menuitem-image: url("../icons/blank.svg");
+    }
+  }
+}
+
+#tm-undoCloseList {
+}
+
+#tm-docShell {
+}
+#tm-freezeTab {
+}
+#tm-protectTab {
+  --menuitem-image: url("../icons/shield-task.svg");
+}
+#tm-lockTab {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/lock-closed.svg");
+  }
+}
+
+#context_bookmarkAllTabs {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/bookmark-multiple.svg");
+  }
+}
--- a/src/icons/layout/_bookmark_menu.scss
+++ b/src/icons/layout/_bookmark_menu.scss
@ -1,5 +1,5 @@
 /*= Bookmark Menu - Layout ===================================================*/
-/* #goPopup(Legacy of historyMenuPoup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu
+/* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu
   * #BMB_bookmarksPopup: looks like arrow panel
   */

--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@ -41,6 +41,10 @@ $_layoutCommonMenus: (
@include _layoutInitIconMenus {
  @include _layout_icon_menus;
 }
+#tabContextMenu > .tabmix-newtab-menu-icon {
+  -moz-context-properties: fill, fill-opacity !important;
+  fill: currentColor !important;
+}

 /* For native context menus */
 #{$_nestedPopupIconMenus} {
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@ -1,6 +1,6 @@
 //-- Variables -----------------------------------------------------------------
 // Items
-// .menu-iconic, .menuitem-iconic: Alreay exist, not target.
+// .menu-iconic, .menuitem-iconic: Already exist, not target.
 // .in-menulist: Not a range because it is a select menu of web content.
 // [checked="true"]: There should be a check mark instead of an icon.
 $_iconNoneCommon: ".in-menulist, [checked=\"true\"]";
--- a/src/leptonChrome.scss
+++ b/src/leptonChrome.scss
@ -13,7 +13,7 @@
@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
@namespace html "http://www.w3.org/1999/xhtml";

-/** Default Thme - Contrast ***************************************************/
+/** Default Theme - Contrast **************************************************/
@include Option("userChrome.theme.built_in_contrast") {
  @import "theme/built_in";
 }
@ -36,7 +36,7 @@
 /** Tab Bar UI ****************************************************************/
@import "tabbar/index";

-/** Tab UI ****************************************************************/
+/** Tab UI ********************************************************************/
@import "tab/index";

 /** Url View UI ***************************************************************/
@ -61,13 +61,6 @@
@import "hidden/index";

 /** Icons *********************************************************************/
-@import "icons/index";
-
-/** Waterfox ******************************************************************/
-@import "icons/waterfox";
-@include Option("userChrome.theme.fully_color") {
-  @import "theme/waterfox";
+@include NotOption("userChrome.icon.disabled") {
+  @import "icons/index";
 }
-
-/** Tor Browser ***************************************************************/
-@import "icons/tor_browser";
--- a/src/leptonContent.scss
+++ b/src/leptonContent.scss
@ -40,8 +40,10 @@
 }

 /** Menu - Icons Layout *******************************************************/
-@include Option("userChrome.icon.menu") {
-  @import "contents/context_menu";
+@include NotOption("userChrome.icon.disabled") {
+  @include Option("userChrome.icon.menu") {
+    @import "contents/context_menu";
+  }
 }

 /** Download Panel ************************************************************/
--- a/src/library/_folder_icons.scss
+++ b/src/library/_folder_icons.scss
@ -3,7 +3,7 @@
 :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]),
 /* in Sidebar, Library, Add/Edit Bookmark dialog */
 /* https://github.com/rillian/firefox/blob/1f88437d263f56bdede4f20f69ba9c7b62f57001/layout/style/nsCSSAnonBoxList.h#L85-L98 */
-/* Need to overide!!, can not use :not() */
+/* Need to override!!, can not use :not() */
 :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, container),
 #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]),
 #editBMPanel_folderMenuList .folder-icon:not([id]),
@ -69,7 +69,7 @@
  list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
 }

-/* Boomark */
+/* Bookmark */
 :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
  list-style-image: url("chrome://browser/skin/bookmark.svg") !important;
 }
@ -111,7 +111,7 @@
  list-style-image: url("../icons/tag-open.svg") !important;
 }

-/* Boomark */
+/* Bookmark */
 :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) {
  list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important;
 }
--- a/src/library/_proton_contents.scss
+++ b/src/library/_proton_contents.scss
@ -1,7 +1,7 @@
 $iconSelector: "> .menu-iconic-left > .menu-iconic-icon";
 $checkedIconSelector: "> .menu-iconic-left[checked=\"true\"] > .menu-iconic-icon";

-/*- Radio Button ---------------------------------------------------------*/
+/*- Radio Button -------------------------------------------------------------*/
 menuitem[type="radio"] {
  @include Proton.RadioGlobal;

@ -41,7 +41,7 @@ menuitem[type="checkbox"][disabled="true"] {
  @include Proton.DisabledMenuItem;
 }

-/*- Check Box ------------------------------------------------------------*/
+/*- Check Box ----------------------------------------------------------------*/
 /* From checkbox.css */
 menuitem[type="checkbox"] {
  @include Proton.CheckboxGlobal(true);
@ -99,7 +99,7 @@ menuitem[type="checkbox"] {
  }
 }

-/*- Menu Separtor --------------------------------------------------------*/
+/*- Menu Separator -----------------------------------------------------------*/
 menuseparator {
  appearance: none !important;
  min-width: 2px;
--- a/src/padding/_tabbar_height.scss
+++ b/src/padding/_tabbar_height.scss
@ -43,18 +43,31 @@
    }
  }
 }
+
+:root {
+  /* Works with TabMixPlus */
+  --tab-min-height_mlt: calc(var(--tab-min-height) + 2 * (var(--tab-block-margin, var(--proton-tab-block-margin, 0px)))) !important;
+}
+#TabsToolbar[multibar] .tabbrowser-tab {
+  height: unset !important; /* Original: var(--tab-min-height_mlt) */
+}
+
@include Option("userChrome.tab.connect_to_window") {
+  :root {
+    --tab-min-height_mlt: calc(var(--tab-min-height) + var(--tab-block-margin, var(--proton-tab-block-margin, 0px))) !important;
+  }
+
  #TabsToolbar {
    --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 18px) / 2) !important; /* Prevent overflow pinned tab bottom margin */
  }

-  :root:not([uidensity="compact"]) #tabbrowser-arrowscrollbox,
-  #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"],
-  #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-stack,
-  #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content {
+  :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox,
+  #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"],
+  #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-stack,
+  #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content {
    max-height: var(--tab-min-height) !important; /* Force apply height */
  }
-  :root[uidensity="compact"] #tabbrowser-arrowscrollbox {
+  :root[uidensity="compact"] #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox {
    height: var(--tab-min-height) !important;
  }
 }
--- a/src/padding/_tabbar_width.scss
+++ b/src/padding/_tabbar_width.scss
@ -95,7 +95,7 @@
      padding-inline: 1px !important;
    }
  }
-  .tabbrowser-tab:not([last-visible-tab]) {
+  #TabsToolbar:not([multibar]) .tabbrowser-tab:not([last-visible-tab]) {
    margin-inline-end: -1px !important;
  }
 }
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@ -12,7 +12,7 @@
  }
 }
@include Option("userChrome.rounding.square_tab", "userChrome.round.square_button") {
-  /* Fix Tab bar button radious */
+  /* Fix Tab bar button radius */
  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon,
  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text,
  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack,
--- a/src/sidebar/_overlap.scss
+++ b/src/sidebar/_overlap.scss
@ -46,8 +46,17 @@
    overflow: hidden;
  }

+  #sidebar-header {
+    font-size: unset !important;
+
+    > #sidebar-switcher-target {
+      font-size: 1.333em;
+    }
+  }
+
  @include NotOption("userChrome.autohide.sidebar") {
    #sidebar-box,
+    #sidebar-header,
    #sidebar {
      min-width: var(--uc-sidebar-activate-width) !important;
      max-width: var(--uc-sidebar-activate-width) !important;
@ -58,7 +67,7 @@
      will-change: padding-inline;

      &:not([hidden="true"]) {
-        padding-inline-start: var(--uc-sidebar-activate-width);
+        padding-inline-start: var(--uc-sidebar-activate-width) !important;
      }

      @include Animate {
--- a/src/tab/_connect_to_window.scss
+++ b/src/tab/_connect_to_window.scss
@ -16,7 +16,7 @@
 #tabbrowser-tabs {
  z-index: 1 !important;
 }
-#TabsToolbar {
+#TabsToolbar:not([multibar]) {
  overflow: hidden;   /* Prevent toolbar area over */
 }

--- a/src/tab/_unselected_tab.scss
+++ b/src/tab/_unselected_tab.scss
@ -1,5 +1,8 @@
 /*= Unselected Tab - Dynamic Separator =======================================*/
-@include Option("userChrome.tab.dynamic_separtor") {
+@include Option(
+  "userChrome.tab.dynamic_separator",
+  "userChrome.tab.dynamic_separtor"
+) {
  @import "unselected_tab/dynamic_separator";
 }

--- a/src/tab/newtab_button/_looks_like_tab.scss
+++ b/src/tab/newtab_button/_looks_like_tab.scss
@ -1,11 +1,11 @@
 #tabs-newtab-button {
  /* Original:
    margin: 0 0 var(--tabs-navbar-shadow-size) !important
-    => Can't ovrride style. Therefore, we should approach it by bypass.
+    => Can't override style. Therefore, we should approach it by bypass.
    */
  --tabs-navbar-shadow-size: -1px; /* Original: 1px */
  --tabs-navbar-original-shadow-size: 1px;
-  --tab-corner-rounding: 4px; /* Hardcorded */
+  --tab-corner-rounding: 4px; /* Hardcoded */

  /* Size */
  -moz-box-align: stretch !important;
@ -39,7 +39,7 @@
        in srgb,
        $accentTextColor 10%,
        transparent
-      ) !important; /* Hardcorded for compatibility */
+      ) !important; /* Hardcoded for compatibility */
    }
    :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active,
    :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover:active {
@ -47,7 +47,7 @@
        in srgb,
        $accentTextColor 15%,
        transparent
-      ) !important; /* Hardcorded for compatibility */
+      ) !important; /* Hardcoded for compatibility */
    }
  }
 }
--- a/src/tab/newtab_button/_smaller_button.scss
+++ b/src/tab/newtab_button/_smaller_button.scss
@ -1,7 +1,9 @@
 #tabs-newtab-button > .toolbarbutton-icon {
+  // Not like tab, as button
+  --tab-border-radius: var(--toolbarbutton-border-radius);
  margin-left: 1px;

-  /* Origianl: calc((var(--tab-min-height) - 16px) / 2) = 10px */
+  /* Original: calc((var(--tab-min-height) - 16px) / 2) = 10px */
  --toolbarbutton-inner-padding: 6px;
 }
 :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon {
--- a/src/tab/selected_tab/_bottom_rounded_corner.scss
+++ b/src/tab/selected_tab/_bottom_rounded_corner.scss
@ -58,7 +58,7 @@ tab[visuallyselected] > stack::after {
  /* Fill color for GTK */
  :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::before,
  :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::after {
-    /* As GTK Toolbar's background-color + backround-image
+    /* As GTK Toolbar's background-color + background-image
       * --toolbar-non-lwt-bgcolor: -moz-dialog;
       * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
       */
--- a/src/tab/selected_tab/_box_shadow.scss
+++ b/src/tab/selected_tab/_box_shadow.scss
@ -3,7 +3,7 @@
  .tabbrowser-tab[visuallyselected="true"]:not(:focus)
  > .tab-stack
  > .tab-background:-moz-lwtheme {
-  /* Origina: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9))
+  /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9))
       Bright: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */
  box-shadow: 0 0 1px var(--toolbar-color) !important;
 }
--- a/src/tab/selected_tab/_photon_like_contextline.scss
+++ b/src/tab/selected_tab/_photon_like_contextline.scss
@ -37,7 +37,7 @@
  background-color: rgba(255, 255, 255, 0.2) !important;
 }

-/* Prevent identitiy color flashing */
+/* Prevent identity color flashing */
 .tabbrowser-tab[usercontextid] .tab-context-line {
  --identity-icon-color: none;
 }
--- a/src/tab/unselected_tab/_dynamic_separator.scss
+++ b/src/tab/unselected_tab/_dynamic_separator.scss
@ -35,8 +35,12 @@
  }
 }

+#tabbrowser-arrowscrollbox-periphery {
+  position: relative;
+}
+
@include Option("userChrome.tab.newtab_button_like_tab") {
-  #tabbrowser-arrowscrollbox {
+  #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox {
    position: absolute;
  }

--- a/src/tabbar/_on_bottom.scss
+++ b/src/tabbar/_on_bottom.scss
@ -36,7 +36,7 @@ See the above repository for updates as well as full license text. */
  }
 }

-/*= Tabbar - Hidden at singgle tab ===========================================*/
+/*= Tabbar - Hidden at single tab ===========================================*/
@include Option("userChrome.tabbar.on_bottom.hidden_single_tab") {
  #tabbrowser-tabs .tabbrowser-tab:only-of-type {
    display: none !important;
--- a/src/theme/_index.scss
+++ b/src/theme/_index.scss
@ -17,6 +17,7 @@
 }
@include Option("userChrome.theme.fully_color") {
  @import "fully_color";
+  @import "waterfox";
 }

 /*= Fully Dark Mode ==========================================================*/
--- a/src/theme/_proton_color.scss
+++ b/src/theme/_proton_color.scss
@ -25,7 +25,7 @@
  --in-content-link-color-hover: var(--blue-70);
  --in-content-link-color-active: var(--blue-80);
  --in-content-link-color-visited: var(--blue-60);
-  /* button background states are also used for checkboxes and radiobuttons */
+  /* button background states are also used for checkboxes and radio buttons */
  --in-content-button-text-color: var(--in-content-text-color);
  --in-content-button-text-color-hover: var(--in-content-text-color);
  --in-content-button-background: rgba(207, 207, 216, 0.33);
--- a/src/theme/proton_chrome/_cert.scss
+++ b/src/theme/proton_chrome/_cert.scss
@ -7,7 +7,7 @@
  }
 }

-/*= Cert Exeption Dialog =====================================================*/
+/*= Cert Exception Dialog ====================================================*/
@-moz-document url("chrome://pippki/content/exceptionDialog.xhtml")
 {
  #locationTextBox {
@ -25,12 +25,12 @@
    &:focus {
      border-color: transparent !important;
      outline: 2px solid var(--in-content-focus-outline-color) !important;
-      outline-offset: -1px !important; /* Prevents antialising around the corners */
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
    }
    &:-moz-ui-invalid {
      border-color: transparent !important;
      outline: 2px solid var(--in-content-border-invalid) !important;
-      outline-offset: -1px !important; /* Prevents antialising around the corners */
+      outline-offset: -1px !important; /* Prevents antialiasing around the corners */
    }
    &:disabled {
      opacity: 0.4 !important;
@ -44,7 +44,7 @@
      background-image: url("chrome://global/skin/icons/warning.svg") !important;
      background-size: 48px !important;
      background-repeat: no-repeat !important;
-  
+
      -moz-context-properties: fill !important;
      fill: currentColor !important;
    }
--- a/src/theme/system_default_theme/_mac.scss
+++ b/src/theme/system_default_theme/_mac.scss
@ -59,12 +59,12 @@
    --toolbar-bgcolor: var(--mac-selected-bgcolor) !important;
    --toolbar-non-lwt-bgcolor: var(--mac-selected-bgcolor) !important;

-    /* Field Backround Color */
+    /* Field Background Color */
    --input-bgcolor: var(--mac-field-bgcolor) !important;
    --toolbar-field-background-color: var(--mac-field-bgcolor) !important;
    --tab-icon-overlay-stroke: var(--mac-field-bgcolor) !important;

-    /* Panel Backround Color */
+    /* Panel Background Color */
    --arrowpanel-background: var(--mac-panel-bgcolor) !important;

    /* Hover Background Color  */
@ -108,7 +108,7 @@
      --autocomplete-popup-separator-color: var(--mac-bgcolor) !important;
     */

-    /* Accent Color Forground */
+    /* Accent Color Foreground */
    --button-primary-color: var(--mac-primary-button-color) !important;
    --checkbox-checked-color: var(--mac-primary-button-color) !important;

--- a/src/theme/system_default_theme/_win10.scss
+++ b/src/theme/system_default_theme/_win10.scss
@ -12,17 +12,17 @@
    --win-field-bgcolor: #ffffff;
    --win-component-bgcolor: #f2f2f2;
    --win-border-color: #8a8a8a;
-    --win-tab-seperator-color: #a3a3a3;
+    --win-tab-separator-color: #a3a3a3;
    --win-sidebar-bgcolor: #e6e6e6;
    --win-sidebar-hover-bgcolor: #cfcfcf;
    --win-sidebar-button-hover-bgcolor: #b8b8b8;
    --win-sidebar-button-hover-active-bgcolor: #a3a3a3;
    --win-button-border: #747474;
-    --win-shorcut-text-color: #757575;
+    --win-shortcut-text-color: #757575;
    --win-error-color: #b31616;
    --win-red-border-color: #ff4343;
    @include AccentColor {
-      --win-accent-forground-color: #{$accentTextColor};
+      --win-accent-foreground-color: #{$accentTextColor};
      --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, #{$accentColor});
      --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, #{$accentColor});
      --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, #{$accentColor});
@ -42,13 +42,13 @@
      --win-field-bgcolor: #373737;
      --win-component-bgcolor: #171717;
      --win-border-color: #5b5b5b;
-      --win-tab-seperator-color: #555555;
+      --win-tab-separator-color: #555555;
      --win-sidebar-bgcolor: #1f1f1f;
      --win-sidebar-hover-bgcolor: #353535;
      --win-sidebar-button-hover-bgcolor: #353535;
      --win-sidebar-button-hover-active-bgcolor: #4c4c4c;
      --win-button-border: #8f8f8f;
-      --win-shorcut-text-color: #adadad;
+      --win-shortcut-text-color: #adadad;
      --win-error-color: #ffb900;
      --win-red-border-color: #ff4343;
      @include AccentColor {
@ -85,8 +85,8 @@
    --download-progress-paused-color: var(--win-disabled-color) !important;

    /* Text Shortcut Color */
-    --panel-shortcut-color: var(--win-shorcut-text-color) !important;
-    --panel-description-color: var(--win-shorcut-text-color) !important;
+    --panel-shortcut-color: var(--win-shortcut-text-color) !important;
+    --panel-description-color: var(--win-shortcut-text-color) !important;

    /* Title Background */
    --lwt-accent-color: var(--win-bgcolor) !important;
@ -103,10 +103,10 @@
    /* Border Color */
    // --menu-border-color: var(--win-border-color) !important;

-    /* Seperator */
-    --toolbarseparator-color: var(--win-tab-seperator-color) !important;
+    /* Separator */
+    --toolbarseparator-color: var(--win-tab-separator-color) !important;

-    /* Field Backround Color */
+    /* Field Background Color */
    --input-bgcolor: var(--win-field-bgcolor) !important;
    --toolbar-field-background-color: var(--win-field-bgcolor) !important;
    --toolbar-field-focus-background-color: var(--win-field-bgcolor) !important;
@ -145,9 +145,9 @@
    --input-border-color: var(--win-button-border) !important;
    --autocomplete-popup-separator-color: var(--win-button-border) !important;

-    /* Accent Forground Color */
-    --button-primary-color: var(--win-accent-forground-color) !important;
-    --checkbox-checked-color: var(--win-accent-forground-color) !important;
+    /* Accent Foreground Color */
+    --button-primary-color: var(--win-accent-foreground-color) !important;
+    --checkbox-checked-color: var(--win-accent-foreground-color) !important;

    /* Accent Color */
    --button-primary-bgcolor: var(--win-accent-color) !important;
--- a/src/utils/_each.scss
+++ b/src/utils/_each.scss
@ -3,13 +3,13 @@
@use "list" as list-utils;

 $_defaultOption: (
-  "seperator": ", ",
+  "separator": ", ",
  "quoted": false
 );

@mixin AtEach($name, $list, $prefix: null, $option: $_defaultOption) {
  $option: map.merge($_defaultOption, $option);
-  $seperator: map.get($option, "seperator");
+  $separator: map.get($option, "separator");
  $quoted: map.get($option, "quoted");
  $quoted: if($quoted, "\"", null);

@ -21,7 +21,7 @@ $_defaultOption: (
      @if $listL > 1 {
        @for $i from 2 through ($listL) {
          $nextBlock: list.nth($list, $i);
-          $nextBlock: "#{$seperator}#{$prefix}(#{$quoted}#{$nextBlock}#{$quoted})";
+          $nextBlock: "#{$separator}#{$prefix}(#{$quoted}#{$nextBlock}#{$quoted})";
          $blocks: "#{$blocks}#{$nextBlock}";
        }
      }
--- a/src/utils/_option.scss
+++ b/src/utils/_option.scss
@ -1,13 +1,13 @@
@use "each";

@mixin Option($optionNames...) {
-  @include each.AtEach("supports", $optionNames, "-moz-bool-pref", ("seperator": " or ", "quoted": true)) {
+  @include each.AtEach("supports", $optionNames, "-moz-bool-pref", ("separator": " or ", "quoted": true)) {
    @content;
  }
 }

@mixin NotOption($optionNames...) {
-  @include each.AtEach("supports", $optionNames, "not -moz-bool-pref", ("seperator": " or ", "quoted": true)) {
+  @include each.AtEach("supports", $optionNames, "not -moz-bool-pref", ("separator": " or ", "quoted": true)) {
    @content;
  }
 }
--- a/user.js
+++ b/user.js
@ -39,7 +39,7 @@ user_pref("userChrome.tab.color_like_toolbar",         true); // Original, Photo
 user_pref("userChrome.tab.lepton_like_padding",       false); // Original
 user_pref("userChrome.tab.photon_like_padding",        true); // Photon

-user_pref("userChrome.tab.dynamic_separtor",          false); // Original, Proton
+user_pref("userChrome.tab.dynamic_separator",         false); // Original, Proton
 user_pref("userChrome.tab.static_separator",           true); // Photon
 user_pref("userChrome.tab.static_separator.selected_accent", false); // Just option

@ -64,7 +64,7 @@ user_pref("userChrome.rounding.square_tab",            true);
 // user_pref("userChrome.compatibility.covered_header_image", true);
 // user_pref("userChrome.compatibility.panel_cutoff",         true);
 // user_pref("userChrome.compatibility.navbar_top_border",    true);
-// user_pref("userChrome.compatibility.dynamic_separator",    true); // Need dynamic_seperator
+// user_pref("userChrome.compatibility.dynamic_separator",    true); // Need dynamic_separator

 // user_pref("userChrome.compatibility.os.linux_non_native_titlebar_button", true);
 // user_pref("userChrome.compatibility.os.windows_maximized", true);
@ -153,6 +153,7 @@ user_pref("userChrome.rounding.square_tab",            true);

 // user_pref("userChrome.sidebar.overlap",                     true);

+// user_pref("userChrome.icon.disabled",                       true);
 // user_pref("userChrome.icon.account_image_to_right",         true);
 // user_pref("userChrome.icon.account_label_to_right",         true);
 // user_pref("userChrome.icon.menu.full",                      true);
@ -255,7 +256,7 @@ user_pref("general.smoothScroll.currentVelocityWeighting", "0.15"); //   "0.25"
 user_pref("general.smoothScroll.stopDecelerationWeighting", "0.6"); //    "0.4"
 */

-// == Smooth Scroling ==========================================================
+// == Smooth Scrolling ==========================================================
 // ** Scrolling Options ********************************************************
 // based on natural smooth scrolling v2 by aveyo
 // this preset will reset couple extra variables for consistency