From 385f54f46de6bf042c0687d5e51854f9515ed812 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 11:30:40 -0700
Subject: [PATCH 01/20] always show menubar

---
 distribution/policies.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distribution/policies.json b/distribution/policies.json
index a00e0edae6..315bb9f21a 100644
--- a/distribution/policies.json
+++ b/distribution/policies.json
@@ -1,5 +1,6 @@
 {
   "policies": {
+    "DisplayMenuBar" : true,
     "Extensions": {
       "Install": ["https://addons.mozilla.org/firefox/downloads/file/3831723/open_with-7.2.6.xpi"]
     }

From a6bfb7629f2f8e38b0139574bb53b4117dde5dee Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 12:40:38 -0700
Subject: [PATCH 02/20] revert 3ef6790f7329cc020c9d18c31fba85d81b34c7a8

---
 changed/browser/themes/windows/browser.css | 303 ++++++++++++++++-----
 1 file changed, 232 insertions(+), 71 deletions(-)

diff --git a/changed/browser/themes/windows/browser.css b/changed/browser/themes/windows/browser.css
index 80b460d64d..55a42effaa 100644
--- a/changed/browser/themes/windows/browser.css
+++ b/changed/browser/themes/windows/browser.css
@@ -2,11 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
- @import url("chrome://browser/skin/browser-shared.css");
- @import url("chrome://browser/skin/contextmenu.css");
- @import url("chrome://browser/skin/browser-custom-colors.css");
- 
  @namespace html url("http://www.w3.org/1999/xhtml");
+
+ %include ../shared/browser.inc.css
+ %include ../shared/browser-custom-colors.inc.css
+ %filter substitution
+ %define glassShadowColor hsla(240,5%,5%,0.3)
  
  :root {
    --toolbar-non-lwt-bgcolor: -moz-dialog;
@@ -19,13 +20,17 @@
    --panel-separator-color: ThreeDLightShadow;
  
    --chrome-content-separator-color: ThreeDShadow;
+   --tabs-border-color: threedshadow;
  }
  
  @media (-moz-windows-default-theme) {
    :root {
+     --toolbar-non-lwt-textcolor: #0c0c0d;
      --toolbar-non-lwt-bgimage: none;
  
      --panel-separator-color: hsla(210,4%,10%,.14);
+ 
+     --chrome-content-separator-color: #e1e1e2;
    }
  }
  
@@ -58,15 +63,15 @@
   * illegible.
   */
  @media (-moz-windows-default-theme) {
-   @media not (-moz-platform: windows-win7) {
+   @media not (-moz-os-version: windows-win7) {
      #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
        color: ThreeDShadow;
      }
    }
  }
  
- @media not (-moz-platform: windows-win7) {
-   @media not (-moz-platform: windows-win8) {
+ @media not (-moz-os-version: windows-win7) {
+   @media not (-moz-os-version: windows-win8) {
      /* On Windows 10, when temporarily showing the menu bar, make it at least as
       * tall as the tab bar such that the window controls don't appear to move up. */
      :root[tabsintitlebar] #toolbar-menubar[autohide="true"] {
@@ -79,7 +84,7 @@
  }
  
  /* Add 4px extra margin on top of the tabs toolbar on Windows 7. */
- @media (-moz-platform: windows-win7) {
+ @media (-moz-os-version: windows-win7) {
    :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
    :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
      padding-top: 4px;
@@ -89,6 +94,7 @@
  #navigator-toolbox,
  .browser-toolbar {
    appearance: none;
+   visibility:collapse;
  }
  
  .browser-toolbar:not(.titlebar-color) {
@@ -99,7 +105,7 @@
  }
  
  /* Add a fog for background tabs to be visible on Windows 7 glass window background */
- @media (-moz-platform: windows-win7) {
+ @media (-moz-os-version: windows-win7) {
    @media (-moz-windows-default-theme) {
      #TabsToolbar:not(:-moz-lwtheme) {
        background-image: radial-gradient(ellipse at bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.5) 80%, transparent);
@@ -108,16 +114,15 @@
  }
  
  @media (-moz-windows-compositor: 0),
-        (-moz-windows-default-theme: 0),
-        (-moz-platform: windows-win8) {
+        (-moz-windows-default-theme: 0) {
    /* Please keep the menu text colors in this media block in sync with
-    * light-dark-overrides.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
+    * compacttheme.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
     */
-   :root[tabsintitlebar]:not(:-moz-lwtheme) {
+   :root[tabsintitlebar]:not([inFullscreen], :-moz-lwtheme) {
      color: CaptionText;
    }
  
-   :root[tabsintitlebar]:not(:-moz-lwtheme):-moz-window-inactive {
+   :root[tabsintitlebar]:not([inFullscreen], :-moz-lwtheme):-moz-window-inactive {
      color: InactiveCaptionText;
    }
  }
@@ -146,7 +151,7 @@
            ActiveBorder 2px, ActiveBorder 4px, transparent 4px);
    }
  
-   :root[tabsintitlebar] :is(#TabsToolbar, #toolbar-menubar) toolbarbutton:not(:-moz-lwtheme) {
+   :root[tabsintitlebar]:not([inFullscreen]) :is(#TabsToolbar, #toolbar-menubar) toolbarbutton:not(:-moz-lwtheme) {
      color: inherit;
    }
  }
@@ -156,13 +161,8 @@
    position: relative;
  }
  
- @media (-moz-windows-default-theme: 0) {
-   #nav-bar:not(:-moz-lwtheme) {
-     box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 ThreeDShadow;
-   }
- }
- #nav-bar:-moz-lwtheme {
-   box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--lwt-tabs-border-color, rgba(0,0,0,.3));
+ #nav-bar {
+   box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--tabs-border-color);
  }
  @media (-moz-windows-compositor: 0) {
    #nav-bar[tabs-hidden="true"] {
@@ -200,7 +200,7 @@
     * padding that comes from those -moz-window-titlebar rules.
     */
    :root:not([inDOMFullscreen]) #titlebar:-moz-lwtheme {
-     visibility: hidden;
+     visibility: visible;
    }
    :root:not([inDOMFullscreen], [chromehidden~="menubar"]) #toolbar-menubar:-moz-lwtheme,
    :root:not([inDOMFullscreen], [chromehidden~="toolbar"]) #TabsToolbar:-moz-lwtheme {
@@ -234,8 +234,8 @@
    -moz-box-align: stretch;
  }
  
- @media (-moz-platform: windows-win7),
-        (-moz-platform: windows-win8) {
+ @media (-moz-os-version: windows-win7),
+        (-moz-os-version: windows-win8) {
    /* Preserve window control buttons position at the top of the button box. */
    .titlebar-buttonbox-container {
      -moz-box-align: start;
@@ -303,13 +303,154 @@
  }
  
  
+ %include ../shared/toolbarbuttons.inc.css
+ %include ../shared/toolbarbutton-icons.inc.css
+ %include ../shared/menupanel.inc.css
+ 
+ /* Fullscreen window controls */
+ 
+ #minimize-button,
+ #restore-button,
+ #close-button {
+   appearance: none;
+   padding: 6px 12px;
+   -moz-context-properties: stroke;
+   stroke: currentColor;
+   color: inherit;
+ }
+ 
+ #minimize-button {
+   list-style-image: url(chrome://browser/skin/window-controls/minimize.svg);
+ }
+ 
+ #restore-button {
+   list-style-image: url(chrome://browser/skin/window-controls/restore.svg);
+ }
+ 
+ #restore-button > .toolbarbutton-icon:-moz-locale-dir(rtl) {
+   transform: scaleX(-1);
+ }
+ 
+ #minimize-button:hover,
+ #restore-button:hover {
+   background-color: hsla(0,0%,0%,.12);
+ }
+ 
+ #minimize-button:hover:active,
+ #restore-button:hover:active {
+   background-color: hsla(0,0%,0%,.22);
+ }
+ 
+ #TabsToolbar[brighttext] > #window-controls > #minimize-button:hover,
+ #TabsToolbar[brighttext] > #window-controls > #restore-button:hover {
+   background-color: hsla(0,0%,100%,.12);
+ }
+ 
+ #TabsToolbar[brighttext] > #window-controls > #minimize-button:hover:active,
+ #TabsToolbar[brighttext] > #window-controls > #restore-button:hover:active {
+   background-color: hsla(0,0%,100%,.22);
+ }
+ 
+ #close-button {
+   list-style-image: url(chrome://browser/skin/window-controls/close.svg);
+ }
+ 
+ #close-button:hover {
+   background-color: hsl(355, 86%, 49%);
+   stroke: white;
+ }
+ 
+ #close-button:hover:active {
+   background-color: hsl(355, 82%, 69%);
+ }
+ 
+ @media (-moz-os-version: windows-win7) {
+   #window-controls {
+     -moz-box-align: start;
+     margin-inline-start: 4px;
+   }
+ 
+   #minimize-button,
+   #restore-button,
+   #close-button {
+     appearance: none;
+     border-style: none;
+     margin: 0;
+     /* Important to ensure this applies even on toolbar[brighttext] */
+     list-style-image: url("chrome://global/skin/icons/windowControls.png") !important;
+     /* Also override background color to a avoid hover background styling
+      * leaking through around the image. */
+     background-color: transparent !important;
+     padding: 0;
+     -moz-context-properties: unset;
+   }
+ 
+   #minimize-button {
+     -moz-image-region: rect(0, 16px, 16px, 0);
+   }
+ 
+   #minimize-button:hover {
+     -moz-image-region: rect(16px, 16px, 32px, 0);
+   }
+ 
+   #minimize-button:hover:active {
+     -moz-image-region: rect(32px, 16px, 48px, 0);
+   }
+ 
+   #restore-button {
+     -moz-image-region: rect(0, 32px, 16px, 16px);
+   }
+ 
+   #restore-button:hover {
+     -moz-image-region: rect(16px, 32px, 32px, 16px);
+   }
+ 
+   #restore-button:hover:active {
+     -moz-image-region: rect(32px, 32px, 48px, 16px);
+   }
+ 
+   #close-button {
+     -moz-image-region: rect(0, 48px, 16px, 32px);
+   }
+ 
+   #close-button:hover {
+     -moz-image-region: rect(16px, 48px, 32px, 32px);
+   }
+ 
+   #close-button:hover:active {
+     -moz-image-region: rect(32px, 48px, 48px, 32px);
+   }
+ 
+   #close-button {
+     -moz-image-region: rect(0, 49px, 16px, 32px);
+   }
+ 
+   #close-button:hover {
+     -moz-image-region: rect(16px, 49px, 32px, 32px);
+   }
+ 
+   #close-button:hover:active {
+     -moz-image-region: rect(32px, 49px, 48px, 32px);
+   }
+ 
+   /* Normally there's no need to mirror these buttons for RTL,
+      but both have curves at their bottom right/left, and without
+      mirroring them their curves would appear in the wrong spot. */
+   #minimize-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
+   #close-button > .toolbarbutton-icon:-moz-locale-dir(rtl) {
+     transform: scaleX(-1);
+   }
+ }
+ 
  /* Address bar */
  
+ %include ../shared/urlbar-searchbar.inc.css
+ 
  @media not (prefers-contrast) {
-   :root:not(:-moz-lwtheme) #urlbar {
+   :root:not(:-moz-lwtheme) #urlbar:not([focused="true"]) {
      --urlbar-box-bgcolor: white;
    }
-   :root[lwt-default-theme-in-dark-mode] #urlbar {
+   :root[lwt-default-theme-in-dark-mode] #urlbar:not([focused="true"]) {
      --urlbar-box-bgcolor: var(--toolbar-field-focus-background-color);
    }
  }
@@ -326,23 +467,20 @@
  }
  
  @media (-moz-windows-default-theme: 0) {
-   /* Windows HCM conventions use these colors for chiclets. We can't use them on
-      other platforms because AccentColor can be shown atop SelectedItem,
-      which has zero contrast. */
-   :root {
-     --urlbar-box-hover-bgcolor: SelectedItem;
-     --urlbar-box-active-bgcolor: SelectedItem;
-     --urlbar-box-hover-text-color: SelectedItemText;
-   }
- 
    #urlbar:not(:-moz-lwtheme, [focused="true"]) > #urlbar-background,
    #searchbar:not(:-moz-lwtheme, :focus-within) {
      border-color: ThreeDShadow;
    }
  }
  
+ %include ../shared/identity-block/identity-block.inc.css
+ %include ../shared/notification-icons.inc.css
+ %include ../shared/addon-notification.inc.css
+ 
  /* Address bar results view */
  
+ %include ../shared/urlbarView.inc.css
+ 
  @media (-moz-windows-default-theme: 0) {
    :root:not(:-moz-lwtheme) {
      --urlbar-popup-action-color: -moz-nativehyperlinktext;
@@ -351,12 +489,20 @@
  
  /* Autocomplete */
  
+ %include ../shared/autocomplete.inc.css
+ 
  #PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
    border-top: 1px solid ThreeDShadow;
  }
  
+ /* Bookmarking panel */
+ 
+ %include ../shared/places/editBookmarkPanel.inc.css
+ 
  /* Content area */
  
+ %include ../shared/sidebar.inc.css
+ 
  #browser {
    --sidebar-border-color: ThreeDLightShadow;
  }
@@ -366,8 +512,11 @@
  #TabsToolbar {
    min-height: 0;
    padding: 0;
+  visibility:collapse;
  }
  
+ %include ../shared/tabs.inc.css
+ 
  @media (-moz-windows-default-theme: 0) {
    /* For high contrast themes. */
    #tabbrowser-tabpanels,
@@ -384,11 +533,14 @@
  
  toolbarbutton.bookmark-item[dragover="true"][open="true"] {
    appearance: none;
-   background: SelectedItem !important;
-   color: SelectedItemText !important;
-   fill: SelectedItemText;
+   background: Highlight !important;
+   color: HighlightText !important;
  }
  
+ /* Translation infobar */
+ 
+ %include ../shared/translation/infobar.inc.css
+ 
  /* Bookmarks roots menu-items */
  
  #bookmarksToolbarFolderMenu,
@@ -399,7 +551,7 @@
  }
  
  #PlacesToolbar menu menupopup {
-   margin-top: -13px;
+   margin-top: -12px;
  }
  
  /* Status panel */
@@ -418,19 +570,21 @@
    #statuspanel-label {
      background-color: #f9f9fa;
      color: #444;
+     display:none!important;
    }
  }
  
- @media (-moz-content-prefers-color-scheme: dark) {
+ @media (prefers-color-scheme: dark) {
    #statuspanel-label {
      background-color: hsl(240, 1%, 20%);
      border-color: hsl(240, 1%, 40%);
      color: rgb(249, 249, 250);
+     display:none!important;
    }
  }
  
- #statuspanel:not([mirror]) > #statuspanel-label:-moz-locale-dir(ltr),
- #statuspanel[mirror] > #statuspanel-label:-moz-locale-dir(rtl) {
+ #statuspanel:not([mirror]) > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(ltr),
+ #statuspanel[mirror] > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(rtl) {
    border-right-style: solid;
    /* disabled for triggering grayscale AA (bug 659213)
    border-top-right-radius: .3em;
@@ -438,8 +592,8 @@
    margin-right: 1em;
  }
  
- #statuspanel:not([mirror]) > #statuspanel-label:-moz-locale-dir(rtl),
- #statuspanel[mirror] > #statuspanel-label:-moz-locale-dir(ltr) {
+ #statuspanel:not([mirror]) > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(rtl),
+ #statuspanel[mirror] > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(ltr) {
    border-left-style: solid;
    /* disabled for triggering grayscale AA (bug 659213)
    border-top-left-radius: .3em;
@@ -447,16 +601,35 @@
    margin-left: 1em;
  }
  
+ %include ../shared/fullscreen/warning.inc.css
+ %include ../shared/ctrlTab.inc.css
+ 
+ /* Customization mode */
+ 
+ %include ../shared/customizableui/customizeMode.inc.css
+ 
+ /* End customization mode */
+ 
  /* Prevent window controls from overlapping the nav bar's shadow on the tab
   * bar. */
  #TabsToolbar > .titlebar-buttonbox-container {
    margin-bottom: var(--tabs-navbar-shadow-size);
  }
  
+ :root:not([privatebrowsingmode=temporary]) .accessibility-indicator,
  .private-browsing-indicator {
-   margin-inline: 12px;
+   margin-inline-end: 12px;
+ }
+ 
+ :root:not([accessibilitymode]) .private-browsing-indicator,
+ .accessibility-indicator {
+   margin-inline-start: 12px;
  }
  
+ /* End private browsing and accessibility indicators */
+ 
+ %include ../shared/UITour.inc.css
+ 
  #UITourTooltipButtons {
    /**
     * Override the --arrowpanel-padding so the background extends
@@ -466,13 +639,19 @@
    margin-bottom: -10px;
  }
  
+ %include ../shared/contextmenu.inc.css
+ 
  /* Make menu items larger when opened through touch. */
  #widget-overflow[touchmode] .toolbarbutton-1,
  panel[touchmode] .PanelUI-subView .subviewbutton,
  menupopup[touchmode] menu,
  menupopup[touchmode] menuitem {
-   --arrowpanel-menuitem-padding-block: 12px;
-   padding-block: var(--arrowpanel-menuitem-padding-block);
+   padding-block: 12px;
+ }
+ 
+ panel[touchmode] .PanelUI-subView #appMenu-edit-controls > .subviewbutton,
+ panel[touchmode] .PanelUI-subView #appMenu-zoom-controls > .subviewbutton-iconic {
+   padding-inline: 12px;
  }
  
  #contentAreaContextMenu[touchmode] > #context-navigation > menuitem {
@@ -533,12 +712,11 @@
      padding: 8px 1em;
      margin: 0;
    }
-   #context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon {
-     background-color: -moz-menuhover;
+   #context-navigation > .menuitem-iconic[_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon {
+     background-color: var(--menuitem-hover-background-color);
    }
- 
    #context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-iconic-left > .menu-iconic-icon {
-     background-color: -moz-menuhoverdisabled;
+     background-color: var(--menuitem-disabled-hover-background-color);
    }
  
    /* If the menu is wider than the icons strictly need, the <menuitem> elements
@@ -578,6 +756,8 @@
    }
  }
  
+ %include browser-aero.css
+ 
  .cui-widget-panelview[id^=PanelUI-webext-] {
    border-radius: var(--arrowpanel-border-radius);
  }
@@ -585,23 +765,4 @@
  .webextension-popup-browser,
  .webextension-popup-stack {
    border-radius: inherit;
- }
- 
- #historySwipeAnimationPreviousArrow {
-   background: url("chrome://browser/skin/history-swipe-arrow.svg")
-               center left / 192px 192px no-repeat transparent;
-   will-change: transform;
-   -moz-context-properties: fill;
- }
- #historySwipeAnimationPreviousArrow:-moz-locale-dir(rtl) {
-   transform: scaleX(-1);
- }
- #historySwipeAnimationNextArrow {
-   background: url("chrome://browser/skin/history-swipe-arrow.svg")
-               center left / 192px 192px no-repeat transparent;
-   will-change: transform;
-   -moz-context-properties: fill;
- }
- #historySwipeAnimationNextArrow:-moz-locale-dir(ltr) {
-   transform: scaleX(-1);
  }
\ No newline at end of file

From 32a37843cb6b6d342d72a199e0990b237def22b3 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 12:48:43 -0700
Subject: [PATCH 03/20] fix always show menubar

---
 distribution/policies.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/policies.json b/distribution/policies.json
index 315bb9f21a..94fa4a2640 100644
--- a/distribution/policies.json
+++ b/distribution/policies.json
@@ -1,6 +1,6 @@
 {
   "policies": {
-    "DisplayMenuBar" : true,
+    "DisplayMenuBar" : "default-on",
     "Extensions": {
       "Install": ["https://addons.mozilla.org/firefox/downloads/file/3831723/open_with-7.2.6.xpi"]
     }

From ccfd1a30078e32c399b0afdb92c27bfdd1c58054 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 14:17:35 -0700
Subject: [PATCH 04/20] fix windows no toolbar

---
 changed/browser/themes/windows/browser.css | 313 ++++++---------------
 distribution/policies.json                 |   2 +-
 2 files changed, 81 insertions(+), 234 deletions(-)

diff --git a/changed/browser/themes/windows/browser.css b/changed/browser/themes/windows/browser.css
index 55a42effaa..f41494fa0e 100644
--- a/changed/browser/themes/windows/browser.css
+++ b/changed/browser/themes/windows/browser.css
@@ -2,12 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ @import url("chrome://browser/skin/browser-shared.css");
+ @import url("chrome://browser/skin/contextmenu.css");
+ @import url("chrome://browser/skin/browser-custom-colors.css");
+ 
  @namespace html url("http://www.w3.org/1999/xhtml");
-
- %include ../shared/browser.inc.css
- %include ../shared/browser-custom-colors.inc.css
- %filter substitution
- %define glassShadowColor hsla(240,5%,5%,0.3)
  
  :root {
    --toolbar-non-lwt-bgcolor: -moz-dialog;
@@ -20,17 +19,13 @@
    --panel-separator-color: ThreeDLightShadow;
  
    --chrome-content-separator-color: ThreeDShadow;
-   --tabs-border-color: threedshadow;
  }
  
  @media (-moz-windows-default-theme) {
    :root {
-     --toolbar-non-lwt-textcolor: #0c0c0d;
      --toolbar-non-lwt-bgimage: none;
  
      --panel-separator-color: hsla(210,4%,10%,.14);
- 
-     --chrome-content-separator-color: #e1e1e2;
    }
  }
  
@@ -63,15 +58,15 @@
   * illegible.
   */
  @media (-moz-windows-default-theme) {
-   @media not (-moz-os-version: windows-win7) {
+   @media not (-moz-platform: windows-win7) {
      #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
        color: ThreeDShadow;
      }
    }
  }
  
- @media not (-moz-os-version: windows-win7) {
-   @media not (-moz-os-version: windows-win8) {
+ @media not (-moz-platform: windows-win7) {
+   @media not (-moz-platform: windows-win8) {
      /* On Windows 10, when temporarily showing the menu bar, make it at least as
       * tall as the tab bar such that the window controls don't appear to move up. */
      :root[tabsintitlebar] #toolbar-menubar[autohide="true"] {
@@ -84,7 +79,7 @@
  }
  
  /* Add 4px extra margin on top of the tabs toolbar on Windows 7. */
- @media (-moz-os-version: windows-win7) {
+ @media (-moz-platform: windows-win7) {
    :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items,
    :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items {
      padding-top: 4px;
@@ -94,7 +89,6 @@
  #navigator-toolbox,
  .browser-toolbar {
    appearance: none;
-   visibility:collapse;
  }
  
  .browser-toolbar:not(.titlebar-color) {
@@ -105,7 +99,7 @@
  }
  
  /* Add a fog for background tabs to be visible on Windows 7 glass window background */
- @media (-moz-os-version: windows-win7) {
+ @media (-moz-platform: windows-win7) {
    @media (-moz-windows-default-theme) {
      #TabsToolbar:not(:-moz-lwtheme) {
        background-image: radial-gradient(ellipse at bottom, rgba(255,255,255,0.8), rgba(255,255,255,0.5) 80%, transparent);
@@ -114,15 +108,16 @@
  }
  
  @media (-moz-windows-compositor: 0),
-        (-moz-windows-default-theme: 0) {
+        (-moz-windows-default-theme: 0),
+        (-moz-platform: windows-win8) {
    /* Please keep the menu text colors in this media block in sync with
-    * compacttheme.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
+    * light-dark-overrides.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
     */
-   :root[tabsintitlebar]:not([inFullscreen], :-moz-lwtheme) {
+   :root[tabsintitlebar]:not(:-moz-lwtheme) {
      color: CaptionText;
    }
  
-   :root[tabsintitlebar]:not([inFullscreen], :-moz-lwtheme):-moz-window-inactive {
+   :root[tabsintitlebar]:not(:-moz-lwtheme):-moz-window-inactive {
      color: InactiveCaptionText;
    }
  }
@@ -151,7 +146,7 @@
            ActiveBorder 2px, ActiveBorder 4px, transparent 4px);
    }
  
-   :root[tabsintitlebar]:not([inFullscreen]) :is(#TabsToolbar, #toolbar-menubar) toolbarbutton:not(:-moz-lwtheme) {
+   :root[tabsintitlebar] :is(#TabsToolbar, #toolbar-menubar) toolbarbutton:not(:-moz-lwtheme) {
      color: inherit;
    }
  }
@@ -161,14 +156,24 @@
    position: relative;
  }
  
- #nav-bar {
-   box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--tabs-border-color);
+ @media (-moz-windows-default-theme: 0) {
+   #nav-bar:not(:-moz-lwtheme) {
+     box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 ThreeDShadow;
+   }
+ }
+ #nav-bar:-moz-lwtheme {
+   box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--lwt-tabs-border-color, rgba(0,0,0,.3));
  }
  @media (-moz-windows-compositor: 0) {
    #nav-bar[tabs-hidden="true"] {
      box-shadow: none;
    }
  }
+
+ /* Hide navbar for Datcord*/
+ #nav-bar {
+  visibility: collapse;
+}
  
  #print-preview-toolbar:not(:-moz-lwtheme) {
    appearance: auto;
@@ -200,7 +205,7 @@
     * padding that comes from those -moz-window-titlebar rules.
     */
    :root:not([inDOMFullscreen]) #titlebar:-moz-lwtheme {
-     visibility: visible;
+     visibility: hidden;
    }
    :root:not([inDOMFullscreen], [chromehidden~="menubar"]) #toolbar-menubar:-moz-lwtheme,
    :root:not([inDOMFullscreen], [chromehidden~="toolbar"]) #TabsToolbar:-moz-lwtheme {
@@ -234,8 +239,8 @@
    -moz-box-align: stretch;
  }
  
- @media (-moz-os-version: windows-win7),
-        (-moz-os-version: windows-win8) {
+ @media (-moz-platform: windows-win7),
+        (-moz-platform: windows-win8) {
    /* Preserve window control buttons position at the top of the button box. */
    .titlebar-buttonbox-container {
      -moz-box-align: start;
@@ -303,154 +308,13 @@
  }
  
  
- %include ../shared/toolbarbuttons.inc.css
- %include ../shared/toolbarbutton-icons.inc.css
- %include ../shared/menupanel.inc.css
- 
- /* Fullscreen window controls */
- 
- #minimize-button,
- #restore-button,
- #close-button {
-   appearance: none;
-   padding: 6px 12px;
-   -moz-context-properties: stroke;
-   stroke: currentColor;
-   color: inherit;
- }
- 
- #minimize-button {
-   list-style-image: url(chrome://browser/skin/window-controls/minimize.svg);
- }
- 
- #restore-button {
-   list-style-image: url(chrome://browser/skin/window-controls/restore.svg);
- }
- 
- #restore-button > .toolbarbutton-icon:-moz-locale-dir(rtl) {
-   transform: scaleX(-1);
- }
- 
- #minimize-button:hover,
- #restore-button:hover {
-   background-color: hsla(0,0%,0%,.12);
- }
- 
- #minimize-button:hover:active,
- #restore-button:hover:active {
-   background-color: hsla(0,0%,0%,.22);
- }
- 
- #TabsToolbar[brighttext] > #window-controls > #minimize-button:hover,
- #TabsToolbar[brighttext] > #window-controls > #restore-button:hover {
-   background-color: hsla(0,0%,100%,.12);
- }
- 
- #TabsToolbar[brighttext] > #window-controls > #minimize-button:hover:active,
- #TabsToolbar[brighttext] > #window-controls > #restore-button:hover:active {
-   background-color: hsla(0,0%,100%,.22);
- }
- 
- #close-button {
-   list-style-image: url(chrome://browser/skin/window-controls/close.svg);
- }
- 
- #close-button:hover {
-   background-color: hsl(355, 86%, 49%);
-   stroke: white;
- }
- 
- #close-button:hover:active {
-   background-color: hsl(355, 82%, 69%);
- }
- 
- @media (-moz-os-version: windows-win7) {
-   #window-controls {
-     -moz-box-align: start;
-     margin-inline-start: 4px;
-   }
- 
-   #minimize-button,
-   #restore-button,
-   #close-button {
-     appearance: none;
-     border-style: none;
-     margin: 0;
-     /* Important to ensure this applies even on toolbar[brighttext] */
-     list-style-image: url("chrome://global/skin/icons/windowControls.png") !important;
-     /* Also override background color to a avoid hover background styling
-      * leaking through around the image. */
-     background-color: transparent !important;
-     padding: 0;
-     -moz-context-properties: unset;
-   }
- 
-   #minimize-button {
-     -moz-image-region: rect(0, 16px, 16px, 0);
-   }
- 
-   #minimize-button:hover {
-     -moz-image-region: rect(16px, 16px, 32px, 0);
-   }
- 
-   #minimize-button:hover:active {
-     -moz-image-region: rect(32px, 16px, 48px, 0);
-   }
- 
-   #restore-button {
-     -moz-image-region: rect(0, 32px, 16px, 16px);
-   }
- 
-   #restore-button:hover {
-     -moz-image-region: rect(16px, 32px, 32px, 16px);
-   }
- 
-   #restore-button:hover:active {
-     -moz-image-region: rect(32px, 32px, 48px, 16px);
-   }
- 
-   #close-button {
-     -moz-image-region: rect(0, 48px, 16px, 32px);
-   }
- 
-   #close-button:hover {
-     -moz-image-region: rect(16px, 48px, 32px, 32px);
-   }
- 
-   #close-button:hover:active {
-     -moz-image-region: rect(32px, 48px, 48px, 32px);
-   }
- 
-   #close-button {
-     -moz-image-region: rect(0, 49px, 16px, 32px);
-   }
- 
-   #close-button:hover {
-     -moz-image-region: rect(16px, 49px, 32px, 32px);
-   }
- 
-   #close-button:hover:active {
-     -moz-image-region: rect(32px, 49px, 48px, 32px);
-   }
- 
-   /* Normally there's no need to mirror these buttons for RTL,
-      but both have curves at their bottom right/left, and without
-      mirroring them their curves would appear in the wrong spot. */
-   #minimize-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
-   #close-button > .toolbarbutton-icon:-moz-locale-dir(rtl) {
-     transform: scaleX(-1);
-   }
- }
- 
  /* Address bar */
  
- %include ../shared/urlbar-searchbar.inc.css
- 
  @media not (prefers-contrast) {
-   :root:not(:-moz-lwtheme) #urlbar:not([focused="true"]) {
+   :root:not(:-moz-lwtheme) #urlbar {
      --urlbar-box-bgcolor: white;
    }
-   :root[lwt-default-theme-in-dark-mode] #urlbar:not([focused="true"]) {
+   :root[lwt-default-theme-in-dark-mode] #urlbar {
      --urlbar-box-bgcolor: var(--toolbar-field-focus-background-color);
    }
  }
@@ -467,20 +331,23 @@
  }
  
  @media (-moz-windows-default-theme: 0) {
+   /* Windows HCM conventions use these colors for chiclets. We can't use them on
+      other platforms because AccentColor can be shown atop SelectedItem,
+      which has zero contrast. */
+   :root {
+     --urlbar-box-hover-bgcolor: SelectedItem;
+     --urlbar-box-active-bgcolor: SelectedItem;
+     --urlbar-box-hover-text-color: SelectedItemText;
+   }
+ 
    #urlbar:not(:-moz-lwtheme, [focused="true"]) > #urlbar-background,
    #searchbar:not(:-moz-lwtheme, :focus-within) {
      border-color: ThreeDShadow;
    }
  }
  
- %include ../shared/identity-block/identity-block.inc.css
- %include ../shared/notification-icons.inc.css
- %include ../shared/addon-notification.inc.css
- 
  /* Address bar results view */
  
- %include ../shared/urlbarView.inc.css
- 
  @media (-moz-windows-default-theme: 0) {
    :root:not(:-moz-lwtheme) {
      --urlbar-popup-action-color: -moz-nativehyperlinktext;
@@ -489,20 +356,12 @@
  
  /* Autocomplete */
  
- %include ../shared/autocomplete.inc.css
- 
  #PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
    border-top: 1px solid ThreeDShadow;
  }
  
- /* Bookmarking panel */
- 
- %include ../shared/places/editBookmarkPanel.inc.css
- 
  /* Content area */
  
- %include ../shared/sidebar.inc.css
- 
  #browser {
    --sidebar-border-color: ThreeDLightShadow;
  }
@@ -512,11 +371,10 @@
  #TabsToolbar {
    min-height: 0;
    padding: 0;
-  visibility:collapse;
+   /* Hide tabstoolbar for Datcord */
+   visibility: collapse;
  }
  
- %include ../shared/tabs.inc.css
- 
  @media (-moz-windows-default-theme: 0) {
    /* For high contrast themes. */
    #tabbrowser-tabpanels,
@@ -533,14 +391,11 @@
  
  toolbarbutton.bookmark-item[dragover="true"][open="true"] {
    appearance: none;
-   background: Highlight !important;
-   color: HighlightText !important;
+   background: SelectedItem !important;
+   color: SelectedItemText !important;
+   fill: SelectedItemText;
  }
  
- /* Translation infobar */
- 
- %include ../shared/translation/infobar.inc.css
- 
  /* Bookmarks roots menu-items */
  
  #bookmarksToolbarFolderMenu,
@@ -551,7 +406,7 @@
  }
  
  #PlacesToolbar menu menupopup {
-   margin-top: -12px;
+   margin-top: -13px;
  }
  
  /* Status panel */
@@ -570,21 +425,19 @@
    #statuspanel-label {
      background-color: #f9f9fa;
      color: #444;
-     display:none!important;
    }
  }
  
- @media (prefers-color-scheme: dark) {
+ @media (-moz-content-prefers-color-scheme: dark) {
    #statuspanel-label {
      background-color: hsl(240, 1%, 20%);
      border-color: hsl(240, 1%, 40%);
      color: rgb(249, 249, 250);
-     display:none!important;
    }
  }
  
- #statuspanel:not([mirror]) > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(ltr),
- #statuspanel[mirror] > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(rtl) {
+ #statuspanel:not([mirror]) > #statuspanel-label:-moz-locale-dir(ltr),
+ #statuspanel[mirror] > #statuspanel-label:-moz-locale-dir(rtl) {
    border-right-style: solid;
    /* disabled for triggering grayscale AA (bug 659213)
    border-top-right-radius: .3em;
@@ -592,8 +445,8 @@
    margin-right: 1em;
  }
  
- #statuspanel:not([mirror]) > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(rtl),
- #statuspanel[mirror] > #statuspanel-inner > #statuspanel-label:-moz-locale-dir(ltr) {
+ #statuspanel:not([mirror]) > #statuspanel-label:-moz-locale-dir(rtl),
+ #statuspanel[mirror] > #statuspanel-label:-moz-locale-dir(ltr) {
    border-left-style: solid;
    /* disabled for triggering grayscale AA (bug 659213)
    border-top-left-radius: .3em;
@@ -601,35 +454,16 @@
    margin-left: 1em;
  }
  
- %include ../shared/fullscreen/warning.inc.css
- %include ../shared/ctrlTab.inc.css
- 
- /* Customization mode */
- 
- %include ../shared/customizableui/customizeMode.inc.css
- 
- /* End customization mode */
- 
  /* Prevent window controls from overlapping the nav bar's shadow on the tab
   * bar. */
  #TabsToolbar > .titlebar-buttonbox-container {
    margin-bottom: var(--tabs-navbar-shadow-size);
  }
  
- :root:not([privatebrowsingmode=temporary]) .accessibility-indicator,
  .private-browsing-indicator {
-   margin-inline-end: 12px;
- }
- 
- :root:not([accessibilitymode]) .private-browsing-indicator,
- .accessibility-indicator {
-   margin-inline-start: 12px;
+   margin-inline: 12px;
  }
  
- /* End private browsing and accessibility indicators */
- 
- %include ../shared/UITour.inc.css
- 
  #UITourTooltipButtons {
    /**
     * Override the --arrowpanel-padding so the background extends
@@ -639,19 +473,13 @@
    margin-bottom: -10px;
  }
  
- %include ../shared/contextmenu.inc.css
- 
  /* Make menu items larger when opened through touch. */
  #widget-overflow[touchmode] .toolbarbutton-1,
  panel[touchmode] .PanelUI-subView .subviewbutton,
  menupopup[touchmode] menu,
  menupopup[touchmode] menuitem {
-   padding-block: 12px;
- }
- 
- panel[touchmode] .PanelUI-subView #appMenu-edit-controls > .subviewbutton,
- panel[touchmode] .PanelUI-subView #appMenu-zoom-controls > .subviewbutton-iconic {
-   padding-inline: 12px;
+   --arrowpanel-menuitem-padding-block: 12px;
+   padding-block: var(--arrowpanel-menuitem-padding-block);
  }
  
  #contentAreaContextMenu[touchmode] > #context-navigation > menuitem {
@@ -712,11 +540,12 @@
      padding: 8px 1em;
      margin: 0;
    }
-   #context-navigation > .menuitem-iconic[_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon {
-     background-color: var(--menuitem-hover-background-color);
+   #context-navigation > .menuitem-iconic[_moz-menuactive="true"] > .menu-iconic-left > .menu-iconic-icon {
+     background-color: -moz-menuhover;
    }
+ 
    #context-navigation > .menuitem-iconic[_moz-menuactive="true"][disabled="true"] > .menu-iconic-left > .menu-iconic-icon {
-     background-color: var(--menuitem-disabled-hover-background-color);
+     background-color: -moz-menuhoverdisabled;
    }
  
    /* If the menu is wider than the icons strictly need, the <menuitem> elements
@@ -756,8 +585,6 @@
    }
  }
  
- %include browser-aero.css
- 
  .cui-widget-panelview[id^=PanelUI-webext-] {
    border-radius: var(--arrowpanel-border-radius);
  }
@@ -765,4 +592,24 @@
  .webextension-popup-browser,
  .webextension-popup-stack {
    border-radius: inherit;
- }
\ No newline at end of file
+ }
+ 
+ #historySwipeAnimationPreviousArrow {
+   background: url("chrome://browser/skin/history-swipe-arrow.svg")
+               center left / 192px 192px no-repeat transparent;
+   will-change: transform;
+   -moz-context-properties: fill;
+ }
+ #historySwipeAnimationPreviousArrow:-moz-locale-dir(rtl) {
+   transform: scaleX(-1);
+ }
+ #historySwipeAnimationNextArrow {
+   background: url("chrome://browser/skin/history-swipe-arrow.svg")
+               center left / 192px 192px no-repeat transparent;
+   will-change: transform;
+   -moz-context-properties: fill;
+ }
+ #historySwipeAnimationNextArrow:-moz-locale-dir(ltr) {
+   transform: scaleX(-1);
+ }
+ 
\ No newline at end of file
diff --git a/distribution/policies.json b/distribution/policies.json
index 94fa4a2640..aed629c30a 100644
--- a/distribution/policies.json
+++ b/distribution/policies.json
@@ -1,6 +1,6 @@
 {
   "policies": {
-    "DisplayMenuBar" : "default-on",
+    "DisplayMenuBar" : "always",
     "Extensions": {
       "Install": ["https://addons.mozilla.org/firefox/downloads/file/3831723/open_with-7.2.6.xpi"]
     }

From a5e7202924d23ad0afdaede5c00ec48f497c01b0 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 15:56:53 -0700
Subject: [PATCH 05/20] copy distribution folder

---
 buildDatcordWin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index dcf9b6175b..4b3c1fbe54 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -35,7 +35,7 @@ wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe
 cp ../windows/setup.nsi .
 cp ../windows/datcord.ico .
 cp ../windows/banner.bmp .
-Xcopy /E /I ../distribution ./
+Xcopy ..\distribution distribution\
 makensis.exe -V1 setup.nsi
 # Setup filename will be datcordSetup-win64.exe
 

From 7456fea10f1fbd74423ac7f4ea4d577a2effefd2 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 16:13:02 -0700
Subject: [PATCH 06/20] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 391df61755..28bbe607d8 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@
 	    ./datcord
 	    ```
  - # Windows
-   - A windows build is available from GitHub Actions but is not finished yet.
+   - The Windows installer is available from releases.
    
   ## Open With Setup
   #### [Open With](https://github.com/darktrojan/openwith) allows you to open links from Datcord in other browsers. To set it up, follow these instructions:
@@ -29,8 +29,9 @@
   
 	- If you are using Datcord from tarball or AUR, run ``datcord "about:addons"`` on the command line.
 	- If you are using the AppImage and you have integrated it, run ``~/Applications/Datcord-* "about:addons"`` in the terminal.
+	- If you are using Windows, run ``"C:\Program Files\Datcord\datcord.exe" about:addons`` in cmd.
 	
-  - Click the "meatball menu" (3 horizontal dots) next to the on/off switch for Open With and select preferences.
+  - Click the "meatball menu" (3 horizontal dots) next to the on/off switch for Open With and select preferences/options.
   - Follow all setup instructions for Open With.
   - Press ctrl+w to close tabs until Datcord closes.
   #### Open With should now be setup and you can use it by right clicking on links.

From 1a63433059b705782afb01c6d3ff6bf4ef97ab7a Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 17:13:12 -0700
Subject: [PATCH 07/20] Update buildDatcordWin.sh

---
 buildDatcordWin.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 4b3c1fbe54..ef17dd2a9c 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -35,9 +35,6 @@ wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe
 cp ../windows/setup.nsi .
 cp ../windows/datcord.ico .
 cp ../windows/banner.bmp .
-Xcopy ..\distribution distribution\
+Xcopy /i "..\\distribution" "distribution\\"
 makensis.exe -V1 setup.nsi
 # Setup filename will be datcordSetup-win64.exe
-
-
-

From 1a17dce2e6ce51c5def652c310e61fb48ff5f065 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Sun, 9 Oct 2022 17:17:25 -0700
Subject: [PATCH 08/20] Why am i using windows commands

---
 buildDatcordWin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index ef17dd2a9c..32ad173645 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -35,6 +35,6 @@ wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe
 cp ../windows/setup.nsi .
 cp ../windows/datcord.ico .
 cp ../windows/banner.bmp .
-Xcopy /i "..\\distribution" "distribution\\"
+cp -r ./distribution distribution
 makensis.exe -V1 setup.nsi
 # Setup filename will be datcordSetup-win64.exe

From befe0329cdc352abe171f07ca1fe4c65cda9383e Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:04:00 -0700
Subject: [PATCH 09/20] enable privact.resistFingerprinting

---
 changed/browser/app/profile/firefox.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changed/browser/app/profile/firefox.js b/changed/browser/app/profile/firefox.js
index bb9718d8aa..94ca4adbb7 100644
--- a/changed/browser/app/profile/firefox.js
+++ b/changed/browser/app/profile/firefox.js
@@ -866,6 +866,8 @@ pref("privacy.cpd.openWindows",             false);
 
 pref("privacy.history.custom",              false);
 
+pref("privacy.resistFingerprinting",        true);
+
 // What default should we use for the time span in the sanitizer:
 // 0 - Clear everything
 // 1 - Last Hour

From a5757f85b08a6eff4aa318c33e4a3bfffabc8c0f Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 16:39:08 -0700
Subject: [PATCH 10/20] forgot a dot

---
 buildDatcordWin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 32ad173645..9d95d152d1 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -35,6 +35,6 @@ wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe
 cp ../windows/setup.nsi .
 cp ../windows/datcord.ico .
 cp ../windows/banner.bmp .
-cp -r ./distribution distribution
+cp -r ../distribution distribution
 makensis.exe -V1 setup.nsi
 # Setup filename will be datcordSetup-win64.exe

From 4b526f5a522eca1d96a62f47af6f691d7a8eac56 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 16:43:34 -0700
Subject: [PATCH 11/20] check if mozilla-unified already exists

---
 buildDatcordWin.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 9d95d152d1..76a9d0dae9 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -1,7 +1,9 @@
 # Run with MozillaBuild
 basedir=$(dirname "$0")
-curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
-python3 bootstrap.py --no-interactive
+if [[! -d mozilla-unified]]; then
+  curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
+  python3 bootstrap.py --no-interactive
+fi
 cp -rf $basedir/changed/* mozilla-unified/
 # It is using nightly branding no matter what so we replace the nightly stuff with our stuff
 cp -rf mozilla-unified/browser/branding/unofficial/* mozilla-unified/browser/branding/nightly/*

From 8f3faf38fcf2163b5e13464a936c4c827ebc696b Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 16:44:11 -0700
Subject: [PATCH 12/20] Cache mozilla-unified folder

---
 .github/workflows/build-win64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index 328358ef5d..30da94eddc 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -44,6 +44,6 @@ jobs:
         uses: actions/cache@v2.1.6
         with:
         # A list of files, directories, and wildcard patterns to cache and restore
-          path: obj-x86_64-pc-linux-gnu/*
+          path: mozilla-unified
         # An explicit key for restoring and saving the cache
           key: ${{ runner.os }}

From a6e6260a2ba4186dbdbc7a996c1998fe09cd13e2 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:18:45 -0700
Subject: [PATCH 13/20] forgot space

---
 buildDatcordWin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 76a9d0dae9..5012f5c03d 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -1,6 +1,6 @@
 # Run with MozillaBuild
 basedir=$(dirname "$0")
-if [[! -d mozilla-unified]]; then
+if [[ ! -d mozilla-unified]]; then
   curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
   python3 bootstrap.py --no-interactive
 fi

From a17b97ecb16397a335fc99d5e5950d5885bb76a9 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:25:53 -0700
Subject: [PATCH 14/20] Update buildDatcordWin.sh

---
 buildDatcordWin.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 5012f5c03d..03606a562a 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -1,6 +1,7 @@
 # Run with MozillaBuild
 basedir=$(dirname "$0")
-if [[ ! -d mozilla-unified]]; then
+if [[ ! -d mozilla-unified]]
+then
   curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
   python3 bootstrap.py --no-interactive
 fi

From 7a116f30344bb52017becb779d78f432345400f4 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:32:56 -0700
Subject: [PATCH 15/20] Update buildDatcordWin.sh

---
 buildDatcordWin.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 03606a562a..218482ea6f 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -1,7 +1,6 @@
 # Run with MozillaBuild
 basedir=$(dirname "$0")
 if [[ ! -d mozilla-unified]]
-then
   curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
   python3 bootstrap.py --no-interactive
 fi

From ef0808aba173bda3e6f662c62416976302ee5a6a Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 17:40:49 -0700
Subject: [PATCH 16/20] Update buildDatcordWin.sh

---
 buildDatcordWin.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 218482ea6f..f483e861bc 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -1,6 +1,7 @@
 # Run with MozillaBuild
 basedir=$(dirname "$0")
-if [[ ! -d mozilla-unified]]
+if [[ ! -d mozilla-unified ]] 
+then
   curl https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py --output bootstrap.py
   python3 bootstrap.py --no-interactive
 fi

From f2a9ba58615263943e170efd3e706174a2d8e2ed Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Mon, 10 Oct 2022 18:00:11 -0700
Subject: [PATCH 17/20] Update buildDatcordWin.sh

---
 buildDatcordWin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index f483e861bc..1fc2767d9d 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -31,6 +31,7 @@ cd datcord
 mv firefox.exe datcord.exe
 cd ..
 cp ../windows/datcord.ico datcord/
+cp -r ../distribution .
 # Based on librewolf mk.py
 mkdir x86-ansi
 wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll
@@ -38,6 +39,5 @@ wget -q -O ./vc_redist.x64.exe https://aka.ms/vs/17/release/vc_redist.x64.exe
 cp ../windows/setup.nsi .
 cp ../windows/datcord.ico .
 cp ../windows/banner.bmp .
-cp -r ../distribution distribution
 makensis.exe -V1 setup.nsi
 # Setup filename will be datcordSetup-win64.exe

From 4d065f26d2045803eb3cb106faf5af9ccbed197c Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Fri, 21 Oct 2022 21:45:47 +0200
Subject: [PATCH 18/20] caching and new firefox.js

---
 .github/workflows/build-linux-x86_64.yml |   6 +
 .github/workflows/build-win64.yml        |  17 +-
 changed/browser/app/profile/firefox.js   | 261 ++++++++++++++---------
 3 files changed, 173 insertions(+), 111 deletions(-)

diff --git a/.github/workflows/build-linux-x86_64.yml b/.github/workflows/build-linux-x86_64.yml
index 20bcbd100d..f1ea282d3d 100644
--- a/.github/workflows/build-linux-x86_64.yml
+++ b/.github/workflows/build-linux-x86_64.yml
@@ -25,6 +25,12 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
+      - name: Cache
+        uses: actions/cache@v3.0.11
+        with:
+          path: mozilla-unified
+          key: ${{ runner.os }}-mozilla-unified
+          
       # Runs a set of commands using the runners shell
       - name: Get deps, build and package
         run: |
diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index 30da94eddc..a11f573ddd 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -22,7 +22,15 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-
+      
+        - name: Cache
+        uses: actions/cache@v2.1.6
+        with:
+        # A list of files, directories, and wildcard patterns to cache and restore
+          path: mozilla-unified
+        # An explicit key for restoring and saving the cache
+          key: ${{ runner.os }}-mozilla-unified
+          
       # Runs a set of commands using the runners shell
       - name: Run a multi-line script
         run: |
@@ -40,10 +48,3 @@ jobs:
           # A file, directory or wildcard pattern that describes what to upload
           path: work/datcordSetup-win64.exe
           
-      - name: Cache
-        uses: actions/cache@v2.1.6
-        with:
-        # A list of files, directories, and wildcard patterns to cache and restore
-          path: mozilla-unified
-        # An explicit key for restoring and saving the cache
-          key: ${{ runner.os }}
diff --git a/changed/browser/app/profile/firefox.js b/changed/browser/app/profile/firefox.js
index 94ca4adbb7..22e86d0220 100644
--- a/changed/browser/app/profile/firefox.js
+++ b/changed/browser/app/profile/firefox.js
@@ -180,6 +180,9 @@ pref("app.update.langpack.enabled", true);
   pref("app.update.background.timeoutSec", 600);
   // By default, check for updates when the browser is not running every 7 hours.
   pref("app.update.background.interval", 25200);
+  // By default, snapshot Firefox Messaging System targeting for use by the
+  // background update task every 30 minutes.
+  pref("app.update.background.messaging.targeting.snapshot.intervalSec", 1800);
 #endif
 
 #ifdef XP_MACOSX
@@ -286,7 +289,7 @@ pref("browser.shell.setDefaultPDFHandler.onlyReplaceBrowsers", true);
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
 // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
 pref("browser.startup.page",                1);
-pref("browser.startup.homepage",            "discord.com/app");
+pref("browser.startup.homepage",            "https://discord.com/app");
 #ifdef NIGHTLY_BUILD
 pref("browser.startup.homepage.abouthome_cache.enabled", true);
 #else
@@ -312,7 +315,7 @@ pref("browser.startup.couldRestoreSession.count", 0);
 // Show a skeleton UI window prior to loading libxul. Only visible for windows
 // users as it is not implemented anywhere else.
 #if defined(XP_WIN)
-pref("browser.startup.preXulSkeletonUI", false);
+pref("browser.startup.preXulSkeletonUI", true);
 #endif
 
 // Show an upgrade dialog on major upgrades.
@@ -342,7 +345,7 @@ pref("browser.warnOnQuit", false);
 
 pref("browser.overlink-delay", 80);
 
-pref("browser.theme.colorway-closet", false);
+pref("browser.theme.colorway-closet", true);
 
 // Whether using `ctrl` when hitting return/enter in the URL bar
 // (or clicking 'go') should prefix 'www.' and suffix
@@ -392,6 +395,15 @@ pref("browser.urlbar.suggest.topsites",             false);
 pref("browser.urlbar.suggest.engines",              false);
 pref("browser.urlbar.suggest.calculator",           false);
 
+#if defined(EARLY_BETA_OR_EARLIER)
+  // Enable QuickActions and its urlbar search mode button.
+  pref("browser.urlbar.quickactions.enabled", true);
+  pref("browser.urlbar.suggest.quickactions", true);
+  pref("browser.urlbar.shortcuts.quickactions", true);
+  pref("browser.urlbar.quickactions.showPrefs", true);
+  pref("browser.urlbar.quickactions.showInZeroPrefix", true);
+#endif
+
 // When `browser.urlbar.bestMatch.enabled` is true, this controls whether best
 // match results are shown in the urlbar. This pref is exposed to the user in
 // the UI, and it's sticky so that its user-branch value persists regardless of
@@ -421,7 +433,7 @@ pref("browser.urlbar.quicksuggest.dataCollection.enabled", false, sticky);
 pref("browser.urlbar.quicksuggest.enabled", false);
 
 // Whether to show the QuickSuggest onboarding dialog.
-pref("browser.urlbar.quicksuggest.shouldShowOnboardingDialog", false);
+pref("browser.urlbar.quicksuggest.shouldShowOnboardingDialog", true);
 
 // Show QuickSuggest onboarding dialog on the nth browser restarts.
 pref("browser.urlbar.quicksuggest.showOnboardingDialogAfterNRestarts", 0);
@@ -485,6 +497,9 @@ pref("browser.urlbar.richSuggestions.tail", true);
 // If true, top sites may include sponsored ones.
 pref("browser.urlbar.sponsoredTopSites", false);
 
+// If true, show the search term in the URL bar for the users default engine.
+pref("browser.urlbar.showSearchTerms", false);
+
 // Controls the empty search behavior in Search Mode:
 //  0 - Show nothing
 //  1 - Show search history
@@ -507,7 +522,7 @@ pref("browser.urlbar.extension.timeout", 400);
 // searched for. If the string is resolved as a valid host, show a
 // "Did you mean to go to 'host'" prompt.
 // 0 - never resolve; 1 - use heuristics (default); 2 - always resolve
-pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 1);
+pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0);
 
 // Whether the results panel should be kept open during IME composition.
 // The default value is false because some IME open a picker panel, and we end
@@ -630,19 +645,26 @@ pref("browser.search.separatePrivateDefault.ui.banner.max", 0);
 // Enables the display of the Mozilla VPN banner in private browsing windows
 pref("browser.privatebrowsing.vpnpromourl", "");
 
-// Whether the user is opted-in to privacy segmentation.
-pref("browser.privacySegmentation.enabled", false);
+// Enables the new private browsing indicator.
+pref("browser.privatebrowsing.enable-new-indicator", true);
+
+// Enables the new about:privatebrowsing logo.
+pref("browser.privatebrowsing.enable-new-logo", true);
+
+// Whether the user has opted-in to recommended settings for data features.
+pref("browser.dataFeatureRecommendations.enabled", false);
+
+// Temporary pref to control whether or not Private Browsing windows show up
+// as separate icons in the Windows taskbar.
+pref("browser.privateWindowSeparation.enabled", true);
 
 // Use dark theme variant for PBM windows. This is only supported if the theme
 // sets darkTheme data.
-pref("browser.theme.dark-private-windows", false);
+pref("browser.theme.dark-private-windows", true);
 
 // Controls visibility of the privacy segmentation preferences section.
 pref("browser.privacySegmentation.preferences.show", false);
 
-// Suffix for the SUMO learn more link for the privacy segmentation checkbox.
-pref("browser.privacySegmentation.preferences.learnMoreURLSuffix", "data-features");
-
 pref("browser.sessionhistory.max_entries", 50);
 
 // Built-in default permissions.
@@ -654,17 +676,17 @@ pref("permissions.default.camera", 1);
 pref("permissions.default.microphone", 1);
 pref("permissions.default.geo", 0);
 pref("permissions.default.xr", 0);
-pref("permissions.default.desktop-notification", 1);
+pref("permissions.default.desktop-notification", 0);
 pref("permissions.default.shortcuts", 0);
 
 pref("permissions.desktop-notification.postPrompt.enabled", true);
 pref("permissions.desktop-notification.notNow.enabled", false);
 
-pref("permissions.fullscreen.allowed", true);
+pref("permissions.fullscreen.allowed", false);
 
 // handle links targeting new windows
 // 1=current window/tab, 2=new window, 3=new tab in most recent window
-pref("browser.link.open_newwindow", 2);
+pref("browser.link.open_newwindow", 3);
 
 // handle external links (i.e. links opened from a different application)
 // default: use browser.link.open_newwindow
@@ -701,8 +723,8 @@ pref("browser.tabs.insertRelatedAfterCurrent", true);
 // the value of browser.tabs.insertRelatedAfterCurrent.
 pref("browser.tabs.insertAfterCurrent", false);
 pref("browser.tabs.warnOnClose", false);
-pref("browser.tabs.warnOnCloseOtherTabs", false);
-pref("browser.tabs.warnOnOpen", false);
+pref("browser.tabs.warnOnCloseOtherTabs", true);
+pref("browser.tabs.warnOnOpen", true);
 pref("browser.tabs.maxOpenBeforeWarn", 15);
 pref("browser.tabs.loadInBackground", true);
 pref("browser.tabs.opentabfor.middleclick", true);
@@ -717,7 +739,7 @@ pref("browser.tabs.tabMinWidth", 76);
 pref("browser.tabs.secondaryTextUnsupportedLocales", "ar,bn,bo,ckb,fa,gu,he,hi,ja,km,kn,ko,lo,mr,my,ne,pa,si,ta,te,th,ur,zh");
 
 //Control the visibility of Tab Manager Menu.
-pref("browser.tabs.tabmanager.enabled", false);
+pref("browser.tabs.tabmanager.enabled", true);
 
 // When tabs opened by links in other tabs via a combination of
 // browser.link.open_newwindow being set to 3 and target="_blank" etc are
@@ -752,7 +774,9 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
 pref("browser.tabs.tooltipsShowPidAndActiveness", false);
 #endif
 
-pref("browser.tabs.firefox-view", false);
+pref("browser.tabs.firefox-view", true);
+pref("browser.tabs.firefox-view.logLevel", "Warn");
+pref("browser.tabs.firefox-view.notify-for-tabs", false);
 
 // allow_eval_* is enabled on Firefox Desktop only at this
 // point in time
@@ -762,7 +786,11 @@ pref("security.allow_eval_in_parent_process", false);
 pref("security.allow_parent_unrestricted_js_loads", false);
 
 // Unload tabs when available memory is running low
-pref("browser.tabs.unloadOnLowMemory", true);
+#if defined(XP_MACOSX) || defined(XP_WIN)
+    pref("browser.tabs.unloadOnLowMemory", true);
+#else
+    pref("browser.tabs.unloadOnLowMemory", false);
+#endif
 
 // Tab Unloader does not unload tabs whose last inactive period is longer than
 // this value (in milliseconds).
@@ -866,8 +894,6 @@ pref("privacy.cpd.openWindows",             false);
 
 pref("privacy.history.custom",              false);
 
-pref("privacy.resistFingerprinting",        true);
-
 // What default should we use for the time span in the sanitizer:
 // 0 - Clear everything
 // 1 - Last Hour
@@ -998,10 +1024,6 @@ pref("accessibility.typeaheadfind.timeout", 5000);
 pref("accessibility.typeaheadfind.linksonly", false);
 pref("accessibility.typeaheadfind.flashBar", 1);
 
-// Accessibility indicator preferences such as support URL, enabled flag.
-pref("accessibility.support.url", "https://support.mozilla.org/%LOCALE%/kb/accessibility-services");
-pref("accessibility.indicator.enabled", false);
-
 pref("plugins.testmode", false);
 
 // Should plugins that are hidden show the infobar UI?
@@ -1013,9 +1035,6 @@ pref("plugins.show_infobar", false);
   pref("plugin.default.state", 1);
 #endif
 
-// Enables the download and use of the flash blocklists.
-pref("plugins.flashBlock.enabled", true);
-
 // Prefer HTML5 video over Flash content, and don't
 // load plugin instances with no src declared.
 // These prefs are documented in details on all.js.
@@ -1024,12 +1043,6 @@ pref("plugins.flashBlock.enabled", true);
 pref("plugins.favorfallback.mode", "follow-ctp");
 pref("plugins.favorfallback.rules", "nosrc,video");
 
-#ifdef XP_WIN
-  pref("browser.preferences.instantApply", false);
-#else
-  pref("browser.preferences.instantApply", true);
-#endif
-
 // Toggling Search bar on and off in about:preferences
 pref("browser.preferences.search", true);
 #if defined(NIGHTLY_BUILD)
@@ -1037,7 +1050,7 @@ pref("browser.preferences.experimental", true);
 #else
 pref("browser.preferences.experimental", false);
 #endif
-pref("browser.preferences.moreFromMozilla", false);
+pref("browser.preferences.moreFromMozilla", true);
 pref("browser.preferences.experimental.hidden", false);
 pref("browser.preferences.defaultPerformanceSettings.enabled", true);
 
@@ -1064,8 +1077,8 @@ pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/fi
 pref("browser.xr.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/xr/");
 
 pref("browser.sessionstore.resume_from_crash", true);
-pref("browser.sessionstore.resume_session_once", true);
-pref("browser.sessionstore.resuming_after_os_restart", true);
+pref("browser.sessionstore.resume_session_once", false);
+pref("browser.sessionstore.resuming_after_os_restart", false);
 
 // Minimal interval between two save operations in milliseconds (while the user is idle).
 pref("browser.sessionstore.interval.idle", 3600000); // 1h
@@ -1109,6 +1122,8 @@ pref("browser.sessionstore.upgradeBackup.maxUpgradeBackups", 3);
 pref("browser.sessionstore.debug", false);
 // Forget closed windows/tabs after two weeks
 pref("browser.sessionstore.cleanup.forget_closed_after", 1209600000);
+// Platform collects session storage data for session store
+pref("browser.sessionstore.collect_session_storage", true);
 
 // Don't quit the browser when Ctrl + Q is pressed.
 pref("browser.quitShortcut.disabled", false);
@@ -1225,8 +1240,6 @@ pref("browser.bookmarks.editDialog.maxRecentFolders", 7);
 // just save on Accept, once the project is complete.
 pref("browser.bookmarks.editDialog.delayedApply.enabled", false);
 
-pref("dom.ipc.shims.enabledWarnings", false);
-
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
   // This controls the strength of the Windows content process sandbox for
   // testing purposes. This will require a restart.
@@ -1335,7 +1348,12 @@ pref("dom.ipc.shims.enabledWarnings", false);
   pref("browser.taskbar.lists.refreshInSeconds", 120);
 #endif
 
-// Preferences to be synced by default
+// Preferences to be synced by default.
+// Preferences with the prefix `services.sync.prefs.sync-seen.` should have
+// a value of `false`, and means the value of the pref will be synced as soon
+// as a value for the pref is "seen", even if it is the default, and should be
+// used for prefs we sync but which have different values on different channels,
+// platforms or distributions.
 pref("services.sync.prefs.sync.accessibility.blockautorefresh", true);
 pref("services.sync.prefs.sync.accessibility.browsewithcaret", true);
 pref("services.sync.prefs.sync.accessibility.typeaheadfind", true);
@@ -1353,6 +1371,7 @@ pref("services.sync.prefs.sync.browser.crashReports.unsubmittedCheck.autoSubmit2
 pref("services.sync.prefs.sync.browser.ctrlTab.sortByRecentlyUsed", true);
 pref("services.sync.prefs.sync.browser.discovery.enabled", true);
 pref("services.sync.prefs.sync.browser.download.useDownloadDir", true);
+pref("services.sync.prefs.sync.browser.firefox-view.feature-tour", true);
 pref("services.sync.prefs.sync.browser.formfill.enable", true);
 pref("services.sync.prefs.sync.browser.link.open_newwindow", true);
 pref("services.sync.prefs.sync.browser.menu.showViewImageInfo", true);
@@ -1367,14 +1386,19 @@ pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.feeds.snippets
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.feeds.section.topstories", true);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.topstories.rows", true);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.feeds.section.highlights", true);
+// Some linux distributions disable all highlights by default.
+pref("services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights", false);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highlights.includeVisited", true);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highlights.includeBookmarks", true);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highlights.includeDownloads", true);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highlights.includePocket", true);
+// Some linux distributions disable just pocket by default.
+pref("services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights.includePocket", false);
 pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.section.highlights.rows", true);
 pref("services.sync.prefs.sync.browser.newtabpage.enabled", true);
 pref("services.sync.prefs.sync.browser.newtabpage.pinned", true);
 pref("services.sync.prefs.sync.browser.offline-apps.notify", true);
+pref("services.sync.prefs.sync.browser.pdfjs.feature-tour", true);
 pref("services.sync.prefs.sync.browser.safebrowsing.downloads.enabled", true);
 pref("services.sync.prefs.sync.browser.safebrowsing.downloads.remote.block_potentially_unwanted", true);
 pref("services.sync.prefs.sync.browser.safebrowsing.malware.enabled", true);
@@ -1406,15 +1430,18 @@ pref("services.sync.prefs.sync.dom.security.https_only_mode_pbm", true);
 pref("services.sync.prefs.sync.extensions.update.enabled", true);
 pref("services.sync.prefs.sync.extensions.activeThemeID", true);
 pref("services.sync.prefs.sync.general.autoScroll", true);
+// general.autoScroll has a different default on Linux vs elsewhere.
+pref("services.sync.prefs.sync-seen.general.autoScroll", false);
 pref("services.sync.prefs.sync.general.smoothScroll", true);
 pref("services.sync.prefs.sync.intl.accept_languages", true);
 pref("services.sync.prefs.sync.intl.regional_prefs.use_os_locales", true);
 pref("services.sync.prefs.sync.layout.spellcheckDefault", true);
 pref("services.sync.prefs.sync.media.autoplay.default", true);
 pref("services.sync.prefs.sync.media.eme.enabled", true);
+// Some linux distributions disable eme by default.
+pref("services.sync.prefs.sync-seen.media.eme.enabled", false);
 pref("services.sync.prefs.sync.media.videocontrols.picture-in-picture.video-toggle.enabled", true);
 pref("services.sync.prefs.sync.network.cookie.cookieBehavior", true);
-pref("services.sync.prefs.sync.network.cookie.lifetimePolicy", true);
 pref("services.sync.prefs.sync.network.cookie.thirdparty.sessionOnly", true);
 pref("services.sync.prefs.sync.permissions.default.image", true);
 pref("services.sync.prefs.sync.pref.downloads.disable_button.edit_actions", true);
@@ -1464,7 +1491,7 @@ pref("services.sync.syncedTabs.showRemoteIcons", true);
 // A preference (in milliseconds) controlling if we sync after a tab change and
 // how long to delay before we schedule the sync
 // Anything <= 0 means disabled
-pref("services.sync.syncedTabs.syncDelayAfterTabChange", 0);
+pref("services.sync.syncedTabs.syncDelayAfterTabChange", 5000);
 
 // Whether the character encoding menu is under the main Firefox button. This
 // preference is a string so that localizers can alter it.
@@ -1521,7 +1548,7 @@ pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "{\
 // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
 // repackager of this code using an alternate snippet url, please keep your users safe
 pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{\"id\":\"snippets\",\"enabled\":false,\"type\":\"remote\",\"url\":\"https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/\",\"updateCycleInMs\":14400000}");
-pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"messageGroups\":[\"cfr\",\"aboutwelcome\",\"infobar\",\"spotlight\",\"moments-page\",\"pbNewtab\"],\"updateCycleInMs\":3600000}");
+pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"updateCycleInMs\":3600000}");
 
 // ASRouter user prefs
 pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", true);
@@ -1534,16 +1561,14 @@ pref("browser.newtabpage.activity-stream.asrouter.useRemoteL10n", true);
 // These prefs control if Discovery Stream is enabled.
 pref("browser.newtabpage.activity-stream.discoverystream.enabled", true);
 pref("browser.newtabpage.activity-stream.discoverystream.hardcoded-basic-layout", false);
-// A preset compact layout, similar to setting a collection of prefs to build a complete layout.
-pref("browser.newtabpage.activity-stream.discoverystream.compactLayout.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.hybridLayout.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.hideCardBackground.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.fourCardLayout.enabled", false);
-pref("browser.newtabpage.activity-stream.discoverystream.loadMore.enabled", false);
-pref("browser.newtabpage.activity-stream.discoverystream.lastCardMessage.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.newFooterSection.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.saveToPocketCard.enabled", false);
+pref("browser.newtabpage.activity-stream.discoverystream.saveToPocketCardRegions", "");
 pref("browser.newtabpage.activity-stream.discoverystream.hideDescriptions.enabled", false);
+pref("browser.newtabpage.activity-stream.discoverystream.hideDescriptionsRegions", "");
 pref("browser.newtabpage.activity-stream.discoverystream.compactGrid.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.compactImages.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.imageGradient.enabled", false);
@@ -1552,6 +1577,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.descLines", 3);
 pref("browser.newtabpage.activity-stream.discoverystream.readTime.enabled", true);
 pref("browser.newtabpage.activity-stream.discoverystream.newSponsoredLabel.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.essentialReadsHeader.enabled", false);
+pref("browser.newtabpage.activity-stream.discoverystream.recentSaves.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.editorsPicksHeader.enabled", false);
 pref("browser.newtabpage.activity-stream.discoverystream.spoc-positions", "1,5,7,11,18,20");
 pref("browser.newtabpage.activity-stream.discoverystream.widget-positions", "");
@@ -1560,6 +1586,11 @@ pref("browser.newtabpage.activity-stream.discoverystream.spocs-endpoint", "");
 pref("browser.newtabpage.activity-stream.discoverystream.spocs-endpoint-query", "");
 pref("browser.newtabpage.activity-stream.discoverystream.sponsored-collections.enabled", false);
 
+// Changes the spoc content.
+pref("browser.newtabpage.activity-stream.discoverystream.spocAdTypes", "");
+pref("browser.newtabpage.activity-stream.discoverystream.spocZoneIds", "");
+pref("browser.newtabpage.activity-stream.discoverystream.spocSiteId", "");
+
 pref("browser.newtabpage.activity-stream.discoverystream.sendToPocket.enabled", false);
 
 // List of regions that do not get stories, regardless of locale-list-config.
@@ -1611,6 +1642,8 @@ pref("browser.aboutwelcome.enabled", true);
 // Used to set multistage welcome UX
 pref("browser.aboutwelcome.screens", "");
 pref("browser.aboutwelcome.skipFocus", true);
+// Used to enable template for MR 2022 Onboarding
+pref("browser.aboutwelcome.templateMR", true);
 
 // The pref that controls if the What's New panel is enabled.
 pref("browser.messaging-system.whatsNewPanel.enabled", true);
@@ -1621,6 +1654,7 @@ pref("messaging-system.log", "warn");
 pref("messaging-system.rsexperimentloader.enabled", true);
 pref("messaging-system.rsexperimentloader.collection_id", "nimbus-desktop-experiments");
 pref("nimbus.debug", false);
+pref("nimbus.validation.enabled", true);
 
 // Enable the DOM fullscreen API.
 pref("full-screen-api.enabled", true);
@@ -1657,9 +1691,6 @@ pref("security.app_menu.recordEventTelemetry", true);
 // Block insecure active content on https pages
 pref("security.mixed_content.block_active_content", true);
 
-// Show in-content login form warning UI for insecure login fields
-pref("security.insecure_field_warning.contextual.enabled", true);
-
 // Show degraded UI for http pages.
 pref("security.insecure_connection_icon.enabled", true);
 // Show degraded UI for http pages in private mode.
@@ -1759,12 +1790,8 @@ pref("media.gmp-gmpopenh264.enabled", true);
 // Set Firefox to block autoplay, asking for permission by default.
 pref("media.autoplay.default", 1); // 0=Allowed, 1=Blocked, 5=All Blocked
 
-#ifdef NIGHTLY_BUILD
-  // Block WebAudio from playing automatically.
-  pref("media.autoplay.block-webaudio", true);
-#else
-  pref("media.autoplay.block-webaudio", false);
-#endif
+// Block WebAudio from playing automatically.
+pref("media.autoplay.block-webaudio", true);
 
 pref("media.videocontrols.picture-in-picture.enabled", true);
 pref("media.videocontrols.picture-in-picture.audio-toggle.enabled", true);
@@ -1802,21 +1829,19 @@ pref("browser.ping-centre.log", false);
 // Enable GMP support in the addon manager.
 pref("media.gmp-provider.enabled", true);
 
-#ifdef NIGHTLY_BUILD
-// Enable Dynamic First-Party Isolation in Nightly.
+// Enable Dynamic First-Party Isolation by default.
 pref("network.cookie.cookieBehavior", 5 /* BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN */);
-#else
-// Enable blocking access to storage from tracking resources by default.
-pref("network.cookie.cookieBehavior", 4 /* BEHAVIOR_REJECT_TRACKER */);
-#endif
 
 // Whether to show the section in preferences which allows users to opt-in to
 // Total Cookie Protection (dFPI) in standard mode.
 pref("privacy.restrict3rdpartystorage.rollout.preferences.TCPToggleInStandard", false);
 
-// Target URL for the learn more link of the TCP in standard mode section.
+// Target URL for the learn more link of the TCP in standard mode rollout section.
 pref("privacy.restrict3rdpartystorage.rollout.preferences.learnMoreURLSuffix", "total-cookie-protection");
 
+// Target URL for the learn more link of the TCP in standard mode section.
+pref("privacy.restrict3rdpartystorage.preferences.learnMoreURLSuffix", "total-cookie-protection");
+
 // Enable Dynamic First-Party Isolation in the private browsing mode.
 pref("network.cookie.cookieBehavior.pbmode", 5 /* BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN */);
 
@@ -1871,6 +1896,9 @@ pref("browser.contentblocking.reject-and-isolate-cookies.preferences.ui.enabled"
 //   Query parameter stripping:
 //     "qps": Query parameter stripping enabled
 //     "-qps": Query parameter stripping disabled
+//   Query parameter stripping for private windows:
+//     "qpsPBM": Query parameter stripping enabled in private windows
+//     "-qpsPBM": Query parameter stripping disabled in private windows
 //   Cookie behavior:
 //     "cookieBehavior0": cookie behaviour BEHAVIOR_ACCEPT
 //     "cookieBehavior1": cookie behaviour BEHAVIOR_REJECT_FOREIGN
@@ -1886,7 +1914,7 @@ pref("browser.contentblocking.reject-and-isolate-cookies.preferences.ui.enabled"
 //     "cookieBehaviorPBM4": cookie behaviour BEHAVIOR_REJECT_TRACKER
 //     "cookieBehaviorPBM5": cookie behaviour BEHAVIOR_REJECT_TRACKER_AND_PARTITION_FOREIGN
 // One value from each section must be included in the browser.contentblocking.features.strict pref.
-pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior5,cookieBehaviorPBM5,cm,fp,stp,lvl2,rp,rpTop,ocsp,qps");
+pref("browser.contentblocking.features.strict", "tp,tpPrivate,cookieBehavior5,cookieBehaviorPBM5,cm,fp,stp,lvl2,rp,rpTop,ocsp,qps,qpsPBM");
 
 // Hide the "Change Block List" link for trackers/tracking content in the custom
 // Content Blocking/ETP panel. By default, it will not be visible. There is also
@@ -1917,7 +1945,7 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
 pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
 
 // Default to enabling VPN promo messages to be shown when specified and allowed
-pref("browser.vpn_promo.enabled", false);
+pref("browser.vpn_promo.enabled", true);
 // Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes.
 // The most recent list of supported countries can be found at https://support.mozilla.org/en-US/kb/mozilla-vpn-countries-available-subscribe
 // The full list of supported country codes can also be found at https://github.com/mozilla/bedrock/search?q=VPN_COUNTRY_CODES
@@ -1931,9 +1959,12 @@ pref("browser.promo.focus.disallowed_regions", "cn");
 // Default to enabling focus promos to be shown where allowed.
 pref("browser.promo.focus.enabled", true);
 
+// Default to enabling pin promos to be shown where allowed.
+pref("browser.promo.pin.enabled", true);
+
 // Comma separated string of mozilla vpn supported platforms.
 pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");
-pref("browser.contentblocking.report.hide_vpn_banner", true);
+pref("browser.contentblocking.report.hide_vpn_banner", false);
 pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA");
 
 pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections");
@@ -1992,9 +2023,9 @@ pref("privacy.userContext.newTabContainerOnLeftClick.enabled", false);
 pref("privacy.webrtc.allowSilencingNotifications", true);
 // Set to true to use the legacy WebRTC global indicator
 pref("privacy.webrtc.legacyGlobalIndicator", false);
-pref("privacy.webrtc.hideGlobalIndicator", true);
+pref("privacy.webrtc.hideGlobalIndicator", false);
 #else
-pref("privacy.webrtc.allowSilencingNotifications", true);
+pref("privacy.webrtc.allowSilencingNotifications", false);
 pref("privacy.webrtc.legacyGlobalIndicator", true);
 #endif
 
@@ -2039,8 +2070,8 @@ pref("browser.tabs.crashReporting.includeURL", false);
 // nightly and developer edition.
 pref("extensions.experiments.enabled", false);
 
-#if defined(XP_WIN)
-  // Allows us to deprioritize the processes of background tabs at an OS level
+#if defined(XP_LINUX) || defined(XP_WIN)
+  // Allows us to adjust the priority of child processes at the OS level
   pref("dom.ipc.processPriorityManager.enabled", true);
 #endif
 
@@ -2080,9 +2111,25 @@ pref("dom.ipc.processPrelaunch.enabled", false);
 pref("dom.ipc.processPrelaunch.enabled", true);
 #endif
 
+pref("browser.migrate.brave.enabled", true);
+pref("browser.migrate.canary.enabled", true);
+
+pref("browser.migrate.chrome.enabled", true);
 // See comments in bug 1340115 on how we got to these numbers.
 pref("browser.migrate.chrome.history.limit", 2000);
 pref("browser.migrate.chrome.history.maxAgeInDays", 180);
+
+pref("browser.migrate.chrome-beta.enabled", true);
+pref("browser.migrate.chrome-dev.enabled", true);
+pref("browser.migrate.chromium.enabled", true);
+pref("browser.migrate.chromium-360se.enabled", true);
+pref("browser.migrate.chromium-edge.enabled", true);
+pref("browser.migrate.chromium-edge-beta.enabled", true);
+pref("browser.migrate.edge.enabled", true);
+pref("browser.migrate.firefox.enabled", true);
+pref("browser.migrate.ie.enabled", true);
+pref("browser.migrate.safari.enabled", true);
+
 pref("browser.migrate.showBookmarksToolbarAfterMigration", true);
 
 pref("extensions.pocket.api", "api.getpocket.com");
@@ -2099,9 +2146,6 @@ pref("extensions.pocket.showHome", true);
 // Possibilities are: `control`, `control-one-button`, `variant_a`, `variant_b`, `variant_c`
 pref("extensions.pocket.loggedOutVariant", "control");
 
-// Enable the new Pocket panels.
-pref("extensions.pocket.refresh.layout.enabled", true);
-
 // Just for the new Pocket panels, enables the email signup button.
 pref("extensions.pocket.refresh.emailButton.enabled", false);
 // Hides the recently saved section in the home panel.
@@ -2218,16 +2262,6 @@ pref("app.normandy.onsync_skew_sec", 600);
   pref("intl.multilingual.aboutWelcome.languageMismatchEnabled", false);
 #endif
 
-// Simulate conditions that will happen when the browser
-// is running with Fission enabled. This is meant to assist
-// development and testing of Fission.
-// The current simulated conditions are:
-// - Don't propagate events from subframes to JS child actors
-pref("fission.frontend.simulate-events", false);
-// - Only deliver subframe messages that specifies
-//   their destination (using the BrowsingContext id).
-pref("fission.frontend.simulate-messages", false);
-
 // Coverage ping is disabled by default.
 pref("toolkit.coverage.enabled", false);
 pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
@@ -2278,20 +2312,26 @@ pref("devtools.toolbox.sidebar.width", 500);
 pref("devtools.toolbox.host", "bottom");
 pref("devtools.toolbox.previousHost", "right");
 pref("devtools.toolbox.selectedTool", "inspector");
-pref("devtools.toolbox.sideEnabled", true);
 pref("devtools.toolbox.zoomValue", "1");
 pref("devtools.toolbox.splitconsoleEnabled", false);
 pref("devtools.toolbox.splitconsoleHeight", 100);
 pref("devtools.toolbox.tabsOrder", "");
+// This is only used for local Web Extension debugging,
+// and allows to keep the window on top of all others,
+// so that you can debug the Firefox window, while keeping the devtools
+// always visible
+pref("devtools.toolbox.alwaysOnTop", true);
 
 // The fission pref for enabling the "Multiprocess Browser Toolbox", which will
-// make it possible to debug anything in Firefox (See Bug 1570639 for more
-// information).
-#if defined(NIGHTLY_BUILD)
+// make it possible to debug anything in Firefox (See Bug 1570639 for more information).
 pref("devtools.browsertoolbox.fission", true);
-#else
-pref("devtools.browsertoolbox.fission", false);
-#endif
+
+// When the Multiprocess Browser Toolbox is enabled, you can configure the scope of it:
+// - "everything" will enable debugging absolutely everything in the browser
+//   All processes, all documents, all workers, all add-ons.
+// - "parent-process" will restrict debugging to the parent process
+//   All privileged javascript, documents and workers running in the parent process.
+pref("devtools.browsertoolbox.scope", "parent-process");
 
 // This preference will enable watching top-level targets from the server side.
 pref("devtools.target-switching.server.enabled", true);
@@ -2459,14 +2499,9 @@ pref("devtools.netmonitor.har.forceExport", false);
 pref("devtools.netmonitor.har.pageLoadedTimeout", 1500);
 pref("devtools.netmonitor.har.enableAutoExportToFile", false);
 
-pref("devtools.netmonitor.features.webSockets", true);
-
 // netmonitor audit
 pref("devtools.netmonitor.audits.slow", 500);
 
-// Enable the EventSource Inspector
-pref("devtools.netmonitor.features.serverSentEvents", true);
-
 // Enable the new Edit and Resend panel
   pref("devtools.netmonitor.features.newEditAndResend", true);
 
@@ -2561,6 +2596,9 @@ pref("devtools.webconsole.groupWarningMessages", true);
 // Saved state of the Display content messages checkbox in the browser console.
 pref("devtools.browserconsole.contentMessages", false);
 
+// Enable network monitoring the browser toolbox console/browser console.
+pref("devtools.browserconsole.enableNetworkMonitoring", false);
+
 // Enable client-side mapping service for source maps
 pref("devtools.source-map.client-service.enabled", true);
 
@@ -2602,13 +2640,8 @@ pref("devtools.responsive.reloadNotification.enabled", true);
 pref("devtools.responsive.touchSimulation.enabled", false);
 // The user agent of the viewport.
 pref("devtools.responsive.userAgent", "");
-
-// Show the custom user agent input only in Nightly.
-#if defined(NIGHTLY_BUILD)
-  pref("devtools.responsive.showUserAgentInput", true);
-#else
-  pref("devtools.responsive.showUserAgentInput", false);
-#endif
+// Show the custom user agent input by default
+pref("devtools.responsive.showUserAgentInput", true);
 
 // Show tab debug targets for This Firefox (on by default for local builds).
 #ifdef MOZILLA_OFFICIAL
@@ -2691,7 +2724,7 @@ pref("svg.context-properties.content.allowed-domains", "profile.accounts.firefox
 pref("browser.snapshots.score.Visit", 1);
 pref("browser.snapshots.score.CurrentSession", 1);
 pref("browser.snapshots.score.IsUserPersisted", 1);
-pref("browser.snapshots.score.IsUsedRemoved", -10);
+pref("browser.snapshots.score.IsUserRemoved", -10);
 
 // A set of weights for the snapshot recommendation sources. The suffixes after
 // the last decimal map to the keys of `Snapshots.recommendationSources`.
@@ -2706,3 +2739,25 @@ pref("browser.snapshots.relevancy.timeOfDayIntervalSeconds", 3600);
 pref("browser.places.snapshots.expiration.days", 210);
 // For user managed snapshots we use more than a year, to support yearly tasks.
 pref("browser.places.snapshots.expiration.userManaged.days", 420);
+
+// If the user has seen the Firefox View feature tour this value reflects
+// the id of the last screen they saw and whether they completed the tour
+pref("browser.firefox-view.feature-tour", "{\"screen\":\"FIREFOX_VIEW_SPOTLIGHT\",\"complete\":false}");
+// Number of times the user visited about:firefoxview
+pref("browser.firefox-view.view-count", 0);
+
+// If the user has seen the pdf.js feature tour this value reflects the tour
+// message id, the id of the last screen they saw, and whether they completed the tour
+pref("browser.pdfjs.feature-tour", "{\"message\":\"PDF_JS_FEATURE_TOUR\",\"screen\":\"\",\"complete\":false}");
+
+// Enables cookie banner handling in Nightly in Private Browsing Mode. See
+// StaticPrefList.yaml for a description of the prefs.
+#ifdef NIGHTLY_BUILD
+  pref("cookiebanners.service.mode.privateBrowsing", 1);
+  pref("cookiebanners.bannerClicking.enabled", true);
+#endif
+
+// We only want to enable this pref for Desktop nightlies.
+#ifdef NIGHTLY_BUILD
+  pref("dom.sitepermsaddon-provider.enabled", true);
+#endif

From 46a9686929b296cc8fd481e868645634de3bda22 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:47:07 -0700
Subject: [PATCH 19/20] fix yml

---
 .github/workflows/build-win64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index a11f573ddd..4d9eccf8a5 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -23,7 +23,7 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
       
-        - name: Cache
+      - name: Cache
         uses: actions/cache@v2.1.6
         with:
         # A list of files, directories, and wildcard patterns to cache and restore

From fe6edb1ca725371d7c098e021fcda4419c170190 Mon Sep 17 00:00:00 2001
From: gamingdoom <37276884+gamingdoom@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:51:11 -0700
Subject: [PATCH 20/20] Update buildDatcordWin.sh

---
 buildDatcordWin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildDatcordWin.sh b/buildDatcordWin.sh
index 1fc2767d9d..0e0a068344 100644
--- a/buildDatcordWin.sh
+++ b/buildDatcordWin.sh
@@ -31,7 +31,7 @@ cd datcord
 mv firefox.exe datcord.exe
 cd ..
 cp ../windows/datcord.ico datcord/
-cp -r ../distribution .
+cp -r ../distribution datcord/
 # Based on librewolf mk.py
 mkdir x86-ansi
 wget -q -O ./x86-ansi/nsProcess.dll https://shorsh.de/upload/we7v/nsProcess.dll