diff --git a/Makefile.in b/Makefile.in
index ed00909cbb..6c23273884 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,7 @@ $(TIERS) binaries:: CLOBBER $(configure_dir)/configure config.status $(BUILD_BAC
 # try and make this not have to happen, we actually want dist/bin to be
 # completely removed regardless.
 default alldep all::
-	$(RM) -r $(DIST)/bin
+	@$(RM) -r $(DIST)/bin
 ifndef JS_STANDALONE
 ifdef COMPILE_ENVIRONMENT
 $(TIERS) binaries:: $(topsrcdir)/js/src/configure js/src/config.status
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index e1b4e8d62b..8e48af68ab 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -330,6 +330,10 @@ pref("browser.identity.display_punycode", 1);
 // Address bar RSS icon control, show by default
 pref("browser.urlbar.rss", true);
 
+// If changed to true, copying the entire URL from the location bar will put
+// the human readable (percent-decoded) URL on the clipboard.
+pref("browser.urlbar.decodeURLsOnCopy", false);
+
 pref("browser.altClickSave", true);
 
 // Enable logging downloads operations to the Error Console.
diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index a2970aefc3..37cabf5c26 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -321,7 +321,7 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
 }
 
 #identity-box.verifiedIdentity > #identity-icon-labels > #identity-icon-label {
-  -moz-margin-end: 0.25em !important;
+  margin-inline-end: 0.25em !important;
 }
 
 #wrapper-search-container > #search-container > #searchbar > .searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input {
diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index 71a74a0361..ae9b8d58f4 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -521,19 +521,17 @@
             uri = uriFixup.createExposableURI(uri);
           } catch (ex) {}
 
-          // If the entire URL is selected, just use the actual loaded URI.
-          if (inputVal == selectedVal) {
-            // ... but only if  isn't a javascript: or data: URI, since those
-            // are hard to read when encoded
-            if (!uri.schemeIs("javascript") && !uri.schemeIs("data")) {
-              selectedVal = uri.spec;
-            }
-
-            return selectedVal;
+          // If the entire URL is selected, just use the actual loaded URI,
+          // unless we want a decoded URI, or it's a data: or javascript: URI,
+          // since those are hard to read when encoded.
+          if (inputVal == selectedVal &&
+              !uri.schemeIs("javascript") && !uri.schemeIs("data") &&
+              !Services.prefs.getBoolPref("browser.urlbar.decodeURLsOnCopy")) {
+            return uri.spec;
           }
 
-          // Just the beginning of the URL is selected, check for a trimmed
-          // value
+          // Just the beginning of the URL is selected, or we want a decoded
+          // url. First check for a trimmed value.
           let spec = uri.spec;
           let trimmedSpec = this.trimValue(spec);
           if (spec != trimmedSpec) {
diff --git a/application/palemoon/branding/shared/pref/uaoverrides.inc b/application/palemoon/branding/shared/pref/uaoverrides.inc
index 587e442eeb..44d4a4b80d 100644
--- a/application/palemoon/branding/shared/pref/uaoverrides.inc
+++ b/application/palemoon/branding/shared/pref/uaoverrides.inc
@@ -18,7 +18,7 @@
 // This will result in an "only with Firefox" message which suits us fine, because it's the truth.
 pref("@GUAO_PREF@.addons.mozilla.org","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
 
-// Required for domains that have proven unresponsive to requests from users
+// Required for domains that are unresponsive to requests from users (or likely to be)
 pref("@GUAO_PREF@.live.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
 pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
 pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
@@ -33,6 +33,7 @@ pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefo
 pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
 pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:42.0) @GK_SLICE@ Firefox/42.0");
 pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
+pref("@GUAO_PREF@.patientaccess.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0 @PM_SLICE@");
 
 pref("@GUAO_PREF@.players.brightcove.net","Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko");
 
diff --git a/application/palemoon/components/abouthome/aboutHome.css b/application/palemoon/components/abouthome/aboutHome.css
index 2b062e8e7e..b41eab32af 100644
--- a/application/palemoon/components/abouthome/aboutHome.css
+++ b/application/palemoon/components/abouthome/aboutHome.css
@@ -63,7 +63,7 @@ a {
   display: -moz-box;
   -moz-box-align: center;
   padding-top: 2px;
-  -moz-padding-end: 8px;
+  padding-inline-end: 8px;
 }
 
 #searchLogoContainer[hidden] {
@@ -99,12 +99,12 @@ a {
 }
 
 #searchSubmit {
-  -moz-margin-start: -1px;
+  margin-inline-start: -1px;
   background: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;
   padding: 0 9px;
   border: 1px solid;
   border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
-  -moz-border-start: 1px solid transparent;
+  border-inline-start: 1px solid transparent;
   border-radius: 0 2.5px 2.5px 0;
   box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset,
               0 1px 0 hsla(0,0%,100%,.2);
@@ -279,7 +279,7 @@ body[narrow] #restorePreviousSession {
   display: inline-block; /* display on same line as text label */
   vertical-align: middle;
   margin-bottom: 0;
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
 }
 
 #restorePreviousSession:-moz-dir(rtl)::before {
diff --git a/application/palemoon/themes/linux/aboutCertError.css b/application/palemoon/themes/linux/aboutCertError.css
index dbb3530253..100bb3d3bb 100644
--- a/application/palemoon/themes/linux/aboutCertError.css
+++ b/application/palemoon/themes/linux/aboutCertError.css
@@ -33,7 +33,7 @@ h2 {
   border-radius: 10px;
   box-shadow: 0px 0px 8px red;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
   background-origin: content-box;
 }
@@ -43,16 +43,16 @@ h2 {
 }
 
 #errorTitle {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 #errorLongContent {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 .expander > button {
-  -moz-padding-start: 20px;
-  -moz-margin-start: -20px;
+  padding-inline-start: 20px;
+  margin-inline-start: -20px;
   background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
   border: none;
   font: inherit;
diff --git a/application/palemoon/themes/linux/aboutPrivateBrowsing.css b/application/palemoon/themes/linux/aboutPrivateBrowsing.css
index 2bb39d2950..a6fd549202 100644
--- a/application/palemoon/themes/linux/aboutPrivateBrowsing.css
+++ b/application/palemoon/themes/linux/aboutPrivateBrowsing.css
@@ -21,7 +21,7 @@ body.normal > #errorPageContainer {
 }
 
 #startPrivateBrowsingDesc > button {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #footerDesc > p {
@@ -30,7 +30,7 @@ body.normal > #errorPageContainer {
 
 #moreInfo {
   font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-  -moz-padding-start: 25px;
+  padding-inline-start: 25px;
   background: url("moz-icon://stock/gtk-dialog-info?size=menu") no-repeat top left;
 }
 
diff --git a/application/palemoon/themes/linux/aboutSessionRestore.css b/application/palemoon/themes/linux/aboutSessionRestore.css
index a32b9757a0..a58c104ce8 100644
--- a/application/palemoon/themes/linux/aboutSessionRestore.css
+++ b/application/palemoon/themes/linux/aboutSessionRestore.css
@@ -82,9 +82,9 @@ treechildren::-moz-tree-row(alternate, selected) {
 }
 
 #buttons {
-  -moz-margin-start: 80px; /* same as #errorLongContent in netError.css */
+  margin-inline-start: 80px; /* same as #errorLongContent in netError.css */
 }
 #buttons > button {
   margin-top: 2em;
-  -moz-margin-start: 5px;
+  margin-inline-start: 5px;
 }
diff --git a/application/palemoon/themes/linux/aboutSyncTabs.css b/application/palemoon/themes/linux/aboutSyncTabs.css
index 4f21a9d408..1fcd8304f7 100644
--- a/application/palemoon/themes/linux/aboutSyncTabs.css
+++ b/application/palemoon/themes/linux/aboutSyncTabs.css
@@ -22,18 +22,18 @@
   margin-top: 4px;
   width: 45em;
   height: 32px;
-  -moz-margin-start: 2em;
-  -moz-margin-end: 2em;
+  margin-inline-start: 2em;
+  margin-inline-end: 2em;
 }
 
 #tabsListHeading {
   font-size: 140%;
   font-weight: bold;
-  -moz-margin-start: 40px;
+  margin-inline-start: 40px;
 }
 
 richlistitem {
-  -moz-margin-end: 2em;
+  margin-inline-end: 2em;
 }
 
 richlistitem[selected="true"],
@@ -46,7 +46,7 @@ richlistitem[type="tab"] {
   border: #999999 1px solid !important;
   padding: 2px 5px;
   margin-bottom: 4px;
-  -moz-margin-start: 4em;
+  margin-inline-start: 4em;
   border-radius: 6px;
   background-color: menu;
   width: 44em;
@@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] {
 richlistitem[type="client"] {
   min-height: 2em;
   color: #000000;
-  -moz-margin-start: 2em;
+  margin-inline-start: 2em;
   margin-top: 2px;
   margin-bottom: 3px;
   width: 42em;
@@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] {
 }
 
 .tabIcon {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
   padding-top: 2px;
 }
diff --git a/application/palemoon/themes/linux/autocomplete.css b/application/palemoon/themes/linux/autocomplete.css
index ab926851dc..e23e6b001a 100644
--- a/application/palemoon/themes/linux/autocomplete.css
+++ b/application/palemoon/themes/linux/autocomplete.css
@@ -83,7 +83,7 @@ panel[type="private-autocomplete-richlistbox"],
 }
 
 .private-autocomplete-treebody::-moz-tree-cell-text {
-  -moz-padding-start: 8px;
+  padding-inline-start: 8px;
 }
 
 treechildren.private-autocomplete-treebody::-moz-tree-row(selected) {
@@ -143,15 +143,15 @@ treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) {
   width: 16px; 
   height: 16px;
   margin-bottom: -2px;
-  -moz-margin-start: 3px;
-  -moz-margin-end: 6px;
+  margin-inline-start: 3px;
+  margin-inline-end: 6px;
 }
 
 .ac-type-icon {
   width: 16px; 
   height: 16px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 4px;
+  margin-inline-start: 6px;
+  margin-inline-end: 4px;
 }
 
 .ac-extra > .ac-result-type-tag {
diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css
index 4933b40690..28956cdb1b 100644
--- a/application/palemoon/themes/linux/browser.css
+++ b/application/palemoon/themes/linux/browser.css
@@ -92,8 +92,8 @@ toolbarbutton.bookmark-item:hover:active,
 toolbarbutton.bookmark-item[open="true"] {
   padding-top: 3px;
   padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
 }
 
 .bookmark-item > .toolbarbutton-icon {
@@ -137,7 +137,7 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 /* Bookmark drag and drop styles */
@@ -157,7 +157,7 @@ menuitem.bookmark-item {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight;
 }
 
@@ -559,7 +559,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
 }
 
 .toolbarbutton-1 > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 toolbar[mode="full"] .toolbarbutton-1:not([type="menu-button"]),
@@ -897,7 +897,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 /* Fullscreen window controls */
 #window-controls {
   -moz-box-align: start;
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 #minimize-button {
@@ -923,7 +923,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 }
 
 .urlbar-input-box {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   min-width: 4em;
 }
 
@@ -948,25 +948,25 @@ toolbar[iconsize="small"] #webrtc-status-button {
 #urlbar-search-splitter {
   -moz-appearance: none;
   width: 8px;
-  -moz-margin-start: -4px;
+  margin-inline-start: -4px;
 }
 
 #urlbar-search-splitter + #urlbar-container > #urlbar ,
 #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #urlbar-display-box {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px;
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px;
 }
 
 #urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText;
 }
 
@@ -976,8 +976,8 @@ toolbar[iconsize="small"] #webrtc-status-button {
   height: 16px;
   margin-top: 2px;
   margin-bottom: 2px;
-  -moz-margin-start: 4px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 4px;
+  margin-inline-end: 3px;
   list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
@@ -1013,7 +1013,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 #identity-box {
   padding: 1px;
   margin: -1px;
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
   font-size: .9em;
 }
 
@@ -1033,13 +1033,13 @@ toolbar[iconsize="small"] #webrtc-status-button {
 }
 
 #identity-icon-labels {
-  -moz-padding-start: 2px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 2px;
+  padding-inline-end: 5px;
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
   color: rgb(95,127,67);
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   background-image: linear-gradient(rgba(226,246,208,1),
                                     rgba(203,235,177,1));
   background-position: right;
@@ -1048,7 +1048,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain {
   color: rgb(51,87,137);
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   background-image: linear-gradient(rgba(220,231,245,1),
                                     rgba(207,221,242,1));
   background-position: right;
@@ -1109,13 +1109,13 @@ toolbar[iconsize="small"] #webrtc-status-button {
 /* Identity popup body text */
 .identity-popup-description {
   white-space: pre-wrap;
-  -moz-padding-start: 15px;
+  padding-inline-start: 15px;
   margin: 2px 0 4px;
 }
 
 .identity-popup-label {
   white-space: pre-wrap;
-  -moz-padding-start: 15px;
+  padding-inline-start: 15px;
   margin: 0;
 }
 
@@ -1141,7 +1141,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
   margin-top: 10px;
-  -moz-margin-start: -18px;
+  margin-inline-start: -18px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
@@ -1162,7 +1162,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 .popup-notification-icon[popupid="geolocation"] {
@@ -1200,8 +1200,8 @@ toolbar[iconsize="small"] #webrtc-status-button {
 
 .popup-progress-label,
 .popup-progress-meter {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 .popup-progress-cancel {
@@ -1210,7 +1210,7 @@ toolbar[iconsize="small"] #webrtc-status-button {
   border: none;
   padding: 0;
   margin: 0;
-  -moz-margin-start: 5px;
+  margin-inline-start: 5px;
   min-height: 0;
   min-width: 0;
   list-style-image: url("moz-icon://stock/gtk-cancel?size=menu");
@@ -1252,13 +1252,13 @@ toolbar[iconsize="small"] #webrtc-status-button {
   border-width: 0 8px 0 0;
   border-style: solid;
   border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
-  -moz-margin-end: -8px;
+  margin-inline-end: -8px;
   margin-top: -1px;
   margin-bottom: -1px;
 }
 
 #notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
   border-radius: 0;
 }
 
@@ -1710,7 +1710,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tab-icon-image {
   width: 16px;
   height: 16px;
-  -moz-margin-end: 3px;
+  margin-inline-end: 3px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
@@ -1725,8 +1725,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tab-throbber[pinned],
 .tab-icon-image[pinned],
 .tabs-newtab-button > .toolbarbutton-icon {
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: 2px;
 }
 
 #context_reloadTab {
@@ -1766,12 +1766,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   padding: 0;
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
 }
 
 /* Tab sound indicator */
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0;
@@ -1876,13 +1876,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up {
-  -moz-border-start: 0;
-  -moz-border-end: 2px solid transparent;
+  border-inline-start: 0;
+  border-inline-end: 2px solid transparent;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
-  -moz-border-start: 2px solid transparent;
-  -moz-border-end: 0;
+  border-inline-start: 2px solid transparent;
+  border-inline-end: 0;
   transition: 1s box-shadow ease-out;
   border-radius: 4px;
 }
@@ -1952,7 +1952,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
 }
 
 toolbarbutton.chevron {
@@ -2040,8 +2040,8 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 }
 
 #allTabs-filter {
-  -moz-margin-start: 36px;
-  -moz-margin-end: 0;
+  margin-inline-start: 36px;
+  margin-inline-end: 0;
 }
 
 .allTabs-preview-label {
@@ -2051,7 +2051,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 /* Application button menu */
 
 .splitmenu-menuitem {
-  -moz-margin-end: 1px;
+  margin-inline-end: 1px;
 }
 
 #appmenu-toolbar-button:not(:hover):not([open]):not(:-moz-lwtheme) {
@@ -2064,7 +2064,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   margin-bottom: -2px !important;
 }
 #appmenuSecondaryPane {
-  -moz-border-start: 1px solid ThreeDShadow;
+  border-inline-start: 1px solid ThreeDShadow;
 }
 #appmenuSecondaryPane-spacer {
   min-height: 1em;
@@ -2184,7 +2184,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 2px;
+  margin-inline-end: 2px;
 }
 %endif
 
diff --git a/application/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css b/application/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css
index 3526e01d69..b417884725 100644
--- a/application/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css
+++ b/application/palemoon/themes/linux/downloads/allDownloadsViewOverlay.css
@@ -14,7 +14,7 @@
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   /* Prevent flickering when changing states. */
   min-height: 32px;
   min-width: 32px;
diff --git a/application/palemoon/themes/linux/downloads/downloads.css b/application/palemoon/themes/linux/downloads/downloads.css
index 79bb5ee579..368abd6770 100644
--- a/application/palemoon/themes/linux/downloads/downloads.css
+++ b/application/palemoon/themes/linux/downloads/downloads.css
@@ -51,7 +51,7 @@
 #downloadsSummary,
 richlistitem[type="download"] {
   height: 6em;
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
   color: inherit;
 }
 
@@ -96,7 +96,7 @@ richlistitem[type="download"]:last-child {
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   /* Prevent flickering when changing states. */
   min-height: 32px;
   min-width: 32px;
@@ -358,7 +358,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0;
 }
 
diff --git a/application/palemoon/themes/linux/engineManager.css b/application/palemoon/themes/linux/engineManager.css
index 18817cd4f2..c6d42cce29 100644
--- a/application/palemoon/themes/linux/engineManager.css
+++ b/application/palemoon/themes/linux/engineManager.css
@@ -5,8 +5,8 @@
 %endif
 
 #engineList treechildren::-moz-tree-image(engineName) {
-  -moz-margin-end: 4px;
-  -moz-margin-start: 1px;
+  margin-inline-end: 4px;
+  margin-inline-start: 1px;
   width: 16px;
   height: 16px;
 }
diff --git a/application/palemoon/themes/linux/feeds/subscribe-ui.css b/application/palemoon/themes/linux/feeds/subscribe-ui.css
index b3c0b37a2b..51eb7a1174 100644
--- a/application/palemoon/themes/linux/feeds/subscribe-ui.css
+++ b/application/palemoon/themes/linux/feeds/subscribe-ui.css
@@ -7,17 +7,17 @@
 }
 
 .handlersMenuPopup > menuitem {
-  -moz-padding-start: 23px;
+  padding-inline-start: 23px;
 }
 
 .handlersMenuPopup > menuitem.menuitem-iconic {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
   display: -moz-box;
   min-width: 16px;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
 }
 
 .chooseApplicationMenuItem {
diff --git a/application/palemoon/themes/linux/feeds/subscribe.css b/application/palemoon/themes/linux/feeds/subscribe.css
index dd1e24eef8..ac5de58650 100644
--- a/application/palemoon/themes/linux/feeds/subscribe.css
+++ b/application/palemoon/themes/linux/feeds/subscribe.css
@@ -10,7 +10,7 @@ html {
 #feedBody {
   border: 1px solid THreeDShadow;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   margin: 2em auto;
   background: -moz-Field;
 }
@@ -25,9 +25,9 @@ html {
 #feedHeader {  
   margin-top: 4.9em;
   margin-bottom: 1em;
-  -moz-margin-start: 1.4em;
-  -moz-margin-end: 1em;
-  -moz-padding-start: 2.9em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
   font-size: 110%;
   color: InfoText;
 }
@@ -54,12 +54,12 @@ html {
 
 #feedHeader[firstrun="true"] #feedIntroText {
   padding-top: 0.1em;
-  -moz-padding-start: 0.6em;
+  padding-inline-start: 0.6em;
   display: block;
 }
 
 #feedHeader[firstrun="true"] > #feedSubscribeLine {
-  -moz-padding-start: 1.8em;
+  padding-inline-start: 1.8em;
 }
 
 #feedSubscribeLine {
@@ -99,8 +99,8 @@ h2 {
 
 #feedTitleLink {
   float: right;
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -110,15 +110,15 @@ a[href] img {
 }
 
 #feedTitleContainer {
-  -moz-margin-start: 0;
-  -moz-margin-end: .6em;
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
   margin-top: 0;
   margin-bottom: 0;
 }
 
 #feedTitleImage {
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
   max-width: 300px;
diff --git a/application/palemoon/themes/linux/pageInfo.css b/application/palemoon/themes/linux/pageInfo.css
index 49ae4938a3..805c2fa458 100644
--- a/application/palemoon/themes/linux/pageInfo.css
+++ b/application/palemoon/themes/linux/pageInfo.css
@@ -75,7 +75,7 @@ textbox {
 }
 
 textbox.header {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .iframe {
@@ -94,7 +94,7 @@ textbox[disabled] {
 
 /* General Tab */
 #generalPanel > #titletext {
-  -moz-margin-start: 5px;
+  margin-inline-start: 5px;
 }
 
 groupbox.collapsable caption .caption-icon { 
@@ -102,8 +102,8 @@ groupbox.collapsable caption .caption-icon {
   height: 9px;
   background-repeat: no-repeat;
   background-position: center;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 1px;
+  margin-inline-end: 3px;
   background-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
@@ -121,13 +121,13 @@ groupbox tree {
 }
 
 groupbox.treebox .groupbox-body { 
-  -moz-margin-start: 5px;
-  -moz-margin-end: 1px;
+  margin-inline-start: 5px;
+  margin-inline-end: 1px;
   padding-top: 0;
 }
 
 #securityBox description { 
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 #general-security-identity {
@@ -182,8 +182,8 @@ treechildren::-moz-tree-cell-text(broken) {
 #feedListbox richlistitem {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
   color: -moz-FieldText;
@@ -229,8 +229,8 @@ treechildren::-moz-tree-cell-text(broken) {
 .permission {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
diff --git a/application/palemoon/themes/linux/permissions/aboutPermissions.css b/application/palemoon/themes/linux/permissions/aboutPermissions.css
index 386e167e68..17634e8fa7 100644
--- a/application/palemoon/themes/linux/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/linux/permissions/aboutPermissions.css
@@ -40,7 +40,7 @@
 .site-favicon {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
@@ -57,7 +57,7 @@
 
 #site-description {
   font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
+  margin-inline-start: 6px; /* to match button margin */
 }
 
 #site-label {
@@ -69,7 +69,7 @@
 #defaults-description {
   font-size: 125%;
   font-weight: bold;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 .pref-item {
@@ -79,7 +79,7 @@
 .pref-icon {
   width: 36px;
   height: 36px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 .pref-icon[type="password"] {
diff --git a/application/palemoon/themes/linux/places/editBookmarkOverlay.css b/application/palemoon/themes/linux/places/editBookmarkOverlay.css
index f1f6210b4d..dba6ba655d 100644
--- a/application/palemoon/themes/linux/places/editBookmarkOverlay.css
+++ b/application/palemoon/themes/linux/places/editBookmarkOverlay.css
@@ -24,7 +24,7 @@
 .expander-down {
   min-width: 0;
   padding: 2px 0;
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .expander-up > .button-box {
diff --git a/application/palemoon/themes/linux/places/organizer.css b/application/palemoon/themes/linux/places/organizer.css
index cabeebbca7..16ead7212f 100644
--- a/application/palemoon/themes/linux/places/organizer.css
+++ b/application/palemoon/themes/linux/places/organizer.css
@@ -47,7 +47,7 @@
 }
 
 #placesMenu > menu {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
   -moz-binding: url("chrome://browser/skin/places/organizer.xml#toolbarbutton-dropdown");
   -moz-appearance: toolbarbutton;
   color: -moz-DialogText;
@@ -74,7 +74,7 @@
 }
 
 #infoBoxExpanderLabel {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 #searchModifiers {
diff --git a/application/palemoon/themes/linux/preferences/applications.css b/application/palemoon/themes/linux/preferences/applications.css
index c9d1b8c8ae..8b63dfdab6 100644
--- a/application/palemoon/themes/linux/preferences/applications.css
+++ b/application/palemoon/themes/linux/preferences/applications.css
@@ -11,18 +11,18 @@
 .actionsMenu {
   margin-top: -1px;
   margin-bottom: -1px;
-  -moz-margin-start: -1px;
-  -moz-margin-end: 0;
+  margin-inline-start: -1px;
+  margin-inline-end: 0;
 }
 
 .typeIcon,
 .actionIcon {
-  -moz-margin-start: 3px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 3px;
+  margin-inline-end: 3px;
 }
 
 richlistitem label {
-  -moz-margin-start: 1px;
+  margin-inline-start: 1px;
   margin-top: 2px;
 }
 
@@ -51,16 +51,16 @@ menuitem[appHandlerIcon="plugin"] {
 }
 
 .actionsMenu .menulist-icon {
-  -moz-margin-end: 1px;
+  margin-inline-end: 1px;
   height: 16px;
   width: 16px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-padding-start: 0;
-  -moz-padding-end: 4px !important;
+  padding-inline-start: 0;
+  padding-inline-end: 4px !important;
 }
 
 .actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 3px;
+  padding-inline-start: 3px;
 }
diff --git a/application/palemoon/themes/linux/sanitizeDialog.css b/application/palemoon/themes/linux/sanitizeDialog.css
index 96cf3bcea8..28d4e7eb30 100644
--- a/application/palemoon/themes/linux/sanitizeDialog.css
+++ b/application/palemoon/themes/linux/sanitizeDialog.css
@@ -3,12 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #sanitizeDurationChoice {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 /* Align the duration label with the warning box and item list */
 #sanitizeDurationLabel {
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 
@@ -56,15 +56,15 @@
   padding: 0;
   margin-top: 6px;
   margin-bottom: 6px;
-  -moz-margin-start: -6px;
-  -moz-margin-end: 0;
+  margin-inline-start: -6px;
+  margin-inline-end: 0;
 }
 
 .expander-up,
 .expander-down {
   min-width: 0;
   padding: 2px 0;
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .expander-up {
@@ -86,8 +86,8 @@
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 /* Without this a useless scrollbar appears in the listbox when its rows
@@ -100,8 +100,8 @@
 
 /* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 .dialog-button[dlgtype="accept"] {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
diff --git a/application/palemoon/themes/linux/searchbar.css b/application/palemoon/themes/linux/searchbar.css
index cb6ecffcc0..0352e27a7c 100644
--- a/application/palemoon/themes/linux/searchbar.css
+++ b/application/palemoon/themes/linux/searchbar.css
@@ -26,7 +26,7 @@
   height: 16px;
   width: 16px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-margin-start: 2px;
+  margin-inline-start: 2px;
 }
 
 .searchbar-engine-button {
@@ -41,7 +41,7 @@
 .searchbar-engine-button > .button-box {
   -moz-appearance: none;
   padding: 2px 0;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
   border: 0;
 }
 
diff --git a/application/palemoon/themes/linux/statusbar/overlay.css b/application/palemoon/themes/linux/statusbar/overlay.css
index 2351aac4c3..d326bac3f8 100644
--- a/application/palemoon/themes/linux/statusbar/overlay.css
+++ b/application/palemoon/themes/linux/statusbar/overlay.css
@@ -57,7 +57,7 @@ toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 {
 	margin: 0px 2px !important;
 	margin-top: -1px !important;
-	-moz-margin-start: 4px !important;
+	margin-inline-start: 4px !important;
 }
 
 /*
@@ -81,7 +81,7 @@ splitter.status4evar-status-splitter
 
 #notification-popup-box
 {
-	-moz-margin-start: -1px;
+	margin-inline-start: -1px;
 }
 
 #urlbar .urlbar-over-link-box
diff --git a/application/palemoon/themes/linux/syncCommon.css b/application/palemoon/themes/linux/syncCommon.css
index 9a84cebee9..9ad7214aae 100644
--- a/application/palemoon/themes/linux/syncCommon.css
+++ b/application/palemoon/themes/linux/syncCommon.css
@@ -8,7 +8,7 @@
 }
 
 .statusIcon {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   max-height: 16px;
   max-width: 16px;
 }
diff --git a/application/palemoon/themes/linux/syncSetup.css b/application/palemoon/themes/linux/syncSetup.css
index 4c6518a1b7..f84fd08ad0 100644
--- a/application/palemoon/themes/linux/syncSetup.css
+++ b/application/palemoon/themes/linux/syncSetup.css
@@ -99,7 +99,7 @@ description > .text-link:focus {
 }
 
 .inputColumn {
-  -moz-margin-end: 2px
+  margin-inline-end: 2px
 }
 
 .pin {
diff --git a/application/palemoon/themes/osx/Toolbar-glass.png b/application/palemoon/themes/osx/Toolbar-glass.png
deleted file mode 100644
index 23cc4bfaf4..0000000000
Binary files a/application/palemoon/themes/osx/Toolbar-glass.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/Toolbar-inverted.png b/application/palemoon/themes/osx/Toolbar-inverted.png
index 2c3253fe80..54d83bf5f2 100644
Binary files a/application/palemoon/themes/osx/Toolbar-inverted.png and b/application/palemoon/themes/osx/Toolbar-inverted.png differ
diff --git a/application/palemoon/themes/osx/Toolbar-inverted.svg b/application/palemoon/themes/osx/Toolbar-inverted.svg
new file mode 100644
index 0000000000..ce59313e68
--- /dev/null
+++ b/application/palemoon/themes/osx/Toolbar-inverted.svg
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   enable-background="new 0 0 378 38"
+   viewBox="0 0 378 38"
+   height="38"
+   width="378"
+   y="0px"
+   x="0px"
+   id="strataToolbarSVG"
+   version="1.1">
+  <metadata
+     id="metadata146">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs144">
+    <filter
+       id="filter1070"
+       style="color-interpolation-filters:sRGB;">
+      <feFlood
+         id="feFlood1060"
+         result="flood"
+         flood-color="rgb(0,0,0)"
+         flood-opacity="0.498039" />
+      <feComposite
+         id="feComposite1062"
+         result="composite1"
+         operator="in"
+         in2="SourceGraphic"
+         in="flood" />
+      <feGaussianBlur
+         id="feGaussianBlur1064"
+         result="blur"
+         stdDeviation="0.5"
+         in="composite1" />
+      <feOffset
+         id="feOffset1066"
+         result="offset"
+         dy="0"
+         dx="0" />
+      <feComposite
+         id="feComposite1068"
+         result="fbSourceGraphic"
+         operator="over"
+         in2="offset"
+         in="SourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix1072"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         in="fbSourceGraphic"
+         result="fbSourceGraphicAlpha" />
+      <feFlood
+         in="fbSourceGraphic"
+         result="flood"
+         flood-color="rgb(0,0,0)"
+         flood-opacity="0.498039"
+         id="feFlood1074" />
+      <feComposite
+         result="composite1"
+         operator="in"
+         in="flood"
+         id="feComposite1076"
+         in2="fbSourceGraphic" />
+      <feGaussianBlur
+         result="blur"
+         stdDeviation="0.5"
+         in="composite1"
+         id="feGaussianBlur1078" />
+      <feOffset
+         result="offset"
+         dy="0"
+         dx="0"
+         id="feOffset1080" />
+      <feComposite
+         result="fbSourceGraphic"
+         operator="over"
+         in="fbSourceGraphic"
+         id="feComposite1082"
+         in2="offset" />
+      <feColorMatrix
+         id="feColorMatrix1084"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         in="fbSourceGraphic"
+         result="fbSourceGraphicAlpha" />
+      <feFlood
+         in="fbSourceGraphic"
+         result="flood"
+         flood-color="rgb(0,0,0)"
+         flood-opacity="0.498039"
+         id="feFlood1086" />
+      <feComposite
+         result="composite1"
+         operator="in"
+         in="flood"
+         id="feComposite1088"
+         in2="fbSourceGraphic" />
+      <feGaussianBlur
+         result="blur"
+         stdDeviation="0.5"
+         in="composite1"
+         id="feGaussianBlur1090" />
+      <feOffset
+         result="offset"
+         dy="0"
+         dx="0"
+         id="feOffset1092" />
+      <feComposite
+         result="fbSourceGraphic"
+         operator="over"
+         in="fbSourceGraphic"
+         id="feComposite1094"
+         in2="offset" />
+      <feColorMatrix
+         id="feColorMatrix1096"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         in="fbSourceGraphic"
+         result="fbSourceGraphicAlpha" />
+      <feFlood
+         in="fbSourceGraphic"
+         result="flood"
+         flood-color="rgb(0,0,0)"
+         flood-opacity="0.498039"
+         id="feFlood1098" />
+      <feComposite
+         result="composite1"
+         operator="in"
+         in="flood"
+         id="feComposite1100"
+         in2="fbSourceGraphic" />
+      <feGaussianBlur
+         result="blur"
+         stdDeviation="0.5"
+         in="composite1"
+         id="feGaussianBlur1102" />
+      <feOffset
+         result="offset"
+         dy="0"
+         dx="0"
+         id="feOffset1104" />
+      <feComposite
+         result="fbSourceGraphic"
+         operator="over"
+         in="fbSourceGraphic"
+         id="feComposite1106"
+         in2="offset" />
+      <feColorMatrix
+         id="feColorMatrix1108"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         in="fbSourceGraphic"
+         result="fbSourceGraphicAlpha" />
+      <feFlood
+         in="fbSourceGraphic"
+         result="flood"
+         flood-color="rgb(0,0,0)"
+         flood-opacity="0.498039"
+         id="feFlood1110" />
+      <feComposite
+         result="composite1"
+         operator="in"
+         in="flood"
+         id="feComposite1112"
+         in2="fbSourceGraphic" />
+      <feGaussianBlur
+         result="blur"
+         stdDeviation="0.5"
+         in="composite1"
+         id="feGaussianBlur1114" />
+      <feOffset
+         result="offset"
+         dy="0"
+         dx="0"
+         id="feOffset1116" />
+      <feComposite
+         result="composite2"
+         operator="over"
+         in="fbSourceGraphic"
+         id="feComposite1118"
+         in2="offset" />
+    </filter>
+  </defs>
+  <g
+     style="fill:#ffffff;filter:url(#filter1070)"
+     id="toolbar">
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 14.7,10.7 C 14.464283,10.935746 14.000125,11 14.000125,11 H 9 l 2.132,2.085573 c 0.519423,0.508112 0.595,1.2729 0.198,1.6979 l -0.793,0.9549 c -0.396,0.424 -1.091,0.318 -1.587,-0.212 L 3.595,9.690773 3,8.946873 l 0.595,-0.743 5.256,-5.7295 c 0.496,-0.531 1.19,-0.637 1.587,-0.212 l 0.794,0.9549 c 0.396,0.425 0.297,1.1669 -0.198,1.6979 L 9,7 h 4.999875 c 0,0 0.464437,0.064342 0.700125,0.3 0.235717,0.2356875 0.299875,0.7 0.299875,0.7 l 2.5e-4,2 c 0,0 -0.06444,0.464283 -0.300125,0.7 z"
+       id="back" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="back-large"
+       d="m 16.441631,29.733331 c -0.275,0.275034 -0.816512,0.349996 -0.816512,0.349996 H 8.999927 l 2.487308,2.516543 c 0.595913,0.602917 0.694159,1.485034 0.230997,1.980862 l -0.925157,1.114039 C 10.33108,36.189432 9.5202547,36.065767 8.9415947,35.44744 L 2.6941594,28.639311 2,27.771437 2.6941594,26.904612 8.8260957,20.220265 c 0.57866,-0.619493 1.3883193,-0.743159 1.8514803,-0.24733 l 0.926324,1.114038 c 0.461995,0.495828 0.346497,1.361369 -0.230997,1.980863 l -2.37283,2.348836 h 6.6249 c 0,0 0.541837,0.07506 0.816804,0.349997 0.275,0.274966 0.34985,0.816658 0.34985,0.816658 l 1.46e-4,2.333346 c 0,0 -0.07518,0.541658 -0.350142,0.816658 z" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="forward"
+       d="m 21.30025,10.7 c 0.235717,0.235746 0.699875,0.3 0.699875,0.3 h 5.000125 l -2.132,2.085573 c -0.519423,0.508112 -0.595,1.2729 -0.198,1.6979 l 0.793,0.9549 c 0.396,0.424 1.091,0.318 1.587,-0.212 l 5.355,-5.8356 0.595,-0.7439 -0.595,-0.743 -5.256,-5.7295 c -0.496,-0.531 -1.19,-0.637 -1.587,-0.212 l -0.794,0.9549 c -0.396,0.425 -0.297,1.1669 0.198,1.6979 L 27.00025,7 h -4.999875 c 0,0 -0.464437,0.064342 -0.700125,0.3 C 21.064533,7.5356875 21.000375,8 21.000375,8 l -2.5e-4,2 c 0,0 0.06444,0.464283 0.300125,0.7 z" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 51.5,4.64955 47.233834,8.949625 51.5,13.248616 49.366916,15.398166 45,11.201008 40.733834,15.5 38.60075,13.35045 42.866916,8.9485416 38.5,4.64955 40.633084,2.5 45,6.800075 49.266166,2.5 Z"
+       id="stop" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 69,9 H 62 L 64.8,6.2 C 64.1,5.7 63.4,5.5 62.5,5.5 c -2.2,0 -4,1.8 -4,4 0,2.2 1.8,4 4,4 1.399,0 2.7,-0.7 3.399,-1.9 l 2.301,1 C 67.099,14.6 65,16 62.5,16 58.899,16 56,13.1 56,9.5 56,5.9 58.899,3 62.5,3 64,3 65.399,3.5 66.6,4.4 L 69,2 Z"
+       id="reload" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76,9 h -3 l 8,-7 8,7 h -3 v 6.5 H 82 V 12 h -2 v 3.5 h -4 z"
+       id="home" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 91.5,9 h 4.453 V 2 h 6.093 V 9 H 106.5 L 99,16 Z"
+       id="download" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 117,2 c -3.866,0 -7,3.134 -7,7 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-3.866 -3.134,-7 -7,-7 z m 0,2 c 2.761,0 5,2.238 5,5 0,2.762 -2.239,5 -5,5 -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.239,-5 5,-5 z m -0.7,1.2 C 116.0643,5.4357023 116,6 116,6 v 4 l 4,2 -2,-3 V 6 C 118,6 117.9357,5.4357023 117.7,5.2 117.4643,4.9642977 117,5 117,5 c 0,0 -0.4643,-0.035702 -0.7,0.2 z"
+       id="history" />
+    <g
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="bookmarks">
+      <path
+         style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 131,2 v 14 h 7.44922 0.55078 1.94922 c 0.99175,-0.258441 1.76717,-1.038297 2,-2 V 12 6 4 c -0.23283,-0.9617034 -1.00825,-1.7415586 -2,-2 h -1.63672 -0.86328 z m 6.11523,2.4160156 1.05469,1.7714844 c 0,0 0.29209,0.4878333 0.51953,0.6425781 0.21313,0.1449479 0.73828,0.2285157 0.73828,0.2285157 h 2.15625 l -1.49804,2.4335937 c 0,0 -0.21789,0.4778906 -0.32617,0.7167965 -0.16271,0.357558 0.005,0.982547 0.0586,1.566407 0.0848,0.918442 0.15039,1.80664 0.15039,1.80664 l -1.75,-0.894531 c 0,0 -0.71714,-0.337318 -1.10156,-0.337891 -0.45203,0 -1.29883,0.392579 -1.29883,0.392579 l -1.75391,0.841796 c 0,0 0.12894,-0.80101 0.26758,-1.68164 0.0917,-0.579219 0.34458,-1.238485 0.14063,-1.636719 -0.11058,-0.216562 -0.33204,-0.6484375 -0.33204,-0.6484375 l -1.7246,-2.5019531 h 2.14257 c 0,0 0.69711,-0.049193 0.98243,-0.2285156 0.21656,-0.1352084 0.48242,-0.5957032 0.48242,-0.5957032 z"
+         id="bookmarks-star" />
+      <path
+         style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 129,2 c -0.99175,0.2584414 -1.76717,1.0382967 -2,2 v 2 6 2 c 0.23283,0.961703 1.00825,1.741559 2,2 h 2.5 V 12 6 2 Z"
+         id="bookmarks-overlay" />
+      <path
+         style="stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 131.49914,2 V 16"
+         id="bookmarks-divider" />
+    </g>
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 160,14 h -2 l 1,2 h -12 l 1,-2 h -2 c -0.601,0 -1,-0.4 -1,-1 V 8 c 0,-0.6 0.70113,-0.635443 1,-1 0.38098,-0.4647208 0.61902,-1.0352792 1,-1.5 0.29887,-0.364557 0.399,-1 1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 h 8 c 0.6,0 1,0.4 1,1 v 1.5 c 0.6,0 0.70113,0.635443 1,1 0.38098,0.4647208 0.61902,1.0352792 1,1.5 0.29887,0.364557 1,0.4 1,1 v 5 c 0,0.6 -0.4,1 -1,1 z M 148.5,9 h -0.5 -0.5 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 h 1 C 148.8,10 149,9.8 149,9.5 149,9.2 148.8,9 148.5,9 Z M 157,4 c 0,-0.6 -0.4,-1 -1,-1 h -6 c -0.601,0 -1,0.4 -1,1 v 3 c 0,0.6 0.399,1 1,1 h 6 c 0.6,0 1,-0.4 1,-1 z m -0.9,9 h -6.2 l -0.899,2 h 8 z"
+       id="print" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="newtab"
+       d="m 170.93359,2 -4.01562,0.00195 c 0,0.00178 -0.87681,0.216686 -0.87695,1.4980469 v 2.8164062 c 0,0 -0.0732,0.3643751 -0.19922,0.484375 C 165.69982,6.9357812 165.29102,7 165.29102,7 c 0,0 -0.53242,-0.057 -0.7754,0 -0.36297,0.086 -0.73599,0.236 -1,0.5 -0.26399,0.264 -0.41502,0.637 -0.5,1 -0.038,0.162 0,0.5 0,0.5 v 5.537109 c 0,0 0.24003,0.710891 0.5,0.962891 0.27398,0.267 1.03516,0.5 1.03516,0.5 h 13.0957 c 0,0 0.60287,-0.276 0.83985,-0.5 0.21699,-0.205 0.49023,-0.742188 0.49023,-0.742188 V 9 c 0.026,-0.322 0.038,-0.338 0,-0.5 -0.086,-0.363 -0.22624,-0.736 -0.49023,-1 -0.26398,-0.264 -0.63802,-0.415 -1,-0.5 -0.22799,-0.054 -0.69922,0 -0.69922,0 0,0 -0.44657,-0.056219 -0.60156,-0.1992188 -0.12799,-0.1189999 -0.19922,-0.484375 -0.19922,-0.484375 L 175.98828,3.5 C 175.98843,2.1047456 174.9707,2 174.9707,2 Z m -0.79101,5 h 1.71484 V 9.1425781 H 174 v 1.7148439 h -2.14258 V 13 h -1.71484 V 10.857422 H 168 V 9.1425781 h 2.14258 z" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="newwindow"
+       d="M 182.4375,2 C 181.52354,2.2781435 181.28553,2.8114358 181,3.6875 V 14.125 c 0.21642,1.330001 0.75257,1.636052 2.0625,1.875 H 195 c 1.30474,-0.204204 1.70477,-0.57308 2,-1.875 V 4 C 196.8019,2.7723315 196.4998,2.3703399 195.3125,2 Z M 190,3 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 2 v 1 h -2 z m -11,3 h 12 v 8 h -12 z m 5.14258,1 V 9.1425781 H 186 v 1.7148439 h 2.14258 V 13 h 1.71484 V 10.857422 H 192 V 9.1425781 h -2.14258 V 7 Z" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 212.70159,16 c -0.79707,0 -1.49513,-0.2 -2.2922,-1.3 -0.79807,-1.1 -1.69515,-2.5 -1.69515,-2.5 0,0 -0.69706,-0.9 -1.09709,-1.6 -0.49805,-0.7 -1.0971,-0.5 -1.0971,-0.5 0,0 -2.89125,-4.7 -3.3903,-5.4 -0.59805,-1 0.59906,-2.7 0.59906,-2.7 l 4.38738,7 c 0,0 1.39612,1.9 1.89417,2.3 0.49904,0.4 1.39612,-0.4 2.79224,0.9 1.89417,1.8 1.29611,3.8 -0.10101,3.8 z m -0.29802,-2.9 c -0.89708,-1 -1.69415,-0.9 -1.89417,-0.6 -0.20002,0.3 0,1.2 0.39804,1.7 0.39803,0.5 0.79806,0.7 1.39612,0.7 0.59905,0.1 1.09709,-0.7 0.10001,-1.8 z m -3.78934,-4.7 -1.1961,-1.8 2.89125,-4.6 c 0,0 1.19611,1.7 0.59906,2.7 -0.29903,0.4 -1.39613,2.3 -2.29421,3.7 z m -4.5854,2.899 c 0.29903,-0.3 0.99709,-1.1 1.39613,-1.7 l 0.79806,1.2 c -0.39803,0.6 -0.89707,1.4 -0.89707,1.4 0,0 -0.89608,1.4 -1.69415,2.5 -0.69806,1.1 -1.39612,1.3 -2.2932,1.3 -1.39613,0 -2.09419,-2 -0.10001,-3.8 1.39412,-1.199 2.2912,-0.499 2.79024,-0.9 z m -2.39321,1.801 c -0.89708,1 -0.39803,1.8 0.19902,1.8 0.59905,0 0.99709,-0.2 1.39612,-0.7 0.39804,-0.5 0.59806,-1.5 0.39804,-1.7 -0.29803,-0.3 -1.0961,-0.4 -1.99318,0.6 z"
+       id="cut" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 231,16 h -6 c -0.601,0 -1,-0.4 -1,-1 V 12 9.4 7 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,2.2 0,7 0,7 0,0.6 -0.4,1 -1,1 z m -2,-9 v 2 h 2 z M 223,5.9 V 7 8.9 12 h -4 c -0.601,0 -1,-0.4 -1,-1 V 3 c 0,-0.6 0.399,-1 1,-1 0,0 3.2,0 5,0 l 2,2 c 0,0.4 0,0.8 0,1.3 h -2.5 C 223.2,5.4 223,5.6 223,5.9 Z M 223,3 v 2 h 2 z"
+       id="copy" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 246.8507,16 h -7.7014 C 238.26914,16 237.5,15.3 237.5,14.5 v -9 c 0,-0.8 0.77014,-1.5 1.6493,-1.5 h 1.6503 c 0,0 0,-2 2.2004,-2 2.2004,0 2.2004,2 2.2004,2 h 1.6493 c 0.88016,0 1.6503,0.7 1.6503,1.5 v 9 c 0.001,0.799 -0.76914,1.5 -1.6493,1.5 z M 245.97054,5 244.76032,4.5 c 0,0 0,-1.5 -1.76032,-1.5 -1.76032,0 -1.76032,1.5 -1.76032,1.5 l -1.21122,0.5 -0.5501,1 h 2.7505 3.52164 0.88016 z m 0.11002,1.7 h -5.17094 l -3.3016,1.7 3.08056,4.9 7.26232,-3.8 z"
+       id="paste" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 265,12 V 6 l 3,3 z m -7,1 h 6 l -3,3 z m 0,-1 V 6 h 6 v 6 z m 5,-4 h -4 v 3 h 4 z m -2,-6 3,3 h -6 z m -4,4 v 6 l -3,-3 z"
+       id="fullscreen" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 274,8 h 10 v 2 h -10 z"
+       id="minus" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
+       id="plus" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 321.96164,9.3589991 c -0.0996,0.5880529 -0.19907,1.1749739 -0.39904,1.6649929 -0.39904,1.272996 -2.49721,3.230982 -2.49721,3.230982 l 1.23012,1.745023 -4.92726,6e-6 V 9.849 c 0,0 0.89889,1.46799 1.39795,2.05599 1.19912,-0.588025 1.99814,-1.762997 2.09818,-2.9380158 0.10109,-0.8810027 -0.19905,-1.6639894 -0.59902,-2.2510039 -0.18813,-0.3229439 -0.42109,-0.5799624 -0.68685,-0.7931908 -0.30005,-0.23897 -1.01208,-0.5779774 -1.01208,-0.5779774 l 0.0174,-3.3306603 c 1.03186,0.2680556 1.4999,0.3864246 2.85781,1.3686643 1.67715,1.2509803 2.78224,3.5019854 2.52022,5.9759989 z m -6.99262,-1.9580198 c 0,0 -1.09884,-1.4681946 -1.59912,-1.9580122 -1.39809,0.6859994 -2.19718,1.957993 -2.19714,3.3290059 0.39151,1.955025 1.15486,2.878079 2.87049,3.728027 V 16 c -1.14823,-0.14515 -2.89657,-1.144129 -3.76062,-2.017966 -1.64214,-1.695027 -2.56324,-3.735 -2.20626,-6.1889776 0.1,-0.6850241 0.30006,-1.3699914 0.49903,-1.9580159 0.40011,-1.0769929 1.10011,-1.957978 2.09921,-2.6429982 0.0997,-0.098323 0.199,-0.098023 0.29929,-0.1955973 -0.39905,-0.3919885 -1.2861,-0.9964444 -1.2861,-0.9964444 l 5.35545,-1.3e-6 z"
+       id="sync" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 339.29905,15.9 h -1.49989 c -0.39997,0 -0.79995,-0.3 -0.79995,-0.8 0,0 0.29998,-3.6 -3.19977,-7.2 -2.49982,-3 -6.9995,-3.2 -6.9995,-3.2 C 326.29998,4.7 326,4.4 326,4 V 2.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 0,0 6.29955,0.4 9.59932,4.5 3.29976,3.1 3.60074,8.8 3.60074,8.8 -10e-4,0.4 -0.20099,0.7 -0.70095,0.7 z m -12.49911,-9 c 0,0 3.69974,0.5 5.79959,2.4 2.09985,2 2.49982,5.9 2.49982,5.9 0,0.4 -0.1,0.8 -0.49996,0.8 h -1.4999 c -0.39997,0 -0.59995,-0.3 -0.59995,-0.8 0,0 0.1,-2.4 -1.80088,-4.2 C 329.19877,9.7 326.79994,9.6 326.79994,9.6 326.29998,9.6 326,9.3 326,8.9 V 7.6 c 0,-0.4 0.29998,-0.7 0.79994,-0.7 z m 1.19992,5 c 1.09992,0 1.99985,0.9 1.99985,2 0,1.1 -0.89993,2 -1.99985,2 C 326.89894,15.9 326,15 326,13.9 c 0,-1.1 0.89994,-2 1.99986,-2 z"
+       id="rss" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 344.5,5 c 0,0 0.0643,-0.4642977 0.3,-0.7 0.2357,-0.2357023 0.7,-0.3 0.7,-0.3 h 7.5 c 0,0 0.4643,0.064298 0.7,0.3 0.2357,0.2357023 0.3,0.7 0.3,0.7 v 2 l 4.0245,-3 -0.049,10 L 354,11 v 2 c 0,0 -0.0643,0.464298 -0.3,0.7 -0.2357,0.235702 -0.7,0.3 -0.7,0.3 h -7.5 c 0,0 -0.4643,-0.0643 -0.7,-0.3 -0.2357,-0.235702 -0.3,-0.7 -0.3,-0.7 z"
+       id="webrtc" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="bookmark-none"
+       d="m 369.20312,1 -1.9082,3.2734375 c 0,0 -0.46184,0.8030625 -0.83984,1.0390625 -0.498,0.313 -1.71875,0.3984375 -1.71875,0.3984375 H 361 l 3.00781,4.3652345 c 0,0 0.38708,0.754812 0.58008,1.132812 0.356,0.6951 -0.0841,1.844469 -0.24414,2.855469 -0.242,1.5371 -0.4668,2.935547 -0.4668,2.935547 l 3.06055,-1.466797 c 0,0 1.47663,-0.685547 2.26562,-0.685547 0.671,10e-4 1.92579,0.587891 1.92579,0.587891 l 3.05273,1.5625 c 0,0 -0.11177,-1.549244 -0.25976,-3.152344 -0.093,-1.0191 -0.38752,-2.112228 -0.10352,-2.736328 0.189,-0.417 0.56836,-1.2519531 0.56836,-1.2519531 L 377,5.6113281 h -3.76172 c 0,0 -0.91706,-0.1454375 -1.28906,-0.3984375 -0.397,-0.2701 -0.90625,-1.1210937 -0.90625,-1.1210937 z m -0.0762,3 1.15039,1.9316406 c 0,0 0.31633,0.5323647 0.56446,0.7011719 0.23249,0.1581201 0.80664,0.25 0.80664,0.25 H 374 l -1.63281,2.6542969 c 0,0 -0.23929,0.5206326 -0.35742,0.7812496 -0.17749,0.39005 0.008,1.074021 0.0664,1.710938 C 372.16866,13.031203 372.23828,14 372.23828,14 l -1.9082,-0.978516 c 0,0 -0.78376,-0.366562 -1.20313,-0.367187 -0.4931,0 -1.41601,0.429687 -1.41601,0.429687 L 365.79883,14 c 0,0 0.13977,-0.873327 0.29101,-1.833984 0.1,-0.631855 0.37484,-1.350734 0.15235,-1.785157 -0.12063,-0.236243 -0.36133,-0.708984 -0.36133,-0.708984 L 364,6.9453125 h 2.33594 c 0,0 0.76298,-0.054381 1.07422,-0.25 0.23624,-0.1474953 0.52343,-0.6484375 0.52343,-0.6484375 z" />
+    <path
+       style="stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="bookmark-added"
+       d="m 369.202,19 -1.908,3.2732 c 0,0 -0.461,0.8031 -0.839,1.0391 -0.498,0.313 -1.718,0.399 -1.718,0.399 H 361 l 3.008,4.3643 c 0,0 0.387,0.755 0.58,1.133 0.356,0.6951 -0.084,1.8452 -0.244,2.8562 C 364.102,33.6019 363.877,35 363.877,35 l 3.06,-1.4671 c 0,0 1.477,-0.686 2.266,-0.686 0.671,0.001 1.925,0.588 1.925,0.588 l 3.053,1.5641 c 0,0 -0.112,-1.5501 -0.26,-3.1532 -0.093,-1.0191 -0.388,-2.1121 -0.104,-2.7362 0.189,-0.417 0.57,-1.252 0.57,-1.252 L 377,23.6123 h -3.763 c 0,0 -0.917,-0.146 -1.289,-0.399 -0.397,-0.2701 -0.906,-1.1221 -0.906,-1.1221 z" />
+  </g>
+</svg>
diff --git a/application/palemoon/themes/osx/Toolbar.png b/application/palemoon/themes/osx/Toolbar.png
index 3d1b80ec70..8ec756e03d 100644
Binary files a/application/palemoon/themes/osx/Toolbar.png and b/application/palemoon/themes/osx/Toolbar.png differ
diff --git a/application/palemoon/themes/osx/Toolbar.svg b/application/palemoon/themes/osx/Toolbar.svg
new file mode 100644
index 0000000000..7a68c06087
--- /dev/null
+++ b/application/palemoon/themes/osx/Toolbar.svg
@@ -0,0 +1,1356 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="PaleMoonToolbarSVG"
+   x="0px"
+   y="0px"
+   width="378"
+   height="38"
+   viewBox="0 0 378 38"
+   enable-background="new 0 0 378 38">
+  <metadata
+     id="metadata146">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs144">
+    <radialGradient
+       id="globalGradient"
+       cy="0.69999999">
+      <stop
+         offset="0.05"
+         id="stop4"
+         style="stop-color:#87939b;stop-opacity:1" />
+      <stop
+         offset="1"
+         id="stop6"
+         style="stop-color:#45555f;stop-opacity:1" />
+    </radialGradient>
+    <filter
+       id="insetShadow">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1875" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1877" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur1879" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset1881" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1883" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       id="filter2164">
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood2154" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite2156" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur2158" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset2160" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite2162" />
+    </filter>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       r="7.2456884"
+       fy="12.21416"
+       fx="95.643087"
+       cx="95.643087"
+       gradientTransform="matrix(1.0350983,0,0,0.96609178,0,18)"
+       id="globalGradient-8"
+       cy="12.21416">
+      <stop
+         offset="0.05"
+         id="stop4-5"
+         style="stop-color:#12d92d;stop-opacity:1" />
+      <stop
+         offset="1"
+         id="stop6-5"
+         style="stop-color:#01b222;stop-opacity:1" />
+    </radialGradient>
+    <radialGradient
+       xlink:href="#linearGradient4635"
+       id="radialGradient4669"
+       cx="10.529827"
+       cy="14.778796"
+       fx="10.529827"
+       fy="14.778796"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1087088,0,-1.2351844)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4635">
+      <stop
+         style="stop-color:#6198cb;stop-opacity:1"
+         offset="0"
+         id="stop4631" />
+      <stop
+         style="stop-color:#3a78b2;stop-opacity:1"
+         offset="1"
+         id="stop4633" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4701">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4691" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4693" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4695" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4697" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4699" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4635"
+       id="radialGradient4637"
+       cx="11.063469"
+       cy="38.79744"
+       fx="11.063469"
+       fy="38.79744"
+       r="8.7600002"
+       gradientTransform="matrix(1,0,0,1.0853313,0,-3.029369)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4661">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4651" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4653" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4655" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4657" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4659" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4635"
+       id="radialGradient4677"
+       cx="34.841751"
+       cy="14.552581"
+       fx="34.841751"
+       fy="14.552581"
+       r="7.1399999"
+       gradientTransform="matrix(1,0,0,1.1003056,0,-1.1335797)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4689">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4679" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4681" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4683" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4685" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4687" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4603"
+       id="radialGradient4605"
+       cx="58.062626"
+       cy="12.761739"
+       fx="58.062626"
+       fy="12.761739"
+       r="7.6799994"
+       gradientTransform="matrix(1,0,0,0.99218759,0,0.09141507)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4603">
+      <stop
+         style="stop-color:#e72b1d;stop-opacity:1"
+         offset="0"
+         id="stop4599" />
+      <stop
+         style="stop-color:#cc4338;stop-opacity:1"
+         offset="1"
+         id="stop4601" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4629">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4619" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4621" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4623" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4625" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4627" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4523-3"
+       id="radialGradient4525"
+       cx="79.305222"
+       cy="13.939252"
+       fx="79.305222"
+       fy="13.939252"
+       r="7.8000002"
+       gradientTransform="matrix(1,0,0,1.0769231,0,-0.86932835)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4523-3">
+      <stop
+         style="stop-color:#4fb55d;stop-opacity:1"
+         offset="0"
+         id="stop4519" />
+      <stop
+         style="stop-color:#2d8539;stop-opacity:1"
+         offset="1"
+         id="stop4521" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4597">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4587" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4589" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4591" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4593" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4595" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4527"
+       id="radialGradient4529"
+       cx="103.23091"
+       cy="12.664675"
+       fx="103.23091"
+       fy="12.664675"
+       r="9.5995998"
+       gradientTransform="matrix(1,0,0,0.87507716,0,1.3868386)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4527">
+      <stop
+         style="stop-color:#3f6bbd;stop-opacity:1"
+         offset="0"
+         id="stop4523" />
+      <stop
+         style="stop-color:#29467b;stop-opacity:1"
+         offset="1"
+         id="stop4525" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4783">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4773" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4775" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4777" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4779" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4781" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4709"
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0,-0.03620244)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4707">
+      <stop
+         style="stop-color:#8c9ba5;stop-opacity:1"
+         offset="0"
+         id="stop4703" />
+      <stop
+         style="stop-color:#607480;stop-opacity:1"
+         offset="1"
+         id="stop4705" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4721">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4711" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4713" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4715" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4717" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4719" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4727"
+       id="radialGradient4729"
+       cx="149.26262"
+       cy="12.784631"
+       fx="149.26262"
+       fy="12.784631"
+       r="8.6400051"
+       gradientTransform="matrix(1,0,0,0.993055,0,0.07848724)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4727">
+      <stop
+         style="stop-color:#3eb796;stop-opacity:1"
+         offset="0"
+         id="stop4723" />
+      <stop
+         style="stop-color:#31a886;stop-opacity:1"
+         offset="1"
+         id="stop4725" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4741">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4731" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4733" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4735" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4737" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4739" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient5023"
+       id="radialGradient5017"
+       cx="466.94476"
+       cy="12.037849"
+       fx="466.94476"
+       fy="12.037849"
+       r="9.6007004"
+       gradientTransform="matrix(0.79035186,0,0,0.79508811,-0.14216924,6.9389816e-4)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5023">
+      <stop
+         id="stop5019"
+         offset="0"
+         style="stop-color:#c6cdd2;stop-opacity:1" />
+      <stop
+         id="stop5021"
+         offset="1"
+         style="stop-color:#9cabb4;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4793"
+       cx="194.44176"
+       cy="13.746766"
+       fx="194.44176"
+       fy="13.746766"
+       r="9.5999947"
+       gradientTransform="matrix(1,0,0,0.87500048,0,1.3876528)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4805">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4795" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4797" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4799" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4801" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4803" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4833"
+       cx="239.2"
+       cy="11.101265"
+       fx="239.2"
+       fy="11.101265"
+       r="9.6000004"
+       gradientTransform="matrix(1,0,0,0.87500002,0,1.3876579)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4853">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4843" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4845" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4847" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4849" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4851" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4841"
+       cx="242.26164"
+       cy="12.423289"
+       fx="242.26164"
+       fy="12.423289"
+       r="3.5288758"
+       gradientTransform="matrix(0.79274531,0,0,0.78327977,-0.14435628,0.11758726)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4858"
+       cx="242.0894"
+       cy="12.418613"
+       fx="242.0894"
+       fy="12.418613"
+       r="3.5288758"
+       gradientTransform="matrix(1,0,0,0.9880597,0,0.14828194)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient5037"
+       id="radialGradient5031"
+       cx="466.39926"
+       cy="31.105829"
+       fx="466.39926"
+       fy="31.105829"
+       r="9.7507105"
+       gradientTransform="matrix(1,0,0,0.99992718,0,0.00247197)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5037">
+      <stop
+         id="stop5033"
+         offset="0"
+         style="stop-color:#e8e1a1;stop-opacity:1" />
+      <stop
+         id="stop5035"
+         offset="1"
+         style="stop-color:#baad3e;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter5049">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood5039" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite5041" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur5043" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset5045" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite5047" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4813"
+       cx="217.95329"
+       cy="16.56296"
+       fx="217.95329"
+       fy="16.56296"
+       r="10.35937"
+       gradientTransform="matrix(1,0,0,0.8160434,0,2.0506693)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4825">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4815" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4817" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4819" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4821" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4823" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4861"
+       cx="262.79288"
+       cy="15.840806"
+       fx="262.79288"
+       fy="15.840806"
+       r="8.5577164"
+       gradientTransform="matrix(1,0,0,0.9969072,0,0.03528241)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4873">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4863" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4865" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4867" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4869" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4871" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4881"
+       cx="286.58698"
+       cy="14.171478"
+       fx="286.58698"
+       fy="14.171478"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4893">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4883" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4885" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4887" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4889" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4891" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4901"
+       cx="308.97141"
+       cy="14.457072"
+       fx="308.97141"
+       fy="14.457072"
+       r="6.09375"
+       gradientTransform="matrix(1,0,0,1.4,0,-4.4901397)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4913">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4903" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4905" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4907" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4909" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4911" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4921"
+       cx="331.15933"
+       cy="13.119289"
+       fx="331.15933"
+       fy="13.119289"
+       r="8.53125"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4933">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4923" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4925" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4927" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4929" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4931" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4941"
+       cx="353.15076"
+       cy="11.316628"
+       fx="353.15076"
+       fy="11.316628"
+       r="6.09375"
+       gradientTransform="matrix(0.79035186,0,0,0.15902921,-0.14216924,7.1987363)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientTransform="matrix(0.79035186,0,0,0.79514603,-0.14216924,3.8580698e-5)"
+       xlink:href="#linearGradient4707"
+       id="radialGradient4949"
+       cx="375.97003"
+       cy="11.407905"
+       fx="375.97003"
+       fy="11.407905"
+       r="6.09375"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4957"
+       cx="400.5007"
+       cy="13.518586"
+       fx="400.5007"
+       fy="13.518586"
+       r="8.5350475"
+       gradientTransform="matrix(1,0,0,0.99701325,0,0.03407254)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4969">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4959" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4961" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4963" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4965" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4967" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4975"
+       id="radialGradient4977"
+       cx="417.02075"
+       cy="15.742972"
+       fx="417.02075"
+       fy="15.742972"
+       r="8.53125"
+       gradientTransform="matrix(1.357667,-0.02466618,0.02411975,1.3275908,-149.53429,5.1574131)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4975">
+      <stop
+         style="stop-color:#f79729;stop-opacity:1"
+         offset="0"
+         id="stop4971" />
+      <stop
+         style="stop-color:#d2831f;stop-opacity:1"
+         offset="1"
+         id="stop4973" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4989">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4979" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4981" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4983" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4985" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4987" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4997"
+       cx="444.33652"
+       cy="11.316628"
+       fx="444.33652"
+       fy="11.316628"
+       r="8.53125"
+       gradientTransform="matrix(1,0,0,0.71428563,0,3.2333231)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter5009">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4999" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite5001" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur5003" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset5005" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite5007" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4747"
+       id="radialGradient4710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
+    <linearGradient
+       id="linearGradient4747">
+      <stop
+         style="stop-color:#c5b631;stop-opacity:1"
+         offset="0"
+         id="stop4743" />
+      <stop
+         style="stop-color:#baad3e;stop-opacity:1"
+         offset="1"
+         id="stop4745" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4729">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4719" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4721" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur4723" />
+      <feOffset
+         dx="2.77556e-017"
+         dy="0"
+         result="offset"
+         id="feOffset4725" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4727" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient5037"
+       id="radialGradient4712"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="132.6468"
+       cy="9.0947113"
+       fx="132.6468"
+       fy="9.0947113"
+       r="7.9746099" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4774">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4764" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4766" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4768" />
+      <feOffset
+         dx="2.77556e-017"
+         dy="0"
+         result="offset"
+         id="feOffset4770" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4772" />
+    </filter>
+    <radialGradient
+       xlink:href="#linearGradient4747"
+       id="radialGradient4714"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.265625,0,0,1.1109477,-0.05703897,1.4865748)"
+       cx="134.97461"
+       cy="9"
+       fx="134.97461"
+       fy="9"
+       r="7.9746099" />
+    <radialGradient
+       xlink:href="#linearGradient4707"
+       id="radialGradient4750"
+       cx="166.37157"
+       cy="11.485105"
+       fx="166.37157"
+       fy="11.485105"
+       r="0.31640625"
+       gradientTransform="matrix(0.99998863,-0.00473886,0.08838422,18.426509,-1.0132111,-199.35688)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       xlink:href="#linearGradient4832"
+       id="radialGradient4709-1"
+       cx="125.30523"
+       cy="16.659737"
+       fx="125.30523"
+       fy="16.659737"
+       r="8.3726959"
+       gradientTransform="matrix(1,0,0,1.0032611,0.11563445,22.233158)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4832">
+      <stop
+         id="stop5029"
+         offset="0"
+         style="stop-color:#22e23d;stop-opacity:1" />
+      <stop
+         id="stop4830"
+         offset="1"
+         style="stop-color:#38a748;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter4844">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4834" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite4836" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur4838" />
+      <feOffset
+         dx="2.77556e-017"
+         dy="0"
+         result="offset"
+         id="feOffset4840" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite4842" />
+    </filter>
+  </defs>
+  <g
+     id="g7757">
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4669);fill-opacity:1;stroke-width:1;filter:url(#filter4701)"
+       d="m 17.870749,13.841269 -6.303534,-0.0074 2.264363,2.148431 c 0.615648,0.584128 0.72,1.44 0.24,1.92 l -0.96,1.08 c -0.48,0.48 -1.32,0.36 -1.92,-0.24 0,0 -6.4200001,-6.6 -6.4800001,-6.6 -0.06,0 -0.36,-0.48 -0.48,-0.84 0,-0.359999 0.36,-0.719999 0.48,-0.839999 l 6.3600001,-6.48 c 0.6,-0.6000001 1.44,-0.7200001 1.92,-0.24 l 0.96,1.0799999 c 0.48,0.48 0.36,1.32 -0.24,1.9200001 l -2.144363,2.0610645 6.359451,0.043374 c 0.719983,0.00491 1.227959,0.50779 1.227959,1.2277905 v 2.483369 c 0,0.72 -0.563877,1.284215 -1.283876,1.28337 z"
+       id="path4" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4637);fill-opacity:1;stroke-width:1;filter:url(#filter4661)"
+       id="path4154"
+       d="m 19.187889,37.765372 -7.620674,-0.0365 3.352509,3.266174 c 0.515294,0.50108 0.829738,1.388534 0.443269,1.764345 l -1.759464,1.992905 c -0.356609,0.403923 -1.52102,-0.108922 -2.036314,-0.735274 L 3.9756591,36.471238 c 0,0 -0.7399492,-0.710192 -0.7399492,-1.211274 0,-0.501081 0.7399492,-1.303987 0.7399492,-1.303987 l 7.5915559,-7.545783 c 0.515294,-0.50108 1.613776,-1.093109 1.980397,-0.698138 l 1.815381,1.955768 c 0.386469,0.375811 0.172889,1.300401 -0.471228,1.801482 l -3.32455,3.229041 7.620674,0.02842 c 0.772936,0.0029 1.344153,0.417712 1.344153,1.169335 v 2.560987 c 0,0.751622 -0.571221,1.311987 -1.344153,1.308283 z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4677);fill-opacity:1;stroke-width:1;filter:url(#filter4689)"
+       id="path4165"
+       d="m 26.776124,12.612425 v -2.53895 c 0,-0.7200003 0.480206,-1.3282747 1.2,-1.3111602 l 5.76,0.041051 L 31.66,6.7412646 c -0.602042,-0.5979755 -0.72,-1.4399999 -0.24,-1.92 l 0.96,-1.08 c 0.48,-0.48 1.32,-0.36 1.92,0.24 l 6.36,6.4800004 c 0.12,0.12 0.48,0.48 0.48,0.84 0,0.36 -0.36,0.84 -0.48,0.84 l -6.48,6.48 c -0.6,0.6 -1.44,0.72 -1.92,0.24 l -0.96,-1.08 c -0.48,-0.48 -0.36,-1.32 0.24,-1.92 L 33.736124,13.833888 28.06,13.868005 c -0.719987,0.0043 -1.283876,-0.53558 -1.283876,-1.25558 z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4605);fill-opacity:1;stroke-width:1;filter:url(#filter4629)"
+       id="path4176"
+       d="m 64.708108,6.2881044 -5.061037,5.0305226 5.061037,5.030522 -2.530518,2.515261 -5.061038,-5.030522 -5.061037,5.030522 -2.530519,-2.515261 5.061037,-5.030522 -5.061037,-5.0305226 2.530519,-2.5152612 5.061037,5.0305223 5.061038,-5.0305223 z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4525);fill-opacity:1;stroke-width:1;filter:url(#filter4597)"
+       id="path4187"
+       d="m 87.482777,11.318627 h -8.856816 l 3.13833,-3.0716727 C 81.15648,7.545735 80.363876,6.712205 79.283876,6.712205 c -2.64,0 -5.107543,1.9376803 -5.107543,4.577681 0,2.64 2.411627,5.050109 5.051627,5.050109 1.68,0 3.619039,-1.066107 4.459039,-2.506107 l 2.530518,1.25763 c -1.32,2.4 -3.961599,4.443007 -6.961599,4.443007 -4.32,0 -8.219378,-3.896849 -8.219378,-8.216849 0,-4.3200008 3.927337,-7.633261 8.247337,-7.633261 1.8,0 3.619792,0.8778997 5.059792,1.9578998 l 3.139108,-3.1271021 z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4529);fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1;filter:url(#filter4783)"
+       d="M 102.66589,2.5152127 92.543814,11.318627 h 3.795778 v 7.545783 h 5.061038 v -5.030522 h 2.53052 v 5.030522 h 5.06104 v -7.545783 h 3.79577 z"
+       id="path4209" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4709);fill-opacity:1;stroke-width:1;filter:url(#filter4721)"
+       id="path4214"
+       d="m 133.03211,12.576257 -6.32629,6.288153 c -0.24,0.36 -0.82401,0.692435 -1.30401,0.692435 -0.48,0 -0.86651,-0.332435 -1.22651,-0.692435 l -6.3263,-6.288153 c -0.79571,-0.72 -0.93921,-1.286268 0.0208,-1.280462 l 3.77501,0.02283 -0.0107,-7.5841022 c -0.001,-0.7199993 0.50796,-1.1722101 1.22796,-1.1722101 h 5.10754 c 0.72,0 1.22426,0.4800094 1.22796,1.2 l 0.0388,7.5563123 3.80118,-0.05062 c 0.95992,-0.01278 0.71459,0.588252 -0.005,1.308252 z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4729);fill-opacity:1;stroke-width:1;filter:url(#filter4741)"
+       id="path4225"
+       d="m 148.19571,20.103585 c -4.8,0 -8.89163,-3.97895 -8.89163,-8.77895 0,-4.6800005 4.11959,-8.7145303 8.91959,-8.7145303 4.8,0 8.80776,3.9511599 8.80776,8.7511603 0,4.68 -4.03572,8.74232 -8.83572,8.74232 z m 0.0559,-15.04801 c -3.36,0 -6.39142,2.9178996 -6.39142,6.2779 0,3.24 2.9755,6.22232 6.3355,6.22232 3.36,0 6.33551,-2.86232 6.33551,-6.22232 0,-3.3600004 -2.91959,-6.2779 -6.27959,-6.2779 z m -0.63959,7.520682 c -0.48,-0.12 -0.63716,-0.735044 -0.64429,-1.214992 l -0.0559,-3.7667402 c -0.0107,-0.7199217 0.53592,-1.28337 1.25592,-1.28337 0.72,0 1.27834,0.535601 1.28388,1.25558 l 0.0289,3.7518922 c 1.32,1.32 2.53051,3.772891 2.53051,3.772891 0,0 -3.07896,-1.195261 -4.39896,-2.515261 z" />
+    <path
+       style="display:inline;fill:url(#radialGradient5017);fill-opacity:1;stroke-width:0.79274529"
+       id="path4355"
+       d="m 369.00476,4.7878231 0.94842,1.9083504 0.47422,0.858758 0.94842,0.190835 2.18136,0.3816699 -1.61231,1.7175156 -0.6639,0.667923 0.0948,0.954175 0.37937,2.290022 -1.89685,-0.954178 -0.85358,-0.477086 -0.85358,0.477086 -1.89685,0.954178 0.37938,-2.290022 0.0948,-0.954175 -0.6639,-0.667923 -1.61232,-1.7175156 2.27622,-0.3816699 0.94842,-0.190835 0.37936,-0.858758 0.94843,-1.9083504 m 0,-3.4350309 c -0.28454,0 -0.56906,0.1908348 -0.75874,0.667922 l -1.89683,3.9121193 -4.07821,0.6679227 c -0.94842,0.190835 -1.13812,0.8587576 -0.47421,1.5266802 l 2.94011,3.1487776 -0.66391,4.389208 c -0.0948,0.572504 0.1897,0.954174 0.66391,0.954174 0.18967,0 0.37936,-0.09542 0.56905,-0.190835 l 3.69885,-2.003768 3.69884,2.003768 c 0.18969,0.09543 0.47421,0.190835 0.56906,0.190835 0.4742,0 0.75873,-0.38167 0.6639,-1.049592 l -0.6639,-4.389207 2.9401,-3.1487781 c 0.66391,-0.6679226 0.37938,-1.3358454 -0.4742,-1.5266803 L 371.66031,5.837416 369.76347,1.9252968 C 369.5738,1.543627 369.28926,1.3527922 369.00474,1.3527922 Z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4793);fill-opacity:1;stroke-width:1;filter:url(#filter4805)"
+       id="path4366"
+       d="m 202.62125,17.648005 -2.53039,-0.04122 1.26526,2.515261 h -15.18311 l 1.26526,-2.515261 -2.51784,0.02249 c -0.71997,0.0064 -1.31817,-0.563397 -1.31184,-1.28337 l 0.0559,-6.3612693 c 0.006,-0.7199727 0.59192,-1.2112687 1.31183,-1.2000001 l 1.19667,0.018731 0.0313,-2.5298907 c 0.009,-0.7199457 0.51397,-1.243001 1.23397,-1.243001 l 0.022,-1.2403691 c 0.0127,-0.7198886 0.6198,-1.2535885 1.33979,-1.2555799 l 10.04733,-0.02779 c 0.72,-0.00199 1.21931,0.5078413 1.22796,1.22779 l 0.0156,1.295949 c 0.72,0 1.2692,0.5785813 1.26831,1.2985809 l -0.003,2.4743108 1.26513,-10e-8 c 0.71992,-0.010711 1.26205,0.5376375 1.26526,1.2576305 v 6.288153 c 0,0.729621 -0.61509,1.257631 -1.26526,1.257631 z m -15.18298,-0.04122 1.26526,-2.515262 h -1.26526 z m 0.6,-6.288153 h -0.6 -0.6 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.25348,-0.503016 -0.6,-0.6 z M 198.8256,5.0304738 c 0,-0.72 -0.54528,-1.2523398 -1.26526,-1.2576306 h -7.59155 c -0.71998,-0.00529 -1.28117,0.5378043 -1.26526,1.2576306 v 3.7728917 c 0.0159,0.7198264 0.54528,1.2629215 1.26526,1.2576305 h 7.59155 c 0.71999,-0.0053 1.24942,-0.5078188 1.25592,-1.2277899 z m -1.26526,10.0610482 h -7.59155 l -1.26526,3.772892 h 10.12207 z m 2.53052,0 h -1.26526 l 1.26526,2.515262 z" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4833);fill-opacity:1;stroke-width:1;filter:url(#filter4853)"
+       id="path4388"
+       d="m 248.17426,18.945466 -16.43876,-0.02779 c -0.96,-0.0016 -1.40468,-0.339789 -1.40858,-1.299781 l -0.0559,-13.7557998 c -0.004,-0.959992 0.47654,-1.3847678 1.43653,-1.3831504 l 16.49468,0.02779 c 0.96,0.00162 1.24473,0.3675784 1.24083,1.3275705 l -0.0559,13.7557997 c -0.004,0.959992 -0.25287,1.356983 -1.21287,1.355361 z M 239.88388,3.8178947 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 2.64346,0 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.36,0.6 0.6,0.6 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 3.72,0 h -1.2 c -0.36,0 -0.6,0.24 -0.6,0.6 0,0.36 0.24,0.6 0.6,0.6 h 1.2 c 0.36,0 0.6,-0.24 0.6,-0.6 0,-0.36 -0.24,-0.6 -0.6,-0.6 z m 0.65592,4.9945298 c 0.005,-0.7199803 -0.53592,-1.2538267 -1.25592,-1.2555798 l -11.41287,-0.02779 c -0.72,-0.00175 -1.22533,0.5077946 -1.22796,1.2277899 l -0.028,7.6724304 c -0.003,0.719994 0.50796,1.175707 1.22795,1.172209 l 11.44083,-0.05558 c 0.71999,-0.0035 1.19464,-0.507809 1.2,-1.227789 z" />
+    <g
+       aria-label="+"
+       transform="scale(0.98484984,1.0153832)"
+       style="font-style:normal;font-weight:normal;font-size:9.51294327px;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:url(#radialGradient4841);fill-opacity:1;stroke:none;stroke-width:0.79274535px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4409">
+      <path
+         d="m 194.95358,9.8484986 h -2.03077 v 1.9696994 h -1.01538 V 9.8484986 h -2.03077 V 8.8636487 h 2.03077 V 6.893949 h 1.01538 v 1.9696997 h 2.03077 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:8.55116463px;line-height:125%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:url(#radialGradient4841);fill-opacity:1;stroke-width:0.79274535px"
+         id="path7725" />
+    </g>
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 467.25784,24.196945 c -0.36562,0 -0.73125,0.24375 -0.975,0.853125 l -2.4375,4.996876 -5.24062,0.853125 c -1.21875,0.24375 -1.4625,1.096875 -0.60938,1.95 l 3.77813,4.021875 -0.85313,5.60625 c -0.12181,0.73125 0.24375,1.21875 0.85313,1.21875 0.24375,0 0.4875,-0.121875 0.73125,-0.24375 l 4.75312,-2.559375 4.75313,2.559375 c 0.24375,0.121875 0.60937,0.24375 0.73125,0.24375 0.60937,0 0.975,-0.4875 0.85312,-1.340625 l -0.85312,-5.60625 3.77812,-4.021875 c 0.85313,-0.853125 0.4875,-1.70625 -0.60937,-1.95 l -5.24063,-0.853125 -2.4375,-4.996876 c -0.24375,-0.4875 -0.60937,-0.73125 -0.975,-0.73125 z"
+       id="path6182"
+       style="display:inline;fill:url(#radialGradient5031);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5049)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 226.66131,15.091518 -0.0388,3.707848 c -0.007,0.673061 -0.5177,1.245488 -1.19079,1.24654 l -17.77799,0.02779 c -0.6731,0.0011 -1.2416,-0.573462 -1.24671,-1.24654 l -0.028,-3.688049 c -0.005,-0.673078 0.6302,-1.305219 1.30331,-1.305219 1.26531,-1.257631 1.03718,-3.269047 1.26531,-5.0305225 0.4278,-2.8226251 0.0953,-6.2244545 3.80878,-6.2479747 l 7.52682,-0.047673 c 3.73297,-0.023644 3.4173,3.4730226 3.84751,6.2956477 0.41438,2.7153765 0,3.7728915 1.26526,5.0305225 0.70548,0 1.26526,0.515815 1.26526,1.25763 z m -7.68106,-4.410561 h -1.82811 V 8.8528316 c 0,-0.8124995 -1.21875,-0.8124995 -1.21875,0 v 1.8281254 h -1.82814 c -0.8125,0 -0.8125,1.218749 0,1.218749 h 1.82814 v 1.828125 c 0,0.812501 1.21875,0.812501 1.21875,0 v -1.828125 h 1.82811 c 0.8125,0 0.8125,-1.218749 0,-1.218749 z"
+       id="path7318"
+       style="display:inline;fill:url(#radialGradient4813);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4825)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 269.02823,19.939154 c -0.975,0 -1.82813,-0.24375 -2.80313,-1.584375 -0.975,-1.340625 -2.07187,-3.046875 -2.07187,-3.046875 0,0 -0.85313,-1.096875 -1.34063,-1.95 -0.60937,-0.853125 -1.34062,-0.609375 -1.34062,-0.609375 0,0 -3.53438,-5.7281239 -4.14375,-6.581249 -0.73125,-1.21875 0.73125,-3.290625 0.73125,-3.290625 l 5.3625,8.531249 c 0,0 1.70625,2.315625 2.31562,2.803125 0.60938,0.4875 1.70625,-0.4875 3.4125,1.096875 2.31563,2.19375 1.58438,4.63125 -0.12181,4.63125 z m -0.36563,-3.534375 c -1.09687,-1.21875 -2.07187,-1.096875 -2.31562,-0.73125 -0.24375,0.365625 0,1.4625 0.4875,2.071875 0.4875,0.609375 0.975,0.853125 1.70625,0.853125 0.73125,0.121875 1.34062,-0.853125 0.1218,-2.19375 z m -4.63125,-5.728124 -1.4625,-2.19375 3.53438,-5.60625 c 0,0 1.4625,2.071875 0.73125,3.290625 -0.36563,0.4875001 -1.70625,2.803125 -2.80313,4.509375 z m -5.60625,3.534374 c 0.36563,-0.365625 1.21875,-1.340625 1.70625,-2.071875 l 0.975,1.4625 c -0.4875,0.73125 -1.09687,1.70625 -1.09687,1.70625 0,0 -1.09688,1.70625 -2.07188,3.046875 -0.85312,1.340625 -1.70625,1.584375 -2.80312,1.584375 -1.70625,0 -2.55938,-2.4375 -0.12181,-4.63125 1.70625,-1.4625 2.80312,-0.609375 3.4125,-1.096875 z m -2.925,2.19375 c -1.09687,1.21875 -0.4875,2.19375 0.24375,2.19375 0.73125,0 1.21875,-0.24375 1.70625,-0.853125 0.4875,-0.609375 0.73125,-1.828125 0.4875,-2.071875 -0.36562,-0.365625 -1.34062,-0.4875 -2.4375,0.73125 z"
+       id="path7886"
+       style="display:inline;fill:url(#radialGradient4861);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4873)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 292.45286,20.11787 -7.56413,0 c -0.73125,0 -1.32549,-0.515308 -1.33058,-1.24654 l -0.028,-4.017519 v -3.16875 -2.9250003 c 0,-0.73125 0.4875,-1.21875 1.21875,-1.21875 l 6.44059,0.00442 2.53052,2.515261 0.0354,8.810334 c 0.003,0.731244 -0.57138,1.24654 -1.30263,1.24654 z M 289.62394,8.7600607 v 2.4375003 h 2.4375 z m -7.3125,-0.6736655 0.0213,0.7169703 v 2.5152615 3.772891 l -5.06403,0.04019 c -0.73123,0.0058 -1.21672,-0.598663 -1.21875,-1.32991 l -0.028,-10.0556901 c -0.002,-0.7312471 0.4875,-1.21875 1.21875,-1.21875 h 6.09375 l 2.79402,2.5031129 v 1.81343 h -2.53052 c -0.67317,-0.017075 -1.31624,0.241688 -1.28654,1.2424914 z m 0.0213,-4.7304016 v 2.4596813 l 2.53052,-0.02779 z"
+       id="path8454"
+       style="display:inline;fill:url(#radialGradient4881);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4893)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 312.76384,20.20124 -10.1808,-0.02779 c -0.75126,-0.0021 -1.21143,-0.547743 -1.21303,-1.272325 l -0.028,-12.6083588 c -0.002,-0.9749978 0.29395,-1.2762443 1.26895,-1.2723257 l 2.49639,0.010033 c 0,0 0.0587,-2.5309032 2.49616,-2.5309032 2.4375,0 2.56487,2.5309032 2.56487,2.5309032 l 2.48359,0.017757 c 0.97497,0.00697 1.35938,0.3251372 1.35283,1.3001156 l -0.0839,12.4971989 c -0.005,0.808245 -0.51762,1.35744 -1.15713,1.355695 z m -1.86968,-13.8508896 -1.34061,-0.609375 c 0,0 0,-1.8281249 -1.95,-1.8281249 -1.95,0 -1.95,1.8281249 -1.95,1.8281249 l -1.34063,0.609375 -0.47079,1.1953846 h 7.59155 z m 0.53952,2.4530151 h -6.32629 l -2.53052,2.5152615 2.53052,5.030522 7.59155,-5.030522 z"
+       id="path9022"
+       style="display:inline;fill:url(#radialGradient4901);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4913)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="M 335.47361,15.091518 V 7.545735 l 3.79578,3.772892 z m -8.85681,1.257631 h 7.59155 l -3.79578,3.772892 z m 6.32629,-1.257631 h -5.06103 c -0.73124,-0.0041 -1.26114,-0.526392 -1.26526,-1.25763 V 8.8033655 c -0.004,-0.7312386 0.53401,-1.2576305 1.26526,-1.2576305 h 5.06103 c 0.73125,0 1.26526,0.5263804 1.26526,1.2576305 v 5.0305225 c 0,0.609375 -0.53402,1.261705 -1.26526,1.25763 z m 0,-3.772891 c 0,-0.73125 -0.53401,-1.257631 -1.26526,-1.257631 h -2.53052 c -0.73125,0 -1.26525,0.526381 -1.26525,1.257631 v 1.25763 c 0,0.73125 0.534,1.257631 1.26525,1.257631 h 2.53052 c 0.73125,0 1.26526,-0.526381 1.26526,-1.257631 z m -2.53052,-8.8034143 3.79578,3.7728917 h -7.59155 z m -5.06103,5.0305223 v 7.545783 l -3.79578,-3.772891 z"
+       id="path9590"
+       style="display:inline;fill:url(#radialGradient4921);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4933)" />
+    <path
+       d="m 274,8 h 10 v 2 h -10 z"
+       id="path10158"
+       style="display:inline;fill:url(#radialGradient4941);fill-opacity:1;stroke-width:0.96615839" />
+    <path
+       d="m 302,10 h -4 v 4 h -2 v -4 h -4 V 8 h 4 V 4 h 2 v 4 h 4 z"
+       id="path10726"
+       style="display:inline;fill:url(#radialGradient4949);fill-opacity:1;stroke-width:0.96615839" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 406.82037,12.583531 c -0.12181,0.73125 -0.24375,1.4625 -0.4875,2.071875 -0.4875,1.584375 -1.4625,3.046875 -3.04686,4.021874 0.4875,0.4875 1.58436,1.096875 1.58436,1.096875 0,0 -2.4375,0.365625 -4.99686,0.365625 l -0.12181,-0.121875 v 0.121875 c -1.21875,0 -2.4375,-0.365625 -3.65625,-0.73125 0.85311,-0.73125 1.4625,-1.584374 1.95,-2.559374 0.73125,-1.4625 0.73125,-3.65625 0.73125,-3.65625 0,0 1.09686,1.828125 1.70625,2.559375 1.4625,-0.73125 2.4375,-2.19375 2.55936,-3.65625 0.12181,-1.096875 -0.24375,-2.071875 -0.73125,-2.8031253 -0.4875,-0.8531251 -1.21875,-1.3406251 -2.07186,-1.7062501 0.24375,-0.4874999 0.60936,-1.0968749 0.975,-1.584375 0.4875,-0.73125 1.09686,-1.21875 1.58436,-1.4625 2.55939,1.340625 4.3875,4.5093751 4.02189,8.0437504 z m -8.53125,-2.4375 c 0,0 -1.34061,-1.8281254 -1.95,-2.4375004 -1.70625,0.853125 -2.68125,2.4375004 -2.68125,4.1437504 0.12181,1.828125 1.34064,3.290625 2.925,4.021875 -0.36561,0.609375 -0.73125,1.21875 -1.21875,1.70625 -0.4875,0.609375 -1.09686,0.974999 -1.4625,1.340624 -2.80311,-1.706249 -4.50936,-4.874999 -4.02186,-8.287499 0.1218,-0.8531253 0.36561,-1.7062504 0.60936,-2.4375004 0.4875,-1.3406249 1.34064,-2.4375 2.55939,-3.290625 0.1218,-0.121875 0.24375,-0.121875 0.36561,-0.24375 -0.4875,-0.4875 -1.95,-0.975 -1.95,-0.975 0,0 3.04689,-0.975 8.2875,-0.365625 -1.58436,2.315625 -1.4625,6.8250004 -1.4625,6.8250004 z"
+       id="path11294"
+       style="display:inline;fill:url(#radialGradient4957);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4969)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 429.73975,20.187746 -2.55504,0.05558 c -0.48738,0.0106 -0.61242,-0.769541 -0.61242,-1.378916 0,0 0.31966,-4.276424 -3.79578,-8.803414 -3.20233,-3.5225593 -8.85682,-3.7728916 -8.85682,-3.7728916 -0.60938,0 -1.26177,-0.171597 -1.25602,-0.6590635 l 0.028,-2.3732094 c 0.006,-0.4874666 0.61868,-0.7406188 1.22806,-0.7406188 0,0 7.05132,0.3003217 11.38734,5.0305223 3.72704,4.065871 5.06103,11.318675 5.06103,11.318675 0,0.4875 -0.0191,1.310083 -0.62831,1.323336 z M 413.91969,8.8033655 c 0,0 4.48239,0.7421569 7.0114,3.0905195 2.59016,2.40515 3.11068,6.970525 3.11068,6.970525 0,0.4875 -0.7448,1.278471 -1.23236,1.278471 h -1.35283 c -0.4875,0 -1.21059,-0.669096 -1.21059,-1.278471 0,0 0.4472,-2.304652 -1.91012,-4.45401 -1.78736,-1.629677 -4.41618,-1.834143 -4.41618,-1.834143 -0.60938,0 -1.23946,-0.793663 -1.22806,-1.281032 l 0.028,-1.195314 c 0.0114,-0.4873685 0.59073,-1.2965455 1.20011,-1.2965455 z m 1.20944,6.3426395 c 1.34062,0 2.54933,1.124665 2.54933,2.46529 0,1.340626 -1.09688,2.576451 -2.4375,2.576451 -1.34063,0 -2.54933,-1.208035 -2.54933,-2.548661 0,-1.340625 1.09687,-2.49308 2.4375,-2.49308 z"
+       id="path11862"
+       style="display:inline;fill:url(#radialGradient4977);fill-opacity:1;stroke-width:1.21875;filter:url(#filter4989)" />
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       d="m 448.08169,13.833888 v 2.515261 c 0,0.975 -0.41214,1.257631 -1.26525,1.257631 h -10.12208 c -0.85314,0 -1.26526,-0.282631 -1.26526,-1.257631 V 6.2881044 c 0,-0.9750001 0.41212,-1.2576306 1.26526,-1.2576306 h 10.12208 c 0.85311,0 1.26525,0.2826305 1.26525,1.2576306 v 2.5152611 l 5.06104,-2.5152611 V 16.349149 Z"
+       id="path12430"
+       style="display:inline;fill:url(#radialGradient4997);fill-opacity:1;stroke-width:1.21875;filter:url(#filter5009)" />
+    <g
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline"
+       id="g4779">
+      <path
+         id="bookmarks-star-4"
+         d="M 165.92886,2.5152127 V 20.122041 h 8.85681 1.26526 2.53052 c 1.26526,0 2.53052,-1.257631 2.53052,-2.515261 V 15.091518 7.545735 5.0304738 c 0,-1.2576306 -1.26526,-2.5152611 -2.53052,-2.5152611 h -2.53052 -1.26526 z m 7.59155,2.5152611 1.26526,2.5152612 c 0,0 0.39827,0.9972133 0.68613,1.1930622 0.26974,0.1834496 1.07417,0.064568 1.07417,0.064568 h 3.30074 l -2.53052,3.1379238 c 0,0 -0.38069,0.332603 -0.51773,0.634968 -0.20593,0.452534 -0.18971,0.518683 -0.12151,1.257631 0.10732,1.162403 0.63924,3.772892 0.63924,3.772892 l -2.53052,-1.257631 c 0,0 -0.77873,-0.42944 -1.26526,-0.430166 -0.5721,0 -1.26526,0.430166 -1.26526,0.430166 l -2.53051,1.257631 c 0,0 0.56012,-2.658345 0.73559,-3.772892 0.11606,-0.733074 0.10061,-0.753616 -0.15752,-1.257631 -0.13995,-0.274086 -0.57807,-0.782455 -0.57807,-0.782455 l -2.53052,-2.9904368 h 3.02161 c 0,0 0.91024,-0.099407 1.27135,-0.3263622 0.27408,-0.1711231 0.76807,-0.9312683 0.76807,-0.9312683 z"
+         style="fill:url(#radialGradient4710);fill-opacity:1;stroke-width:1.265625;filter:url(#filter4729)" />
+      <path
+         id="bookmarks-overlay-1"
+         d="m 163.39834,2.5152127 c -1.26526,0 -2.53052,1.2576305 -2.53052,2.5152611 v 2.5152612 7.545783 2.515262 c 0,1.25763 1.26526,2.515261 2.53052,2.515261 h 2.91839 l 0.0559,-4.840061 V 7.6882296 l 0.028,-5.1730169 z"
+         style="fill:url(#radialGradient4712);fill-opacity:1;stroke:none;stroke-width:1.265625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers stroke fill;filter:url(#filter4774)" />
+      <path
+         id="bookmarks-divider-7"
+         d="M 165.92886,2.5152127 V 20.122041"
+         style="opacity:0.66300001;fill:url(#radialGradient4714);fill-opacity:1;stroke:url(#radialGradient4750);stroke-width:1.2614392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       transform="matrix(0.79035179,0,0,0.79514606,-0.14216927,3.8570695e-5)"
+       style="display:inline;fill:url(#radialGradient4709-1);fill-opacity:1;stroke-width:1;filter:url(#filter4844)"
+       id="path4214-3"
+       d="m 133.03211,35.213608 -6.32629,6.288153 c -0.24,0.36 -0.8202,0.518975 -1.3002,0.518975 -0.48,0 -0.87032,-0.158975 -1.23032,-0.518975 l -6.3263,-6.288153 c -0.6,-0.72 -0.96335,-1.29465 -0.003,-1.287183 l 3.79916,0.02955 -0.0908,-7.535242 c -0.009,-0.719949 0.67572,-1.307177 1.39571,-1.31116 l 5.02367,-0.02779 c 0.71999,-0.004 1.25401,0.619416 1.22796,1.33895 l 0.035,7.535242 3.80499,-0.02955 c 0.95998,-0.0075 0.71078,0.567183 -0.009,1.287183 z" />
+  </g>
+</svg>
diff --git a/application/palemoon/themes/osx/aboutCertError.css b/application/palemoon/themes/osx/aboutCertError.css
index dbb3530253..100bb3d3bb 100644
--- a/application/palemoon/themes/osx/aboutCertError.css
+++ b/application/palemoon/themes/osx/aboutCertError.css
@@ -33,7 +33,7 @@ h2 {
   border-radius: 10px;
   box-shadow: 0px 0px 8px red;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
   background-origin: content-box;
 }
@@ -43,16 +43,16 @@ h2 {
 }
 
 #errorTitle {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 #errorLongContent {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 .expander > button {
-  -moz-padding-start: 20px;
-  -moz-margin-start: -20px;
+  padding-inline-start: 20px;
+  margin-inline-start: -20px;
   background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
   border: none;
   font: inherit;
diff --git a/application/palemoon/themes/osx/aboutPrivateBrowsing.css b/application/palemoon/themes/osx/aboutPrivateBrowsing.css
index cd6026b8ea..35843adce6 100644
--- a/application/palemoon/themes/osx/aboutPrivateBrowsing.css
+++ b/application/palemoon/themes/osx/aboutPrivateBrowsing.css
@@ -21,7 +21,7 @@ body.normal > #errorPageContainer {
 }
 
 #startPrivateBrowsingDesc > button {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #footerDesc > p {
@@ -30,7 +30,7 @@ body.normal > #errorPageContainer {
 
 #moreInfo {
   font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-  -moz-padding-start: 25px;
+  padding-inline-start: 25px;
   background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
 }
 
diff --git a/application/palemoon/themes/osx/aboutSyncTabs.css b/application/palemoon/themes/osx/aboutSyncTabs.css
index 4f21a9d408..1fcd8304f7 100644
--- a/application/palemoon/themes/osx/aboutSyncTabs.css
+++ b/application/palemoon/themes/osx/aboutSyncTabs.css
@@ -22,18 +22,18 @@
   margin-top: 4px;
   width: 45em;
   height: 32px;
-  -moz-margin-start: 2em;
-  -moz-margin-end: 2em;
+  margin-inline-start: 2em;
+  margin-inline-end: 2em;
 }
 
 #tabsListHeading {
   font-size: 140%;
   font-weight: bold;
-  -moz-margin-start: 40px;
+  margin-inline-start: 40px;
 }
 
 richlistitem {
-  -moz-margin-end: 2em;
+  margin-inline-end: 2em;
 }
 
 richlistitem[selected="true"],
@@ -46,7 +46,7 @@ richlistitem[type="tab"] {
   border: #999999 1px solid !important;
   padding: 2px 5px;
   margin-bottom: 4px;
-  -moz-margin-start: 4em;
+  margin-inline-start: 4em;
   border-radius: 6px;
   background-color: menu;
   width: 44em;
@@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] {
 richlistitem[type="client"] {
   min-height: 2em;
   color: #000000;
-  -moz-margin-start: 2em;
+  margin-inline-start: 2em;
   margin-top: 2px;
   margin-bottom: 3px;
   width: 42em;
@@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] {
 }
 
 .tabIcon {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
   padding-top: 2px;
 }
diff --git a/application/palemoon/themes/osx/appmenu-dropmarker.png b/application/palemoon/themes/osx/appmenu-dropmarker.png
deleted file mode 100644
index 27deaff722..0000000000
Binary files a/application/palemoon/themes/osx/appmenu-dropmarker.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/appmenu-icons.png b/application/palemoon/themes/osx/appmenu-icons.png
deleted file mode 100644
index 78f3658163..0000000000
Binary files a/application/palemoon/themes/osx/appmenu-icons.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/autocomplete.css b/application/palemoon/themes/osx/autocomplete.css
index a50dbd8239..7f63bef198 100644
--- a/application/palemoon/themes/osx/autocomplete.css
+++ b/application/palemoon/themes/osx/autocomplete.css
@@ -129,15 +129,15 @@ treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) {
   width: 16px; 
   height: 16px;
   margin-bottom: -1px;
-  -moz-margin-start: 7px;
-  -moz-margin-end: 5px;
+  margin-inline-start: 7px;
+  margin-inline-end: 5px;
 }
 
 .ac-type-icon {
   width: 16px;
   height: 16px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 4px;
+  margin-inline-start: 6px;
+  margin-inline-end: 4px;
 }
 
 .ac-url-box > .ac-site-icon,
diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
index 0f8b83dde6..1314e551be 100644
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
@@ -9,22 +9,58 @@
 
 %include shared.inc
 %filter substitution
-%define toolbarHighlight rgba(255,255,255,.5)
-%define selectedTabHighlight rgba(255,255,255,.7)
 %define toolbarShadowColor rgba(10%,10%,10%,.4)
 %define toolbarShadowOnTab linear-gradient(to top, rgba(10%,10%,10%,.4) 1px, transparent 1px)
-%define bgTabTexture linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2))
-%define bgTabTextureHover linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2))
 %define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
 %define navbarLargeIcons #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar
 %define forwardTransitionLength 150ms
 %define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button"],#nav-bar:not([currentset])) > #unified-back-forward-button
 %define conditionalForwardWithUrlbarWidth 27
 
+:root {
+  --toolbox-after-color: ThreeDShadow;
+
+  --toolbar-custom-color: -moz-Dialog;
+  --toolbar-highlight-top: rgba(255,255,255,.5);
+  --toolbar-highlight-bottom: transparent;
+
+  --toolbarbutton-background-color: hsla(210,32%,93%,.3);
+  --toolbarbutton-border-radius: 2.5px;
+  --toolbarbutton-border-color: hsla(210,54%,20%,.2);
+
+  --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
+  --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.png");
+
+  --tab-background: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2));
+  --tab-background-hover: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2));
+  --tab-border-radius: 6px;
+  --tab-box-shadow: inset 0.5px 1px 1px var(--tab-selected-highlight);
+  --tab-selected-highlight: rgba(255,255,255,.7);
+}
+
+/* Use SVG for HiDPI 133%+ */
+@media (min-resolution: 1.33dppx) {
+  :root {
+    --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
+    --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg");
+  }
+}
+
+:root:-moz-lwtheme-brighttext {
+  --toolbar-highlight-top: rgba(32,32,32,.8);
+  --toolbar-highlight-bottom: rgba(32,32,32,0);
+}
+
+:root:-moz-lwtheme-darktext {
+  --toolbar-highlight-top: rgba(255,255,255,.8);
+  
+  --tab-selected-highlight: rgba(255,255,255,.6);
+}
+
 #navigator-toolbox {
-    -moz-appearance: none;
-    background-color: transparent;
-    border-top: none;
+  -moz-appearance: none;
+  background-color: transparent;
+  border-top: none;
 }
 
 #main-window {
@@ -33,66 +69,58 @@
 }
 
 #navigator-toolbox::after {
-    content: "";
-    display: -moz-box;
-    -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
-    height: 1px;
-    background-color: ThreeDShadow;
+  content: "";
+  display: -moz-box;
+  -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
+  height: 1px;
+  background-color: var(--toolbox-after-color);
 }
 #navigator-toolbox[tabsontop=false]::after,
 #main-window[disablechrome] #navigator-toolbox::after {
-    visibility: collapse;
+  visibility: collapse;
 }
 
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
-    -moz-appearance: none;
-    border-style: none;
-    background-color: -moz-Dialog;
+  -moz-appearance: none;
+  border-style: none;
+  background-color: var(--toolbar-custom-color);
 }
 
 #nav-bar[tabsontop=true]:not(:-moz-lwtheme),
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + toolbar,
 #nav-bar[tabsontop=true][collapsed=true]:not([customizing]):not(:-moz-lwtheme) + #customToolbars + #PersonalToolbar {
-    background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
-}
-
-#nav-bar[tabsontop=true]:-moz-lwtheme,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme + #customToolbars + #PersonalToolbar {
-    background-image: linear-gradient(rgba(255,255,255,.8), rgba(255,255,255,0));
-}
-
-#nav-bar[tabsontop=true]:-moz-lwtheme-brighttext,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme-brighttext + toolbar,
-#nav-bar[tabsontop=true][collapsed=true]:not([customizing]):-moz-lwtheme-brighttext + #customToolbars + #PersonalToolbar {
-    background-image: linear-gradient(rgba(32,32,32,.8), rgba(32,32,32,0));
+  background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-bottom));
 }
 
 /* Blend the topmost toolbar with the titlebar */
 #main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #nav-bar:not(:-moz-lwtheme),
+#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #PersonalToolbar[collapsed=true]
+ ~ #TabsToolbar:not(:-moz-lwtheme),
 #main-window[tabsontop=true]:not([privatebrowsingmode=temporary]) #TabsToolbar:not(:-moz-lwtheme) {
-    -moz-appearance: toolbar;
+  -moz-appearance: toolbar;
 }
 
 #main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme),
+#main-window[tabsontop=false][privatebrowsingmode=temporary] #PersonalToolbar[collapsed=true]
+ ~ #TabsToolbar:not(:-moz-lwtheme),
 #main-window[tabsontop=true][privatebrowsingmode=temporary] #TabsToolbar:not(:-moz-lwtheme) {
-    background-color: transparent;
+  background-color: transparent;
 }
 
 #main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme) {
-    border-bottom: 1px solid rgba(26,26,26,0.2);
+  border-bottom: 1px solid rgba(26,26,26,0.2);
 }
 
 #personal-bookmarks {
-    min-height: 24px;
+  min-height: 24px;
 }
 
 #print-preview-toolbar:not(:-moz-lwtheme) {
-    -moz-appearance: toolbox;
+  -moz-appearance: toolbox;
 }
 
 #browser-bottombox:not(:-moz-lwtheme) {
-    background-color: -moz-dialog;
+  background-color: var(--toolbar-custom-color);
 }
 
 
@@ -100,52 +128,52 @@
 /* ::::: titlebar ::::: */
 
 #main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar {
-    -moz-appearance: -moz-window-titlebar;
+  -moz-appearance: -moz-window-titlebar;
 }
 
 #main-window[sizemode="maximized"] > #titlebar {
-    -moz-appearance: -moz-window-titlebar-maximized;
+  -moz-appearance: -moz-window-titlebar-maximized;
 }
 
 #titlebar-buttonbox {
-    -moz-appearance: -moz-window-button-box;
+  -moz-appearance: -moz-window-button-box;
 }
 
 .titlebar-placeholder[type="appmenu-button"] {
-    margin-left: 4px;
+  margin-left: 4px;
 }
 
 .titlebar-placeholder[type="caption-buttons"] {
-    margin-left: 10px;
+  margin-left: 10px;
 }
 
 /* titlebar command buttons */
 
 #titlebar-min {
-    -moz-appearance: -moz-window-button-minimize;
+  -moz-appearance: -moz-window-button-minimize;
 }
 
 #titlebar-max {
-    -moz-appearance: -moz-window-button-maximize;
+  -moz-appearance: -moz-window-button-maximize;
 }
 
 #main-window[sizemode="maximized"] #titlebar-max {
-    -moz-appearance: -moz-window-button-restore;
+  -moz-appearance: -moz-window-button-restore;
 }
 
 #titlebar-close {
-    -moz-appearance: -moz-window-button-close;
+  -moz-appearance: -moz-window-button-close;
 }
 
 /* ensure titlebar on privacy windows is of correct size */
 #titlebar {
-    height: 22px;
+  height: 22px;
 }
 
 /* ensure extra titlebar doesn't appear on normal (e.g. non-privacy) windows */
 #main-window:not([privatebrowsingmode=temporary]):not(:-moz-lwtheme) > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
 #main-window:not([drawintitlebar=true]):not(:-moz-lwtheme) > #titlebar {
-    display: none;
+  display: none;
 }
 
 #titlebar-buttonbox-container {
@@ -179,11 +207,11 @@ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
 
 @media (min-resolution: 2dppx) {
   toolbarbutton.chevron {
-    list-style-image: url("chrome://global/skin/icons/chevron@2x.png");
+  list-style-image: url("chrome://global/skin/icons/chevron@2x.png");
   }
 
   toolbarbutton.chevron > .toolbarbutton-icon {
-    width: 13px;
+  width: 13px;
   }
 }
 
@@ -201,18 +229,18 @@ toolbarbutton.bookmark-item {
   list-style-image: url("chrome://browser/skin/places/folderDropArrow.png");
   -moz-image-region: rect(0, 7px, 5px, 0);
   margin-top: 1px;
-  -moz-margin-start: 3px;
-  -moz-margin-end: -2px;
+  margin-inline-start: 3px;
+  margin-inline-end: -2px;
 }
 
 @media (min-resolution: 2dppx) {
   .bookmark-item > .toolbarbutton-menu-dropmarker {
-    list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png");
-    -moz-image-region: rect(0, 14px, 10px, 0);
+  list-style-image: url("chrome://browser/skin/places/folderDropArrow@2x.png");
+  -moz-image-region: rect(0, 14px, 10px, 0);
   }
 
   .bookmark-item > .toolbarbutton-menu-dropmarker > .dropmarker-icon {
-    width: 7px;
+  width: 7px;
   }
 }
 
@@ -240,7 +268,7 @@ toolbarbutton.bookmark-item[open="true"] {
 @media (min-resolution: 2dppx) {
   .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
   .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
-    -moz-image-region: rect(10px, 14px, 20px, 0);
+  -moz-image-region: rect(10px, 14px, 20px, 0);
   }
 }
 
@@ -252,7 +280,7 @@ toolbarbutton.bookmark-item[open="true"] {
 
 toolbarbutton.bookmark-item > menupopup {
   margin-top: 2px;
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 .bookmark-item > .toolbarbutton-icon {
@@ -263,7 +291,7 @@ toolbarbutton.bookmark-item > menupopup {
 
 .bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
 .bookmark-item > .toolbarbutton-icon[type="menu"] {
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 
 .bookmark-item[container] {
@@ -305,35 +333,35 @@ toolbarbutton.bookmark-item > menupopup {
 
 @media (min-resolution: 2dppx) {
   .bookmark-item[container] {
-    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  list-style-image: url("chrome://global/skin/tree/folder@2x.png");
   }
 
   .bookmark-item[container][livemark] {
-    list-style-image: url("chrome://browser/skin/page-livemarks@2x.png");
+  list-style-image: url("chrome://browser/skin/page-livemarks@2x.png");
   }
 
   .bookmark-item[container][livemark] .bookmark-item {
-    list-style-image: url("chrome://browser/skin/places/livemark-item.png");
+  list-style-image: url("chrome://browser/skin/places/livemark-item.png");
   }
 
   .bookmark-item[container][query] {
-    list-style-image: url("chrome://browser/skin/places/query@2x.png");
+  list-style-image: url("chrome://browser/skin/places/query@2x.png");
   }
 
   .bookmark-item[query][tagContainer] {
-    list-style-image: url("chrome://browser/skin/places/tag@2x.png");
+  list-style-image: url("chrome://browser/skin/places/tag@2x.png");
   }
 
   .bookmark-item[query][dayContainer] {
-    list-style-image: url("chrome://browser/skin/places/history@2x.png");
+  list-style-image: url("chrome://browser/skin/places/history@2x.png");
   }
 
   .bookmark-item[query][hostContainer] {
-    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  list-style-image: url("chrome://global/skin/tree/folder@2x.png");
   }
 
   .bookmark-item[query][hostContainer][open] {
-    list-style-image: url("chrome://global/skin/tree/folder@2x.png");
+  list-style-image: url("chrome://global/skin/tree/folder@2x.png");
   }
 }
 
@@ -357,7 +385,7 @@ toolbarbutton.bookmark-item > menupopup {
 @media (min-resolution: 2dppx) {
   .bookmark-item > .toolbarbutton-icon,
   .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-    image-rendering: -moz-crisp-edges;
+  image-rendering: -moz-crisp-edges;
   }
 }
 
@@ -372,16 +400,16 @@ toolbarbutton.bookmark-item > menupopup {
 
 @media (min-resolution: 2dppx) {
   #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
-    background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
-    background-size: 16px;
+  background-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+  background-size: 16px;
   }
 
   .bookmarks-toolbar-customize {
-    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png") !important;
   }
 
   .bookmarks-toolbar-customize > .toolbarbutton-icon {
-    width: 16px;
+  width: 16px;
   }
 }
 
@@ -395,11 +423,11 @@ toolbarbutton.bookmark-item > menupopup {
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
-    list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: var(--toolbarbutton-image);
 }
 
 toolbar[brighttext] .toolbarbutton-1 {
-    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+  list-style-image: var(--toolbarbutton-inverted-image);
 }
 
 .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
@@ -407,136 +435,136 @@ toolbar[brighttext] .toolbarbutton-1 {
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
-    opacity: .4;
+  opacity: .4;
 }
 
 .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
 }
 
 toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
 }
 
 .toolbarbutton-1 > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-    -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) {
-    -moz-box-orient: vertical;
+  -moz-box-orient: vertical;
 }
 
 toolbar[mode=full] .toolbarbutton-1,
 toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-    min-width: 57px;
+  min-width: 57px;
 }
 
 #nav-bar {
-    /* force iconsize="small" on this toolbar */
-    counter-reset: smallicons;
+  /* force iconsize="small" on this toolbar */
+  counter-reset: smallicons;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1,
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-    -moz-appearance: none;
-    border: none;
-    padding: 0;
-    background: none;
+  -moz-appearance: none;
+  border: none;
+  padding: 0;
+  background: none;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1:not([type=menu-button]),
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-    padding: 5px 2px;
-    -moz-box-pack: center;
+  padding: 5px 2px;
+  -moz-box-pack: center;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) {
-    padding-left: 5px;
-    padding-right: 5px;
+  padding-left: 5px;
+  padding-right: 5px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > menupopup {
-    margin-top: -3px;
+  margin-top: -3px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-    -moz-padding-end: 0;
+  padding-inline-end: 0;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-    -moz-padding-start: 0;
-    -moz-box-align: center;
+  padding-inline-start: 0;
+  -moz-box-align: center;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack,
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-    padding: 2px 6px;
-    background: hsla(210,32%,93%,.3) padding-box;
-    background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1));
-    background-clip: padding-box;
-    border-radius: 2.5px;
-    border: 1px solid;
-    border-color: hsla(210,54%,20%,.2) hsla(210,54%,20%,.2) hsla(210,54%,20%,.2);
-    box-shadow: 0 1px hsla(0,0%,100%,.05) inset,
-        0 1px hsla(210,54%,20%,.05),
-        0 0 2px hsla(210,54%,20%,.05);
-    transition-property: background-image, background-color, border-color, box-shadow;
-    transition-duration: 150ms;
+  padding: 2px 6px;
+  background: var(--toolbarbutton-background-color) padding-box;
+  background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1));
+  background-clip: padding-box;
+  border-radius: var(--toolbarbutton-border-radius);
+  border: 1px solid;
+  border-color: var(--toolbarbutton-border-color) var(--toolbarbutton-border-color) var(--toolbarbutton-border-color);
+  box-shadow: 0 1px hsla(0,0%,100%,.05) inset,
+              0 1px hsla(210,54%,20%,.05),
+              0 0 2px hsla(210,54%,20%,.05);
+  transition-property: background-image, background-color, border-color, box-shadow;
+  transition-duration: 150ms;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-stack,
 @navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-    padding: 3px 7px;
+  padding: 3px 7px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
-    -moz-padding-end: 17px;
+  padding-inline-end: 17px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
-    -moz-margin-start: -15px;
+  margin-inline-start: -15px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-    -moz-border-end: none;
+  border-inline-end: none;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-    padding: 8px 5px 7px;
+  padding: 8px 5px 7px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before {
-    content: "";
-    display: -moz-box;
-    width: 1px;
-    height: 18px;
-    -moz-margin-end: -1px;
-    background-image: linear-gradient(hsla(210,54%,20%,.2) 0, hsla(210,54%,20%,.2) 18px);
-    background-clip: padding-box;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: 1px 18px;
-    box-shadow: 0 0 0 1px hsla(0,0%,100%,.2);
+  content: "";
+  display: -moz-box;
+  width: 1px;
+  height: 18px;
+  margin-inline-end: -1px;
+  background-image: linear-gradient(var(--toolbarbutton-border-color) 0, var(--toolbarbutton-border-color) 18px);
+  background-clip: padding-box;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 1px 18px;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.2);
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr),
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl),
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
@@ -544,56 +572,56 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack,
 @conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([open]):not([disabled]):not(:active)) > .toolbarbutton-icon {
-    background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5));
-    border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35);
-    box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
-        0 1px hsla(210,54%,20%,.03),
-        0 0 2px hsla(210,54%,20%,.1);
-    transition-property: background-image, background-color, border-color, box-shadow;
-    transition-duration: 150ms;
+  background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5));
+  border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35);
+  box-shadow: 0 1px hsla(0,0%,100%,.3) inset,
+              0 1px hsla(210,54%,20%,.03),
+              0 0 2px hsla(210,54%,20%,.1);
+  transition-property: background-image, background-color, border-color, box-shadow;
+  transition-duration: 150ms;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
 @conditionalForwardWithUrlbar@ > #forward-button:not([open]):not(:active):not([disabled]):hover > .toolbarbutton-icon {
-    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
-    background-color: hsla(210,48%,96%,.75);
-    box-shadow: 0 0 1px hsla(210,54%,20%,.03),
-        0 0 2px hsla(210,54%,20%,.1);
+  border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+  background-color: hsla(210,48%,96%,.75);
+  box-shadow: 0 0 1px hsla(210,54%,20%,.03),
+    0 0 2px hsla(210,54%,20%,.1);
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon,
 @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack {
-    background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-    background-color: hsla(210,54%,20%,.15);
-    border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
-    box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-        0 0 1px hsla(210,54%,20%,.2) inset,
-        /* allows windows-keyhole-forward-clip-path to be used for non-hover as well as hover: */
-        0 1px 0 hsla(210,54%,20%,0),
-        0 0 2px hsla(210,54%,20%,0);
-    text-shadow: none;
-    transition: none;
+  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+  background-color: hsla(210,54%,20%,.15);
+  border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4);
+  box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
+              0 0 1px var(--toolbarbutton-border-color) inset,
+              /* allows osx-keyhole-forward-clip-path to be used for non-hover as well as hover: */
+              0 1px 0 hsla(210,54%,20%,0),
+              0 0 2px hsla(210,54%,20%,0);
+  text-shadow: none;
+  transition: none;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
-    -moz-border-start-color: hsla(210,54%,20%,.35);
+  border-inline-start-color: hsla(210,54%,20%,.35);
 }
 
 @navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
-    background-color: rgba(90%,90%,90%,.4);
-    transition: background-color .4s;
+  background-color: rgba(90%,90%,90%,.4);
+  transition: background-color .4s;
 }
 
 :-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
 :-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
-    -moz-appearance: none;
-    border-style: none;
-    padding: 0 3px;
+  -moz-appearance: none;
+  border-style: none;
+  padding: 0 3px;
 }
 
 #TabsToolbar .toolbarbutton-1:not([disabled]):hover,
@@ -601,230 +629,231 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 #TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover,
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover {
-    background-image: linear-gradient(rgba(255,255,255,0), rgba(255,255,255,.5)),
-        linear-gradient(transparent, rgba(0,0,0,.25) 30%),
-        linear-gradient(transparent, rgba(0,0,0,.25) 30%);
-    background-position: 1px -1px, 0 -1px, 100% -1px;
-    background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
-    background-repeat: no-repeat;
+  background-image: linear-gradient(var(--toolbar-highlight-bottom), var(--toolbar-highlight-top)),
+                    linear-gradient(transparent, rgba(0,0,0,.25) 30%),
+                    linear-gradient(transparent, rgba(0,0,0,.25) 30%);
+  background-position: 1px -1px, 0 -1px, 100% -1px;
+  background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
+  background-repeat: no-repeat;
 }
 
 #addon-bar .toolbarbutton-1:not([disabled]):hover,
 #addon-bar .toolbarbutton-1[open],
 #addon-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover {
-    background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
-        linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
-        linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
-    background-position: left, left, right;
-    background-size: auto, 1px 100%, 1px 100%;
-    background-repeat: no-repeat;
+  background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)),
+                    linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%),
+                    linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%);
+  background-position: left, left, right;
+  background-size: auto, 1px 100%, 1px 100%;
+  background-repeat: no-repeat;
 }
 
 /* unified back/forward button */
 
 #back-button {
-    -moz-image-region: rect(0, 18px, 18px, 0);
+  -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
 #forward-button {
-    -moz-image-region: rect(0, 36px, 18px, 18px);
+  -moz-image-region: rect(0, 36px, 18px, 18px);
 }
 
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #forward-button:-moz-locale-dir(rtl),
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
-    transform: scaleX(-1);
+  transform: scaleX(-1);
 }
 
 @conditionalForwardWithUrlbar@ {
-    -moz-box-align: center;
+  -moz-box-align: center;
 }
 
 @conditionalForwardWithUrlbar@ > #forward-button {
-    padding: 0;
+  padding: 0;
 }
 
 @conditionalForwardWithUrlbar@ > #forward-button > menupopup {
-    margin-top: 1px;
+  margin-top: 1px;
 }
 
 @conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon {
-    /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
-    clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
-    -moz-margin-start: -9px !important;
-    border-left-style: none;
-    border-radius: 0;
-    padding-left: 7px;
-    padding-right: 3px;
+  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
+  clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
+  margin-inline-start: -9px !important;
+  border-left-style: none;
+  border-radius: 0;
+  padding-left: 7px;
+  padding-right: 3px;
 }
 
 @conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
-    transition: opacity @forwardTransitionLength@ ease-out;
+  transition: opacity @forwardTransitionLength@ ease-out;
 }
 
 @conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
-    /*  opacity: 0; */
+  /*  opacity: 0; */
 }
 
 @conditionalForwardWithUrlbar@ > #back-button {
-    -moz-image-region: rect(18px, 20px, 38px, 0);
-    padding-top: 3px;
-    padding-bottom: 3px;
-    -moz-padding-start: 5px;
-    -moz-padding-end: 0;
-    position: relative;
-    z-index: 1;
-    border-radius: 0 10000px 10000px 0;
+  -moz-image-region: rect(18px, 20px, 38px, 0);
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0;
+  position: relative;
+  z-index: 1;
+  border-radius: 0 10000px 10000px 0;
 }
 
 @conditionalForwardWithUrlbar@ > #back-button:-moz-locale-dir(rtl) {
-    border-radius: 10000px 0 0 10000px;
+  border-radius: 10000px 0 0 10000px;
 }
 
 @conditionalForwardWithUrlbar@ > #back-button > menupopup {
-    margin-top: -1px;
+  margin-top: -1px;
 }
 
 @conditionalForwardWithUrlbar@ > #back-button > .toolbarbutton-icon {
-    border-radius: 10000px;
-    padding: 5px;
-    border: none;
-    background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
-    box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-        0 0 0 1px hsla(0,0%,100%,.3) inset,
-        0 0 0 1px hsla(210,54%,20%,.25),
-        0 1px 0 hsla(210,54%,20%,.35);
-    transition-property: background-color, box-shadow;
-    transition-duration: 250ms;
+  border-radius: 10000px;
+  padding: 5px;
+  border: none;
+  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
+              0 0 0 1px hsla(0,0%,100%,.3) inset,
+              0 0 0 1px hsla(210,54%,20%,.25),
+              0 1px 0 hsla(210,54%,20%,.35);
+  transition-property: background-color, box-shadow;
+  transition-duration: 250ms;
 }
 
 @conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
-    background-color: hsla(210,48%,96%,.75);
-    box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-        0 0 0 1px hsla(0,0%,100%,.3) inset,
-        0 0 0 1px hsla(210,54%,20%,.3),
-        0 1px 0 hsla(210,54%,20%,.4),
-        0 0 4px hsla(210,54%,20%,.2);
+  background-color: hsla(210,48%,96%,.75);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
+              0 0 0 1px hsla(0,0%,100%,.3) inset,
+              0 0 0 1px hsla(210,54%,20%,.3),
+              0 1px 0 hsla(210,54%,20%,.4),
+              0 0 4px var(--toolbarbutton-border-color);
 }
 
 @conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
 @conditionalForwardWithUrlbar@ > #back-button[open="true"] > .toolbarbutton-icon {
-    background-color: hsla(210,54%,20%,.15);
-    box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
-        0 0 1px hsla(210,54%,20%,.2) inset,
-        0 0 0 1px hsla(210,54%,20%,.4),
-        0 1px 0 hsla(210,54%,20%,.2);
-    transition: none;
+  background-color: hsla(210,54%,20%,.15);
+  box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
+              0 0 1px var(--toolbarbutton-border-color) inset,
+              0 0 0 1px hsla(210,54%,20%,.4),
+              0 1px 0 var(--toolbarbutton-border-color);
+  transition: none;
 }
 
 @conditionalForwardWithUrlbar@ > #back-button[disabled] > .toolbarbutton-icon {
-    box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
-        0 1px 0 hsla(210,54%,20%,.65);
-    transition: none;
+  box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
+              0 1px 0 hsla(210,54%,20%,.65);
+  transition: none;
 }
 
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
-    list-style-image: url("chrome://browser/skin/menu-back.png") !important;
+  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
 }
 
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
-    list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
+  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
 }
 
 #stop-button {
-    -moz-image-region: rect(0, 54px, 18px, 36px);
+  -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
 #reload-button {
-    -moz-image-region: rect(0, 72px, 18px, 54px);
+  -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
 #home-button.bookmark-item {
-    list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: var(--toolbarbutton-image);
 }
+
 toolbar[brighttext] #home-button.bookmark-item {
-    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+  list-style-image: var(--toolbarbutton-inverted-image);
 }
 
 #home-button {
-    -moz-image-region: rect(0, 90px, 18px, 72px);
+  -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
 #downloads-button {
-    -moz-image-region: rect(0, 108px, 18px, 90px);
+  -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
 #history-button,
 #history-menu-button {
-    -moz-image-region: rect(0, 126px, 18px, 108px);
+  -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
 #bookmarks-button,
 #bookmarks-menu-button {
-    -moz-image-region: rect(0, 144px, 18px, 126px);
+  -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
 #bookmarks-menu-button.bookmark-item {
-    list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: var(--toolbarbutton-image);
 }
 
 toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
-    list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+  list-style-image: var(--toolbarbutton-inverted-image);
 }
 
 #print-button {
-    -moz-image-region: rect(0, 162px, 18px, 144px);
+  -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
 #new-tab-button {
-    -moz-image-region: rect(0, 180px, 18px, 162px);
+  -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
 #new-window-button {
-    -moz-image-region: rect(0, 198px, 18px, 180px);
+  -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
 #cut-button {
-    -moz-image-region: rect(0, 216px, 18px, 198px);
+  -moz-image-region: rect(0, 216px, 18px, 198px);
 }
 
 #copy-button {
-    -moz-image-region: rect(0, 234px, 18px, 216px);
+  -moz-image-region: rect(0, 234px, 18px, 216px);
 }
 
 #paste-button {
-    -moz-image-region: rect(0, 252px, 18px, 234px);
+  -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
 #fullscreen-button {
-    -moz-image-region: rect(0, 270px, 18px, 252px);
+  -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
 #zoom-out-button {
-    -moz-image-region: rect(0, 288px, 18px, 270px);
+  -moz-image-region: rect(0, 288px, 18px, 270px);
 }
 
 #zoom-in-button {
-    -moz-image-region: rect(0, 306px, 18px, 288px);
+  -moz-image-region: rect(0, 306px, 18px, 288px);
 }
 
 #sync-button {
-    -moz-image-region: rect(0, 324px, 18px, 306px);
+  -moz-image-region: rect(0, 324px, 18px, 306px);
 }
 #sync-button[status="active"] {
-    list-style-image: url("chrome://browser/skin/sync-throbber.png");
-    -moz-image-region: rect(0, 18px, 18px, 0);
+  list-style-image: url("chrome://browser/skin/sync-throbber.png");
+  -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
 #feed-button {
-    -moz-image-region: rect(0, 342px, 18px, 324px);
+  -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
 %ifdef MOZ_WEBRTC
 #webrtc-status-button {
-    -moz-image-region: rect(0, 360px, 18px, 342px);
+  -moz-image-region: rect(0, 360px, 18px, 342px);
 }
 %endif
 
@@ -832,211 +861,211 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
 
 #urlbar,
 .searchbar-textbox {
-    -moz-appearance: none;
-    margin: 1px 3px;
-    padding: 0;
-    background-clip: padding-box;
-    border: 1px solid ThreeDShadow;
-    border-radius: 2px;
+  -moz-appearance: none;
+  margin: 1px 3px;
+  padding: 0;
+  background-clip: padding-box;
+  border: 1px solid ThreeDShadow;
+  border-radius: 2px;
 }
 
 #urlbar {
-    width: 7em;
-    -moz-padding-end: 2px;
+  width: 7em;
+  padding-inline-end: 2px;
 }
 
 @media (-moz-mac-lion-theme) {
-    #urlbar,
-    .searchbar-textbox {
-        @navbarTextboxCustomBorder@
-    }
+  #urlbar,
+  .searchbar-textbox {
+    @navbarTextboxCustomBorder@
+  }
 }
 
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
-    background-color: rgba(255,255,255,.8);
-    @navbarTextboxCustomBorder@
-    color: black;
+  background-color: rgba(255,255,255,.8);
+  @navbarTextboxCustomBorder@
+  color: black;
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container {
-    padding-left: @conditionalForwardWithUrlbarWidth@px;
-    -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
-    position: relative;
-    pointer-events: none;
+  padding-left: @conditionalForwardWithUrlbarWidth@px;
+  margin-inline-start: -@conditionalForwardWithUrlbarWidth@px;
+  position: relative;
+  pointer-events: none;
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
-    -moz-border-start: none;
-    margin-left: 0;
-    pointer-events: all;
+  border-inline-start: none;
+  margin-left: 0;
+  pointer-events: all;
 }
 
 @conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar {
-    transition: margin-left @forwardTransitionLength@ ease-out;
+  transition: margin-left @forwardTransitionLength@ ease-out;
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container {
-    clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");
+  clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl),
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
-    /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
-    transform: scaleX(-1);
+  /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
+  transform: scaleX(-1);
 }
 
 html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 .searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
-    opacity: 1.0;
-    color: #777;
+  opacity: 1.0;
+  color: #777;
 }
 
 #urlbar:-moz-lwtheme[focused="true"],
 .searchbar-textbox:-moz-lwtheme[focused="true"] {
-    background-color: white;
+  background-color: white;
 }
 
 #urlbar-container {
-    -moz-box-orient: horizontal;
-    -moz-box-align: stretch;
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
 }
 
 .urlbar-textbox-container {
-    -moz-box-align: stretch;
+  -moz-box-align: stretch;
 }
 
 .urlbar-input-box {
-    -moz-margin-start: 0;
-    min-width: 4em;
+  margin-inline-start: 0;
+  min-width: 4em;
 }
 
 #urlbar-icons {
-    -moz-box-align: center;
+  -moz-box-align: center;
 }
 
 .urlbar-icon {
-    padding: 0 3px;
+  padding: 0 3px;
 }
 
 .searchbar-engine-button,
 .search-go-container {
-    padding: 2px 2px;
+  padding: 2px 2px;
 }
 
 .urlbar-icon:hover {
-    background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0));
+  background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0));
 }
 
 .urlbar-icon[open="true"],
 .urlbar-icon:hover:active {
-    background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0));
+  background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0));
 }
 
 #urlbar-search-splitter {
-    min-width: 6px;
-    -moz-margin-start: -3px;
-    border: none;
-    background: transparent;
+  min-width: 6px;
+  margin-inline-start: -3px;
+  border: none;
+  background: transparent;
 }
 
 #urlbar-search-splitter + #urlbar-container > #urlbar ,
 #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
-    -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #urlbar-display-box {
-    -moz-border-end: 1px solid #AAA;
-    -moz-margin-end: 3px;
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px;
 }
 
 #urlbar-display {
-    margin-top: 0;
-    margin-bottom: 0;
-    -moz-margin-start: 0;
-    color: GrayText;
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-inline-start: 0;
+  color: GrayText;
 }
 
 /* identity box */
 
 #identity-box {
-    padding: 2px;
-    font-size: .9em;
+  padding: 2px;
+  font-size: .9em;
 }
 
 #identity-box:-moz-locale-dir(ltr) {
-    border-top-left-radius: 1.5px;
-    border-bottom-left-radius: 1.5px;
+  border-top-left-radius: 1.5px;
+  border-bottom-left-radius: 1.5px;
 }
 
 #identity-box:-moz-locale-dir(rtl) {
-    border-top-right-radius: 1.5px;
-    border-bottom-right-radius: 1.5px;
+  border-top-right-radius: 1.5px;
+  border-bottom-right-radius: 1.5px;
 }
 
 #notification-popup-box:not([hidden]) + #identity-box {
-    -moz-padding-start: 10px;
-    border-radius: 0;
+  padding-inline-start: 10px;
+  border-radius: 0;
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box {
-    border-radius: 0;
+  border-radius: 0;
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-    color: hsl(92,100%,30%);
-    -moz-margin-end: 4px;
-    background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
-        hsla(92,81%,16%,.08) 25%,
-        hsla(92,81%,16%,.08) 75%,
-        hsla(92,81%,16%,0));
-    background-position: right;
-    background-repeat: no-repeat; 
+  color: hsl(92,100%,30%);
+  margin-inline-end: 4px;
+  background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
+    hsla(92,81%,16%,.08) 25%,
+    hsla(92,81%,16%,.08) 75%,
+    hsla(92,81%,16%,0));
+  background-position: right;
+  background-repeat: no-repeat; 
 }
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain {
-    color: rgb(0,79,168);
-    -moz-margin-end: 4px;
-    background-image: -moz-linear-gradient(rgba(0,79,168,0),
-        rgba(0,79,168,.08) 25%,
-        rgba(0,79,168,.08) 75%,
-        rgba(0,79,168,0));
-    background-position: right;
-    background-repeat: no-repeat;
+  color: rgb(0,79,168);
+  margin-inline-end: 4px;
+  background-image: -moz-linear-gradient(rgba(0,79,168,0),
+    rgba(0,79,168,.08) 25%,
+    rgba(0,79,168,.08) 75%,
+    rgba(0,79,168,0));
+  background-position: right;
+  background-repeat: no-repeat;
 }
 
 #identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
-    background-position: left;
+  background-position: left;
 }
 
 #identity-box.verifiedIdentity:not(:-moz-lwtheme) {
-    background-color: #fff;
-    box-shadow: inset 0 0 2px rgb(0,168,0);
+  background-color: #fff;
+  box-shadow: inset 0 0 2px rgb(0,168,0);
 }
 
 #identity-box.verifiedDomain:not(:-moz-lwtheme) {
-    background-color: rgb(224,234,247);
-    box-shadow: inset 0 0 2px rgb(0,79,168);
+  background-color: rgb(224,234,247);
+  box-shadow: inset 0 0 2px rgb(0,79,168);
 }
 
 #identity-box:-moz-focusring {
-    outline: 1px dotted #000;
-    outline-offset: -3px;
+  outline: 1px dotted #000;
+  outline-offset: -3px;
 }
 
 #identity-icon-labels {
-    -moz-padding-start: 2px;
-    -moz-padding-end: 5px;
+  padding-inline-start: 2px;
+  padding-inline-end: 5px;
 }
 
 /* Address bar shading for SSL */
@@ -1073,282 +1102,282 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 /* Location bar dropmarker */
 
 .urlbar-history-dropmarker {
-    -moz-appearance: none;
-    padding: 0 3px;
-    background-color: transparent;
-    border: none;
-    width: auto;
-    list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png");
-    -moz-image-region: rect(0px, 11px, 14px, 0px);
+  -moz-appearance: none;
+  padding: 0 3px;
+  background-color: transparent;
+  border: none;
+  width: auto;
+  list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png");
+  -moz-image-region: rect(0px, 11px, 14px, 0px);
 }
 
 .urlbar-history-dropmarker:hover {
-    background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
-    -moz-image-region: rect(0px, 22px, 14px, 11px);
+  background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
+  -moz-image-region: rect(0px, 22px, 14px, 11px);
 }
 
 .urlbar-history-dropmarker:hover:active,
 .urlbar-history-dropmarker[open="true"] {
-    background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0));
-    -moz-image-region: rect(0px, 33px, 14px, 22px);
+  background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0));
+  -moz-image-region: rect(0px, 33px, 14px, 22px);
 }
 
 /* page proxy icon */
 
 #page-proxy-favicon {
-    width: 16px;
-    height: 16px;
-    margin-top: 1px;
-    margin-bottom: 1px;
-    -moz-margin-start: 3px;
-    -moz-margin-end: 2px;
-    list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
-    -moz-image-region: rect(0, 16px, 16px, 0);
+  width: 16px;
+  height: 16px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  margin-inline-start: 3px;
+  margin-inline-end: 2px;
+  list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon {
-    -moz-margin-end: 1px;
+  margin-inline-end: 1px;
 }
 
 /* Since we already have a padlock, always use the generic icon until the favicon loads
 .verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
-    list-style-image: url(chrome://browser/skin/identity-icons-https.png);
+  list-style-image: url(chrome://browser/skin/identity-icons-https.png);
 }
 
 .verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
-    list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
+  list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
 }
 
 .mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
-    list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
+  list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
 }
 */
 
 #identity-box:hover > #page-proxy-favicon {
-    -moz-image-region: rect(0, 32px, 16px, 16px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 #identity-box:hover:active > #page-proxy-favicon,
 #identity-box[open=true] > #page-proxy-favicon {
-    -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 #page-proxy-favicon[pageproxystate="invalid"] {
-    opacity: 0.3;
+  opacity: 0.3;
 }
 
 /* autocomplete */
 
 #treecolAutoCompleteImage {
-    max-width: 36px;
+  max-width: 36px;
 }
 
 .ac-result-type-bookmark,
 .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-    list-style-image: url("chrome://browser/skin/places/bookmark.png");
-    -moz-image-region: rect(0px 48px 16px 32px);
-    width: 16px;
-    height: 16px;
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 48px 16px 32px);
+  width: 16px;
+  height: 16px;
 }
 
 .ac-result-type-keyword,
 .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
-    list-style-image: url(chrome://global/skin/icons/search-textbox.png);
-    margin: 2px;
-    width: 12px;
-    height: 12px;
+  list-style-image: url(chrome://global/skin/icons/search-textbox.png);
+  margin: 2px;
+  width: 12px;
+  height: 12px;
 }
 
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-    list-style-image: url("chrome://browser/skin/places/tag.png");
-    width: 16px;
-    height: 16px;
+  list-style-image: url("chrome://browser/skin/places/tag.png");
+  width: 16px;
+  height: 16px;
 }
 
 .ac-comment {
-    font-size: 1.06em;
+  font-size: 1.06em;
 }
 
 .ac-extra > .ac-comment {
-    font-size: 1em;
+  font-size: 1em;
 }
 
 .ac-url-text,
 .ac-action-text {
-    font-size: 1em;
-    color: -moz-nativehyperlinktext;
+  font-size: 1em;
+  color: -moz-nativehyperlinktext;
 }
 
 @media (-moz-mac-lion-theme) {
-    .ac-url-text:not([selected="true"]),
-    .ac-action-text:not([selected="true"]) {
-        color: #008800;
-    }
+  .ac-url-text:not([selected="true"]),
+  .ac-action-text:not([selected="true"]) {
+    color: #008800;
+  }
 }
 
 richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
-    list-style-image: url("chrome://browser/skin/actionicon-tab.png");
-    -moz-image-region: rect(0, 16px, 11px, 0);
-    padding: 0 3px;
+  list-style-image: url("chrome://browser/skin/actionicon-tab.png");
+  -moz-image-region: rect(0, 16px, 11px, 0);
+  padding: 0 3px;
 }
 
 richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-box > .ac-action-icon {
-    -moz-image-region: rect(11px, 16px, 22px, 0);
+  -moz-image-region: rect(11px, 16px, 22px, 0);
 }
 
 .ac-comment[selected="true"],
 .ac-url-text[selected="true"],
 .ac-action-text[selected="true"] {
-    color: inherit !important;
+  color: inherit !important;
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
-    color: GrayText;
+  color: GrayText;
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
 .autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
 {
-    color: GrayText;
-    font-size: smaller;
+  color: GrayText;
+  font-size: smaller;
 }
 
 .autocomplete-treebody::-moz-tree-cell(suggesthint) {
-    border-top: 1px solid GrayText;
+  border-top: 1px solid GrayText;
 }
 
 /* combined go/reload/stop button in location bar */
 
 #go-button,
 #urlbar > toolbarbutton {
-    -moz-appearance: none;
-    padding: 0 2px;
-    background-origin: border-box;
-    border: none;
-    list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  -moz-appearance: none;
+  padding: 0 2px;
+  background-origin: border-box;
+  border: none;
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
 }
 
 #go-button {
-    padding: 0 3px;
+  padding: 0 3px;
 }
 
 #urlbar-reload-button {
-    -moz-image-region: rect(0, 14px, 14px, 0);
+  -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
 #urlbar-reload-button:not([disabled]):hover {
-    background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0));
-    -moz-image-region: rect(14px, 14px, 28px, 0);
+  background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0));
+  -moz-image-region: rect(14px, 14px, 28px, 0);
 }
 
 #urlbar-reload-button:not([disabled]):hover:active {
-    background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0));
-    -moz-image-region: rect(28px, 14px, 42px, 0);
+  background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0));
+  -moz-image-region: rect(28px, 14px, 42px, 0);
 }
 
 #urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-    transform: scaleX(-1);
+  transform: scaleX(-1);
 }
 
 #go-button,
 #urlbar-go-button {
-    -moz-image-region: rect(0, 42px, 14px, 28px);
+  -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
 #go-button:hover,
 #urlbar-go-button:hover {
-    background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0));
-    -moz-image-region: rect(14px, 42px, 28px, 28px);
+  background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0));
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 #go-button:hover:active,
 #urlbar-go-button:hover:active {
-    background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0));
-    -moz-image-region: rect(28px, 42px, 42px, 28px);
+  background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0));
+  -moz-image-region: rect(28px, 42px, 42px, 28px);
 }
 
 #go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-    transform: scaleX(-1);
+  transform: scaleX(-1);
 }
 
 #urlbar-stop-button {
-    -moz-image-region: rect(0, 28px, 14px, 14px);
+  -moz-image-region: rect(0, 28px, 14px, 14px);
 }
 
 #urlbar-stop-button:not([disabled]):hover {
-    background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0));
-    -moz-image-region: rect(14px, 28px, 28px, 14px);
+  background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0));
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
 #urlbar-stop-button:hover:active {
-    background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0));
-    -moz-image-region: rect(28px, 28px, 42px, 14px);
+  background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0));
+  -moz-image-region: rect(28px, 28px, 42px, 14px);
 }
 
 /* popup blocker button */
 
 #page-report-button {
-    list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
-    -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 #page-report-button:hover {
-    -moz-image-region: rect(0, 32px, 16px, 16px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 #page-report-button:hover:active,
 #page-report-button[open="true"] {
-    -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 
 /* star button */
 
 #star-button {
-    list-style-image: url("chrome://browser/skin/places/bookmark.png");
-    -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #star-button:hover {
-    background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0));
-    -moz-image-region: rect(0px 32px 16px 16px);
+  background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0));
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #star-button:hover:active {
-    background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0));
-    -moz-image-region: rect(0px 48px 16px 32px);
+  background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0));
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 #star-button[starred] {
-    list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
 }
 
 /* bookmarking panel */
 
 #editBookmarkPanelStarIcon {
-    list-style-image: url("chrome://browser/skin/places/starred48.png");
-    width: 48px;
-    height: 48px;
+  list-style-image: url("chrome://browser/skin/places/starred48.png");
+  width: 48px;
+  height: 48px;
 }
 
 #editBookmarkPanelStarIcon[unstarred] {
-    list-style-image: url("chrome://browser/skin/places/unstarred48.png");
+  list-style-image: url("chrome://browser/skin/places/unstarred48.png");
 }
 
 #editBookmarkPanelTitle {
-    font-size: 130%;
+  font-size: 130%;
 }
 
 #editBookmarkPanelHeader,
 #editBookmarkPanelContent {
-    margin-bottom: .5em;
+  margin-bottom: .5em;
 }
 
 /* Implements editBookmarkPanel resizing on folderTree un-collapse. */
 #editBMPanel_folderTree {
-    min-width: 27em;
+  min-width: 27em;
 }
 
 /* BOOKMARKING PANEL */
@@ -1385,7 +1414,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border-radius: 3px;
   border: 1px solid rgba(0,0,0,.3) !important;
   box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
-              0 1px rgba(255,255,255,.3);
+        0 1px rgba(255,255,255,.3);
   margin: 0;
   padding: 3px 6px;
 }
@@ -1425,7 +1454,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 .editBookmarkPanelBottomButton:last-child {
-  -moz-margin-start: 8px;
+  margin-inline-start: 8px;
 }
 
 /* The following elements come from editBookmarkOverlay.xul. Styling that's
@@ -1440,8 +1469,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border-radius: 0 0 3px 3px;
   border: 1px solid #a5a5a5;
   box-shadow: inset 0 1px rgba(255,255,255,.8),
-              inset 0 0 1px rgba(255,255, 255,.25),
-              0 1px rgba(255,255,255,.3);
+        inset 0 0 1px rgba(255,255, 255,.25),
+        0 1px rgba(255,255,255,.3);
   margin: 0;
   padding: 0;
   height:  20px;
@@ -1450,7 +1479,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 #editBMPanel_newFolderButton {
   -moz-appearance: none;
   border: 0 solid #a5a5a5;
-  -moz-border-end-width: 1px;
+  border-inline-end-width: 1px;
   padding: 0 9px;
   margin: 0;
   min-width: 21px;
@@ -1481,8 +1510,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   min-height: 22px;
   padding-top: 2px;
   padding-bottom: 1px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 4px;
+  padding-inline-start: 8px;
+  padding-inline-end: 4px;
 }
 
 #editBMPanel_folderMenuList:-moz-focusring {
@@ -1501,7 +1530,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border: 0;
   margin: 0;
   padding: 0;
-  -moz-padding-end: 4px;
+  padding-inline-end: 4px;
   width: 7px;
 }
 
@@ -1519,7 +1548,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   border-radius: 3px;
   border: 1px solid rgba(0,0,0,.3);
   box-shadow: inset 0 1px 1px 1px rgba(0,0,0,.05),
-              0 1px rgba(255,255,255,.3);
+        0 1px rgba(255,255,255,.3);
   margin: 0;
 }
 
@@ -1545,7 +1574,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 #editBookmarkPanel .expander-down {
   @hudButton@
   margin: 0;
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   min-width: 27px;
   min-height: 22px;
 }
@@ -1580,16 +1609,16 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 @media (min-resolution: 2dppx) {
   #editBookmarkPanel .expander-up {
-    list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png");
+  list-style-image: url("chrome://browser/skin/panel-expander-open@2x.png");
   }
 
   #editBookmarkPanel .expander-down {
-    list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png");
+  list-style-image: url("chrome://browser/skin/panel-expander-closed@2x.png");
   }
 
   #editBookmarkPanel .expander-up > .button-box > .button-icon,
   #editBookmarkPanel .expander-down > .button-box > .button-icon {
-    width: 9px;
+  width: 9px;
   }
 }
 
@@ -1605,40 +1634,40 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 /* ::::: content area ::::: */
 
 #sidebar {
-    background-color: Window;
+  background-color: Window;
 }
 
 #sidebar-title {
-    -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 /* ::::: throbber ::::: */
 
 #navigator-throbber {
-    width: 16px;
-    min-height: 16px;
-    margin: 0 3px;
+  width: 16px;
+  min-height: 16px;
+  margin: 0 3px;
 }
 
 #navigator-throbber[busy="true"] {
-    list-style-image: url("chrome://global/skin/icons/loading_16.png");
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
 #navigator-throbber,
 #wrapper-navigator-throbber > #navigator-throbber {
-    list-style-image: url("chrome://global/skin/icons/notloading_16.png");
+  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
 }
 
 /* Tabstrip */
 
 #TabsToolbar {
-    min-height: 0;
-    padding: 0;
+  min-height: 0;
+  padding: 0;
 }
 
 #TabsToolbar:not(:-moz-lwtheme),
 #TabsToolbar[tabsontop=false] {
-    background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%);
+  background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%);
 }
 
 /* When the tab bar is collapsed, show a 1px border in its place. */
@@ -1653,50 +1682,50 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 }
 
 @media (-moz-mac-lion-theme) {
-    #main-window[sizemode=normal] #TabsToolbar {
-        padding-left: 2px;
-        padding-right: 2px;
-    }
+  #main-window[sizemode=normal] #TabsToolbar {
+    padding-left: 2px;
+    padding-right: 2px;
+  }
 }
 
 /* remove 5 pixel border on left and right of browser screen */
 .tabbrowser-tabbox {
-    margin: 0;
+  margin: 0;
 }
 
 .tabbrowser-tab,
 .tabs-newtab-button {
-    -moz-appearance: none;
-    background: @toolbarShadowOnTab@, @bgTabTexture@,
-        linear-gradient(-moz-dialog, -moz-dialog);
-    background-clip: padding-box;
-    padding: 3px 1px 4px;
-    /* Setting a transparent outer border allows us to have a 1px gap
-       between the tabs and the top edge of the screen, even when the
-       tabs have a top margin of 0, which is important for Fitts' law
-       compliance */
-    border: 2px solid;
-    border-bottom: none;
-    border-radius: 6px 6px 0px 0px;
-    -moz-border-top-colors: transparent #929292;
-    -moz-border-left-colors: transparent #929292;
-    -moz-border-right-colors: transparent #929292;
-    /* Hide the transparent top border by default */
-    margin-top: -1px;
-    /* Reduce the gap between the tabs */
-    -moz-margin-start: -1px;
-    box-shadow: inset 0.5px 1px 1px rgba(255,255,255,.7);
+  -moz-appearance: none;
+  background: @toolbarShadowOnTab@, var(--tab-background),
+              linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
+  background-clip: padding-box;
+  padding: 3px 1px 4px;
+  /* Setting a transparent outer border allows us to have a 1px gap
+     between the tabs and the top edge of the screen, even when the
+     tabs have a top margin of 0, which is important for Fitts' law
+     compliance */
+  border: 1.6px solid;
+  border-bottom: none;
+  border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px;
+  -moz-border-top-colors: transparent #929292;
+  -moz-border-left-colors: transparent #929292;
+  -moz-border-right-colors: transparent #929292;
+  /* Hide the transparent top border by default */
+  margin-top: -1px;
+  /* Reduce the gap between the tabs */
+  margin-inline-start: -1px;
+  box-shadow: var(--tab-box-shadow);
 }
 
 .tabbrowser-tab {
-    -moz-padding-end: 3px;
+  padding-inline-end: 3px;
 }
 
 /* Override the default (globally-set) tab width values; increase
    by 2px to compensate for the transparent outer border of the tabs */
 .tabbrowser-tab:not([pinned]) {
-    max-width: 252px;
-    min-width: 102px;
+  max-width: 252px;
+  min-width: 102px;
 }
 
 /* When the tabs are on top and the window is maximized or in full-
@@ -1706,32 +1735,32 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 #main-window[sizemode="maximized"][tabsontop=true] .tabs-newtab-button,
 #main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-tab,
 #main-window[sizemode="fullscreen"][tabsontop=true] .tabs-newtab-button {
-    margin-top: 0px;
+  margin-top: 0px;
 }
 
 /* make the tab text colors match those of the Windows client */
 @media (-moz-mac-lion-theme) {
-    tab {
-        text-shadow: none;
-        color: black !important;
-    }
+  tab {
+    text-shadow: none;
+    color: black !important;
+  }
 }
 
 .tabbrowser-tab:hover,
 .tabs-newtab-button:hover {
-    background-image: @toolbarShadowOnTab@, @bgTabTextureHover@,
-        linear-gradient(-moz-dialog, -moz-dialog);
+  background-image: @toolbarShadowOnTab@, var(--tab-background-hover),
+                    linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
 }
 
 .tabbrowser-tab[selected="true"] {
-    background-image: linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%),
-        linear-gradient(-moz-dialog, -moz-dialog);
+  background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%),
+                    linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
 }
 
 #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
-    background-image: @toolbarShadowOnTab@,
-        linear-gradient(@selectedTabHighlight@, @toolbarHighlight@ 50%),
-        linear-gradient(-moz-dialog, -moz-dialog);
+  background-image: @toolbarShadowOnTab@,
+                    linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%),
+                    linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color));
 }
 
 .tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) {
@@ -1747,105 +1776,105 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 /* Remove highlight fuzz on dark themes */
 .tabbrowser-tab:-moz-lwtheme-brighttext,
 .tabs-newtab-button:-moz-lwtheme-brighttext {
-    box-shadow:none;
-    -moz-border-top-colors: transparent #707070;
-    -moz-border-left-colors: transparent #707070;
-    -moz-border-right-colors: transparent #707070;
+  box-shadow:none;
+  -moz-border-top-colors: transparent #707070;
+  -moz-border-left-colors: transparent #707070;
+  -moz-border-right-colors: transparent #707070;
 }
 
 .tabbrowser-tab[selected="true"]:-moz-lwtheme {
-    background-image: linear-gradient(rgba(255,255,255,.6), rgba(255,255,255,.8) 50%);
+  background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%);
 }
 
 .tabbrowser-tab[selected="true"]:-moz-lwtheme-brighttext {
-    background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, rgba(32,32,32,.8) 100%);
-    -moz-border-top-colors: transparent #D0D0D0;
-    -moz-border-left-colors: transparent #D0D0D0;
-    -moz-border-right-colors: transparent #D0D0D0;
+  background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, var(--toolbar-highlight-top) 100%);
+  -moz-border-top-colors: transparent #D0D0D0;
+  -moz-border-left-colors: transparent #D0D0D0;
+  -moz-border-right-colors: transparent #D0D0D0;
 }
 
 .tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
 .tabs-newtab-button:-moz-lwtheme-brighttext {
-    background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%);
+  background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%);
 }
 
 .tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
 .tabs-newtab-button:-moz-lwtheme-brighttext:hover {
-    background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%);
+  background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%);
 }
 
 .tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
 .tabs-newtab-button:-moz-lwtheme-darktext {
-    background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%);
+  background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%);
 }
 
 .tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
 .tabs-newtab-button:-moz-lwtheme-darktext:hover {
-    background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%);
+  background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%);
 }
 
 .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
-    background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
+  background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
 }
 .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-    background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%),
-        radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
+  background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%),
+    radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25));
 }
 
 .tab-throbber,
 .tab-icon-image {
-    width: 16px;
-    height: 16px;
-    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-    -moz-margin-start: 2px;
-    -moz-margin-end: 3px;
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  margin-inline-start: 2px;
+  margin-inline-end: 3px;
 }
 
 .tab-throbber {
-    list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
+  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
 }
 
 .tab-throbber[progress] {
-    list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
+  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }
 
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
-    -moz-margin-start: 5px;
-    -moz-margin-end: 5px;
+  margin-inline-start: 5px;
+  margin-inline-end: 5px;
 }
 
 /* tabbrowser-tab focus ring */
 .tabbrowser-tab:focus > .tab-stack {
-    outline: 1px dotted;
+  outline: 1px dotted;
 }
 
 /* Tab DnD indicator */
 .tab-drop-indicator {
-    list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
-    margin-bottom: -11px;
+  list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);
+  margin-bottom: -11px;
 }
 
 /* Tab close button */
 .tab-close-button {
-    -moz-appearance: none;
-    border: none;
-    padding: 0px;
+  -moz-appearance: none;
+  border: none;
+  padding: 0px;
 }
 
 .tab-close-button:-moz-lwtheme-brighttext {
-    list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 @media (min-resolution: 2dppx) {
-    .tab-close-button:-moz-lwtheme-brighttext {
-        list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
-    }
+  .tab-close-button:-moz-lwtheme-brighttext {
+    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+  }
 }
   
 /* Tab sound indicator */
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0;
@@ -1931,280 +1960,280 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
-    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
-    margin: 0;
-    padding-right: 2px;
-    border-right: 2px solid transparent;
-    background-origin: border-box;
+  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
+  margin: 0;
+  padding-right: 2px;
+  border-right: 2px solid transparent;
+  background-origin: border-box;
 }
 
 toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up,
 toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down {
-    list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
+  list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
 .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
-    opacity: .4;
+  opacity: .4;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
 .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
-    transform: scaleX(-1);
+  transform: scaleX(-1);
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
-    transition: 1s background-color ease-out;
+  transition: 1s background-color ease-out;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
-    background-color: Highlight;
-    transition: none;
+  background-color: Highlight;
+  transition: none;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]),
 .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) {
-    border-width: 0 2px 0 0;
-    border-style: solid;
-    border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;
+  border-width: 0 2px 0 0;
+  border-style: solid;
+  border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;
 }
 
 .tabs-newtab-button > .toolbarbutton-icon {
-    margin-top: -1px;
-    margin-bottom: -1px;
+  margin-top: -1px;
+  margin-bottom: -1px;
 }
 
 .tabs-newtab-button,
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button {
-    list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
-    -moz-image-region: auto;
+  list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
+  -moz-image-region: auto;
 }
 
 .tabs-newtab-button:-moz-lwtheme-brighttext,
 toolbar[brighttext] #TabsToolbar > #new-tab-button,
 toolbar[brighttext] #TabsToolbar > toolbarpaletteitem > #new-tab-button {
-    list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
+  list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
 }
 
 .tabs-newtab-button {
-    width: 28px;
+  width: 28px;
 }
 
 #TabsToolbar > #new-tab-button {
-    width: 26px;
+  width: 26px;
 }
 
 #alltabs-button {
-    list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-    -moz-image-region: rect(0, 14px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
+  -moz-image-region: rect(0, 14px, 16px, 0);
 }
 
 #alltabs-button[type="menu"] {
-    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
-    -moz-image-region: auto;
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+  -moz-image-region: auto;
 }
 
 toolbar[brighttext] #alltabs-button {
-    list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png");
+  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png");
 }
 
 toolbar[brighttext] #alltabs-button[type="menu"] {
-    list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
+  list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
 }
 
 #alltabs-button[type="menu"] > .toolbarbutton-icon {
-    margin: 0 2px;
+  margin: 0 2px;
 }
 
 #alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
-    display: none;
+  display: none;
 }
 
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
-    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 .alltabs-item[selected="true"] {
-    font-weight: bold; 
+  font-weight: bold; 
 }
 
 .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
-    list-style-image: url("chrome://global/skin/icons/loading_16.png");
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
 .alltabs-item[tabIsVisible] {
-    /* box-shadow instead of background-color to work around native styling */
-    box-shadow: inset -5px 0 ThreeDShadow;
+  /* box-shadow instead of background-color to work around native styling */
+  box-shadow: inset -5px 0 ThreeDShadow;
 }
 
 /* Tabstrip close button */
 .tabs-closebutton {
-    -moz-appearance: none;
-    padding: 4px 2px;
-    margin: 0px;
-    border: none;
+  -moz-appearance: none;
+  padding: 4px 2px;
+  margin: 0px;
+  border: none;
 }
 
 toolbar[brighttext] .tabs-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 @media (min-resolution: 2dppx) {
-    toolbar[brighttext] .tabs-closebutton {
-        list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
-    }
+  toolbar[brighttext] .tabs-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+  }
 }
   
 .tabs-closebutton > .toolbarbutton-icon {
-    -moz-margin-end: 0px !important;
-    -moz-padding-end: 2px !important;
-    -moz-padding-start: 2px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-end: 2px !important;
+  padding-inline-start: 2px !important;
 }
 
 #sidebar-throbber[loading="true"] {
-    list-style-image: url("chrome://global/skin/icons/loading_16.png");
-    -moz-margin-end: 4px;
+  list-style-image: url("chrome://global/skin/icons/loading_16.png");
+  margin-inline-end: 4px;
 }
 
 /* Pale Moon: Feed icon */
 #ub-feed-button,
 #ub-feed-button > .button-box,
 #ub-feed-button:hover:active > .button-box {
-    padding: 0px;
-    margin: 0px;
-    border: 0px; 
-    background-color: transparent !important;
+  padding: 0px;
+  margin: 0px;
+  border: 0px; 
+  background-color: transparent !important;
 }
 
 #ub-feed-button {
-    -moz-appearance: none; 
-    min-width: 0px; 
-    list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png");
-    -moz-image-region: rect(0px 16px 16px 0px);
+  -moz-appearance: none; 
+  min-width: 0px; 
+  list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 #ub-feed-button:hover {
-    -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 #ub-feed-button[open="true"],
 #ub-feed-button:hover:active {
-    -moz-image-region: rect(0px 48px 16px 32px);
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
-    list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
+  list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
 }
 
 toolbarbutton.bookmark-item[dragover="true"][open="true"] {
-    -moz-appearance: none;
-    background: Highlight !important;
-    color: HighlightText !important;
+  -moz-appearance: none;
+  background: Highlight !important;
+  color: HighlightText !important;
 }
 
 /* rules for menupopup drop indicators */
 .menupopup-drop-indicator-bar {
-    position: relative;
-    /* these two margins must together compensate the indicator's height */
-    margin-top: -1px;
-    margin-bottom: -1px;
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
 }
 
 .menupopup-drop-indicator {
-    list-style-image: none;
-    height: 2px;
-    -moz-margin-end: -4em;
-    background-color: Highlight;
+  list-style-image: none;
+  height: 2px;
+  margin-inline-end: -4em;
+  background-color: Highlight;
 }
 
 /* ::::: Identity Indicator Styling ::::: */
 
 /* Popup Icons */
 #identity-popup-icon {
-    height: 64px;
-    width: 64px;
-    padding: 0;
-    list-style-image: url("chrome://browser/skin/identity.png");
-    -moz-image-region: rect(0px, 64px, 64px, 0px);
+  height: 64px;
+  width: 64px;
+  padding: 0;
+  list-style-image: url("chrome://browser/skin/identity.png");
+  -moz-image-region: rect(0px, 64px, 64px, 0px);
 }
 
 #identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon {
-    -moz-image-region: rect(64px, 64px, 128px, 0px);
+  -moz-image-region: rect(64px, 64px, 128px, 0px);
 }
 
 #identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
-    -moz-image-region: rect(128px, 64px, 192px, 0px);
+  -moz-image-region: rect(128px, 64px, 192px, 0px);
 }
 
 /* Popup Body Text */
 .identity-popup-description {
-    white-space: pre-wrap;
-    -moz-padding-start: 15px;
-    margin: 2px 0 4px;
+  white-space: pre-wrap;
+  padding-inline-start: 15px;
+  margin: 2px 0 4px;
 }
 
 .identity-popup-label {
-    white-space: pre-wrap;
-    -moz-padding-start: 15px;
-    margin: 0;
+  white-space: pre-wrap;
+  padding-inline-start: 15px;
+  margin: 0;
 }
 
 #identity-popup-content-host,
 #identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
-    font-size: 1.2em;
+  font-size: 1.2em;
 }
 
 #identity-popup-content-host {
-    margin-top: 3px;
-    margin-bottom: 5px;
-    font-weight: bold;
-    max-width: 300px;
+  margin-top: 3px;
+  margin-bottom: 5px;
+  font-weight: bold;
+  max-width: 300px;
 }
 
 #identity-popup-content-owner {
-    margin-top: 4px;
-    margin-bottom: 0 !important;
-    font-weight: bold;
-    max-width: 300px;
+  margin-top: 4px;
+  margin-bottom: 0 !important;
+  font-weight: bold;
+  max-width: 300px;
 }
 
 .verifiedDomain > #identity-popup-content-owner {
-    font-weight: normal;
+  font-weight: normal;
 }
 
 #identity-popup-content-verifier {
-    margin: 4px 0 2px;
+  margin: 4px 0 2px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
-    margin-top: 10px;
-    -moz-margin-start: -24px;
+  margin-top: 10px;
+  margin-inline-start: -24px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
-    list-style-image: url("chrome://browser/skin/Secure24.png");
+  list-style-image: url("chrome://browser/skin/Secure24.png");
 }
 
 #identity-popup-more-info-button {
-    margin-top: 6px;
-    margin-bottom: 0;
-    -moz-margin-end: 0;
+  margin-top: 6px;
+  margin-bottom: 0;
+  margin-inline-end: 0;
 }
 
 .popup-notification-icon {
-    width: 64px;
-    height: 64px;
-    -moz-margin-end: 10px;
+  width: 64px;
+  height: 64px;
+  margin-inline-end: 10px;
 }
 
 .popup-notification-icon[popupid="geolocation"] {
-    list-style-image: url(chrome://browser/skin/Geolocation-64.png);
+  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
 
 .popup-notification-icon[popupid="xpinstall-disabled"],
@@ -2214,198 +2243,198 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 .popup-notification-icon[popupid="addon-install-origin-blocked"],
 .popup-notification-icon[popupid="addon-install-failed"],
 .popup-notification-icon[popupid="addon-install-complete"] {
-    list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-    width: 32px;
-    height: 32px;
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+  width: 32px;
+  height: 32px;
 }
 
 .popup-notification-icon[popupid="click-to-play-plugins"] {
-    list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png);
 }
 
 .popup-notification-icon[popupid="web-notifications"] {
-    list-style-image: url(chrome://browser/skin/notification-64.png);
+  list-style-image: url(chrome://browser/skin/notification-64.png);
 }
 
 .addon-progress-description {
-    width: 350px;
-    max-width: 350px;
+  width: 350px;
+  max-width: 350px;
 }
 
 .popup-progress-label,
 .popup-progress-meter {
-    -moz-margin-start: 0;
-    -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 .popup-progress-cancel {
-    -moz-appearance: none;
-    background: transparent;
-    border: none;
-    padding: 0;
-    min-height: 16px;
-    min-width: 16px;
-    max-height: 16px;
-    max-width: 16px;
-    margin: 0 1px 0 1px;
-    list-style-image: url(chrome://mozapps/skin/downloads/buttons.png);
-    -moz-image-region: rect(0px, 16px, 16px, 0px);    
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  padding: 0;
+  min-height: 16px;
+  min-width: 16px;
+  max-height: 16px;
+  max-width: 16px;
+  margin: 0 1px 0 1px;
+  list-style-image: url(chrome://mozapps/skin/downloads/buttons.png);
+  -moz-image-region: rect(0px, 16px, 16px, 0px);  
 }
 
 .popup-progress-cancel:hover {
-    -moz-image-region: rect(16px, 32px, 32px, 16px);
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
 }
 
 .popup-progress-cancel:active {
-    -moz-image-region: rect(32px, 32px, 48px, 16px);
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
 .popup-notification-icon[popupid="indexedDB-quota-prompt"],
 .popup-notification-icon[popupid*="offline-app-requested"],
 .popup-notification-icon[popupid="offline-app-usage"] {
-    list-style-image: url(chrome://global/skin/icons/question-64.png);
+  list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 
 .popup-notification-icon[popupid="password"] {
-    list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
 }
 
 .popup-notification-icon[popupid="mixed-content-blocked"] {
-    list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png);
+  list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png);
 }
 
 %ifdef MOZ_WEBRTC
 .popup-notification-icon[popupid="webRTC-sharingDevices"],
 .popup-notification-icon[popupid="webRTC-shareDevices"] {
-    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);
+  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png);
 }
 
 %endif
 .popup-notification-icon[popupid="pointerLock"] {
-    list-style-image: url(chrome://browser/skin/pointerLock-64.png);
+  list-style-image: url(chrome://browser/skin/pointerLock-64.png);
 }
 
 /* Notification icon box */
 #notification-popup-box {
-    position: relative;
-    background-color: #fff;
-    background-clip: padding-box;
-    padding-left: 3px;
-    border-radius: 2.5px 0 0 2.5px;
-    border-width: 0 8px 0 0;
-    border-style: solid;
-    border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
-    -moz-margin-end: -8px;
+  position: relative;
+  background-color: #fff;
+  background-clip: padding-box;
+  padding-left: 3px;
+  border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius);
+  border-width: 0 8px 0 0;
+  border-style: solid;
+  border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
+  margin-inline-end: -8px;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
-    padding-left: 5px;
+  padding-left: 5px;
 }
 
 #notification-popup-box:-moz-locale-dir(rtl),
 .notification-anchor-icon:-moz-locale-dir(rtl) {
-    transform: scaleX(-1);
+  transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
-    width: 16px;
-    height: 16px;
-    margin: 0 2px;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
 }
 
 .notification-anchor-icon:-moz-focusring {
-    outline: 1px dotted -moz-DialogText;
-    outline-offset: -3px;
+  outline: 1px dotted -moz-DialogText;
+  outline-offset: -3px;
 }
 
 .default-notification-icon,
 #default-notification-icon {
-    list-style-image: url(chrome://global/skin/icons/information-16.png);
+  list-style-image: url(chrome://global/skin/icons/information-16.png);
 }
 
 .geo-notification-icon,
 #geo-notification-icon {
-    list-style-image: url(chrome://browser/skin/Geolocation-16.png);
+  list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
 
 #addons-notification-icon {
-    list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png);
 }
 
 .indexedDB-notification-icon,
 #indexedDB-notification-icon {
-    list-style-image: url(chrome://global/skin/icons/question-16.png);
+  list-style-image: url(chrome://global/skin/icons/question-16.png);
 }
 
 #password-notification-icon {
-    list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
+  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png);
 }
 
 #plugins-notification-icon {
-    list-style-image: url(chrome://browser/skin/notification-pluginNormal.png);
+  list-style-image: url(chrome://browser/skin/notification-pluginNormal.png);
 }
 
 #alert-plugins-notification-icon {
-    list-style-image: url(chrome://browser/skin/notification-pluginAlert.png);
+  list-style-image: url(chrome://browser/skin/notification-pluginAlert.png);
 }
 
 #blocked-plugins-notification-icon {
-    list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png);
+  list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png);
 }
 
 #plugins-notification-icon,
 #alert-plugins-notification-icon,
 #blocked-plugins-notification-icon {
-    -moz-image-region: rect(0, 16px, 16px, 0);
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 #plugins-notification-icon:hover,
 #alert-plugins-notification-icon:hover,
 #blocked-plugins-notification-icon:hover {
-    -moz-image-region: rect(0, 32px, 16px, 16px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 #plugins-notification-icon:active,
 #alert-plugins-notification-icon:active,
 #blocked-plugins-notification-icon:active {
-    -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 #notification-popup-box[hidden] {
-    /* Override display:none to make the pluginBlockedNotification animation work
-       when showing the notification repeatedly. */
-    display: -moz-box;
-    visibility: collapse;
+  /* Override display:none to make the pluginBlockedNotification animation work
+     when showing the notification repeatedly. */
+  display: -moz-box;
+  visibility: collapse;
 }
 
 #blocked-plugins-notification-icon[showing] {
-    animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
+  animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
 }
 
 @keyframes pluginBlockedNotification {
-    from {
-        opacity: 0;
-    }
-    to {
-        opacity: 1;
-    }
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 .mixed-content-blocked-notification-icon,
 #mixed-content-blocked-notification-icon {
-    list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png);
+  list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png);
 }
 
 %ifdef MOZ_WEBRTC
 .webRTC-shareDevices-notification-icon,
 #webRTC-shareDevices-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png);
+  list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png);
 }
 
 .webRTC-sharingDevices-notification-icon,
 #webRTC-sharingDevices-notification-icon {
-    list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png);
+  list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png);
 }
 %endif
 
@@ -2426,14 +2455,14 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 #pointerLock-notification-icon {
-    list-style-image: url(chrome://browser/skin/pointerLock-16.png);
+  list-style-image: url(chrome://browser/skin/pointerLock-16.png);
 }
 #pointerLock-cancel {
-    margin: 0px;
+  margin: 0px;
 }
 
 #identity-popup-container {
-    min-width: 280px;
+  min-width: 280px;
 }
 
 /* Bookmarks roots menu-items */
@@ -2443,59 +2472,59 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #subscribeToPageMenupopup,
 #BMB_subscribeToPageMenuitem:not([disabled]),
 #BMB_subscribeToPageMenupopup {
-    list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
 }
 
 #appmenu_bookmarksToolbar,
 #bookmarksToolbarFolderMenu,
 #BMB_bookmarksToolbar {
-    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
-    -moz-image-region: auto;
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+  -moz-image-region: auto;
 }
 
 @media (min-resolution: 2dppx) {
   #bookmarksToolbarFolderMenu,
   #BMB_bookmarksToolbar {
-    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
-    -moz-image-region: auto;
+  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar@2x.png");
+  -moz-image-region: auto;
   }
 }
 
 #appmenu_unsortedBookmarks,
 #BMB_unsortedBookmarks {
-    list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
-    -moz-image-region: auto;
+  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
+  -moz-image-region: auto;
 }
 
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {
-    -moz-appearance: none;
-    background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x;
-    color: white;
-    border-style: none;
-    border-radius: 20px;
+  -moz-appearance: none;
+  background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x;
+  color: white;
+  border-style: none;
+  border-radius: 20px;
 }
 
 .KUI-panel[level="top"] {
-    background-color: rgba(27%,27%,27%,.65);
+  background-color: rgba(27%,27%,27%,.65);
 }
 
 .KUI-panel-closebutton {
-    list-style-image: url(KUI-close.png);
-    -moz-appearance: none;
-    border: none;
-    padding: 0;
-    width: 24px;
-    height: 24px;
+  list-style-image: url(KUI-close.png);
+  -moz-appearance: none;
+  border: none;
+  padding: 0;
+  width: 24px;
+  height: 24px;
 }
 
 .KUI-panel-closebutton:not(:hover) {
-    opacity: .6;
+  opacity: .6;
 }
 
 .KUI-panel-closebutton > .toolbarbutton-icon {
-    margin: 0;
+  margin: 0;
 }
 
 /* ::::: Ctrl-Tab and All Tabs Panels ::::: */
@@ -2503,205 +2532,205 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 /* Ctrl-Tab */
 
 #ctrlTab-panel {
-    padding: 20px 10px 10px;
-    font-weight: bold;
-    text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%);
+  padding: 20px 10px 10px;
+  font-weight: bold;
+  text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%);
 }
 
 .ctrlTab-favicon[src] {
-    background-color: white;
-    width: 20px;
-    height: 20px;
-    padding: 2px;
+  background-color: white;
+  width: 20px;
+  height: 20px;
+  padding: 2px;
 }
 
 .ctrlTab-preview-inner > .tabPreview-canvas {
-    box-shadow: 1px 1px 2px rgb(12%,12%,12%);
+  box-shadow: 1px 1px 2px rgb(12%,12%,12%);
 }
 
 .ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas {
-    margin-bottom: 2px;
+  margin-bottom: 2px;
 }
 
 .ctrlTab-preview-inner {
-    padding-bottom: 10px;
+  padding-bottom: 10px;
 }
 
 #ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner {
-    padding: 10px;
-    background-color: rgba(255,255,255,.2);
-    border-radius: .5em;
+  padding: 10px;
+  background-color: rgba(255,255,255,.2);
+  border-radius: .5em;
 }
 
 .ctrlTab-preview:focus > * > .ctrlTab-preview-inner {
-    color: white;
-    background-color: rgba(0,0,0,.6);
-    text-shadow: none;
-    padding: 8px;
-    border: 2px solid white;
-    border-radius: .5em;
+  color: white;
+  background-color: rgba(0,0,0,.6);
+  text-shadow: none;
+  padding: 8px;
+  border: 2px solid white;
+  border-radius: .5em;
 }
 
 .ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner {
-    margin: -10px -10px 0;
+  margin: -10px -10px 0;
 }
 
 #ctrlTab-showAll {
-    margin-top: .5em;
+  margin-top: .5em;
 }
 
 /* All Tabs */
 
 #allTabs-panel {
-    padding-bottom: 10px;
-    -moz-appearance: none;
-    border: none;
-    background: -moz-dialog;
-    color: -moz-dialogText;
+  padding-bottom: 10px;
+  -moz-appearance: none;
+  border: none;
+  background: -moz-dialog;
+  color: -moz-dialogText;
 }
 
 #allTabs-meta {
-    margin: 10px;
+  margin: 10px;
 }
 
 #allTabs-filter {
-    -moz-margin-start: 24px;
-    -moz-margin-end: 0;
+  margin-inline-start: 24px;
+  margin-inline-end: 0;
 }
 
 #allTabs-tab-close-button > .toolbarbutton-icon {
-    margin: 0;
+  margin: 0;
 }
 
 /* Make sure the allTab previews always have regular close buttons */
 #allTabs-tab-close-button:-moz-lwtheme-brighttext {
-    list-style-image: url("chrome://global/skin/icons/close.png");
+  list-style-image: url("chrome://global/skin/icons/close.png");
 }
 
 .allTabs-favicon[src] {
-    background-color: -moz-dialog;
-    width: 22px;
-    height: 22px;
-    padding-top: 1px;
-    padding-bottom: 5px;
-    -moz-padding-start: 1px;
-    -moz-padding-end: 5px;
-    margin-top: -2px;
-    -moz-margin-start: -2px;
-    border-bottom-right-radius: 4px;
+  background-color: -moz-dialog;
+  width: 22px;
+  height: 22px;
+  padding-top: 1px;
+  padding-bottom: 5px;
+  padding-inline-start: 1px;
+  padding-inline-end: 5px;
+  margin-top: -2px;
+  margin-inline-start: -2px;
+  border-bottom-right-radius: 4px;
 }
 
 .allTabs-favicon[src]:-moz-locale-dir(rtl) {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 4px;
 }
 
 .allTabs-preview-inner > .tabPreview-canvas {
-    background-color: rgb(60%,60%,60%);
-    box-shadow: 0 0 1.5px ThreeDShadow;
+  background-color: rgb(60%,60%,60%);
+  box-shadow: 0 0 1.5px ThreeDShadow;
 }
 
 .allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
-    opacity: .8;
+  opacity: .8;
 }
 
 .allTabs-preview:focus > * > .allTabs-preview-inner {
-    outline: 1px dotted -moz-dialogText;
+  outline: 1px dotted -moz-dialogText;
 }
 
 /* Add-on bar */
 
 #addon-bar {
-    -moz-appearance: none;
-    min-height: 20px;
-    border-top-style: none;
-    border-bottom-style: none;
-    padding-top: 1px;
-    background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
-    background-size: 100% 2px;
-    background-repeat: no-repeat;
+  -moz-appearance: none;
+  min-height: 20px;
+  border-top-style: none;
+  border-bottom-style: none;
+  padding-top: 1px;
+  background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px);
+  background-size: 100% 2px;
+  background-repeat: no-repeat;
 }
 
 #status-bar {
-    -moz-appearance: none;
-    background-color: transparent;
-    border: none;
-    min-height: 0;
+  -moz-appearance: none;
+  background-color: transparent;
+  border: none;
+  min-height: 0;
 }
 
 #addon-bar[customizing] > #status-bar {
-    opacity: .5;
-    background-image: repeating-linear-gradient(135deg,
-        rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
-        rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
+  opacity: .5;
+  background-image: repeating-linear-gradient(135deg,
+    rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+    rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);
 }
 
 #status-bar > statusbarpanel {
-    border-width: 0;
-    -moz-appearance: none;
+  border-width: 0;
+  -moz-appearance: none;
 }
 
 #addonbar-closebutton {
-    border: none;
-    padding: 0 5px;
-    -moz-appearance: none;
+  border: none;
+  padding: 0 5px;
+  -moz-appearance: none;
 }
 
 toolbar[brighttext] #addonbar-closebutton {
-    list-style-image: url("chrome://global/skin/icons/close-inverted.png");
+  list-style-image: url("chrome://global/skin/icons/close-inverted.png");
 }
 
 @media (min-resolution: 2dppx) {
-    toolbar[brighttext] #addonbar-closebutton {
-        list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
-    }
+  toolbar[brighttext] #addonbar-closebutton {
+    list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
+  }
 }
 
 /* Status panel */
 
 .statuspanel-label {
-    margin: 0;
-    padding: 2px 4px;
-    background: linear-gradient(#fff, #ddd);
-    border: 1px none #ccc;
-    border-top-style: solid;
-    color: #333;
-    text-shadow: none;
+  margin: 0;
+  padding: 2px 4px;
+  background: linear-gradient(#fff, #ddd);
+  border: 1px none #ccc;
+  border-top-style: solid;
+  color: #333;
+  text-shadow: none;
 }
 
 .statuspanel-label:-moz-locale-dir(ltr):not([mirror]),
 .statuspanel-label:-moz-locale-dir(rtl)[mirror] {
-    border-right-style: solid;
-    /* disabled for triggering grayscale AA (bug 659213)
-    border-top-right-radius: .3em;
-    */
-    margin-right: 1em;
+  border-right-style: solid;
+  /* disabled for triggering grayscale AA (bug 659213)
+  border-top-right-radius: .3em;
+  */
+  margin-right: 1em;
 }
 
 .statuspanel-label:-moz-locale-dir(rtl):not([mirror]),
 .statuspanel-label:-moz-locale-dir(ltr)[mirror] {
-    border-left-style: solid;
-    /* disabled for triggering grayscale AA (bug 659213)
-    border-top-left-radius: .3em;
-    */
-    margin-left: 1em;
+  border-left-style: solid;
+  /* disabled for triggering grayscale AA (bug 659213)
+  border-top-left-radius: .3em;
+  */
+  margin-left: 1em;
 }
 
 #full-screen-warning-message {
-    background-color: hsl(0,0%,15%);
-    color: white;
-    border-radius: 8px;
-    margin-top: 30px;
-    padding: 30px 50px;
-    box-shadow: 0 0 2px white;
+  background-color: hsl(0,0%,15%);
+  color: white;
+  border-radius: 8px;
+  margin-top: 30px;
+  padding: 30px 50px;
+  box-shadow: 0 0 2px white;
 }
 
 .full-screen-description {
-    font-size: 150%;
+  font-size: 150%;
 }
 
 #full-screen-domain-text {
-    font-size: 300%;
+  font-size: 300%;
 }
 
 %ifdef MOZ_DEVTOOLS
@@ -2714,48 +2743,48 @@ toolbar[brighttext] #addonbar-closebutton {
 /* Error counter */
 
 #developer-toolbar-toolbox-button[error-count]:before {
-    color: #FDF3DE;
-    min-width: 16px;
-    text-shadow: none;
-    background-image: linear-gradient(#B4211B, #8A1915);
-    border-radius: 1px;
-    -moz-margin-end: 5px;
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+  margin-inline-end: 5px;
 }
 %endif
 
 .toolbarbutton-badge-stack {
-    margin: 0;
-    padding: 0;
-    position: relative;
+  margin: 0;
+  padding: 0;
+  position: relative;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack {
-    padding: 2px 5px;
+  padding: 2px 5px;
 }
 
 .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbar-icon {
-    position: absolute;
-    top: 2px;
-    right: 2px;
+  position: absolute;
+  top: 2px;
+  right: 2px;
 }
 
 .toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
-    -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 @navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
-    top: 1px;
-    right: 1px;
+  top: 1px;
+  right: 1px;
 }
 
 .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-    left: 0;
-    right: auto;
+  left: 0;
+  right: auto;
 }
 
 @navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
-    left: 1px;
-    right: auto;
+  left: 1px;
+  right: auto;
 }
 
 #main-window[privatebrowsingmode=temporary] {
@@ -2767,8 +2796,8 @@ toolbar[brighttext] #addonbar-closebutton {
 
 @media (min-resolution: 2dppx) {
   #main-window[privatebrowsingmode=temporary] {
-    background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png");
-    background-size: 38px;
+  background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png");
+  background-size: 38px;
   }
 }
 
@@ -2793,21 +2822,21 @@ toolbar[brighttext] #addonbar-closebutton {
 }
 
 #main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] {
-  -moz-padding-end: 50px !important;
+  padding-inline-end: 50px !important;
 }
 
 @media (-moz-mac-lion-theme) {
   #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] {
-    -moz-padding-end: 50px;
+  padding-inline-end: 50px;
   }
 }
 
 @media not all and (-moz-mac-lion-theme) {
   #main-window[privatebrowsingmode=temporary] {
-    background-position: top right 10px;
+  background-position: top right 10px;
   }
 
   #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls {
-    -moz-padding-end: 50px;
+  padding-inline-end: 50px;
   }
 }
diff --git a/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css b/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
index eb99f4c1fd..0cfc5f81be 100644
--- a/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
+++ b/application/palemoon/themes/osx/downloads/allDownloadsViewOverlay.css
@@ -14,7 +14,7 @@
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   /* explicitly size the icon, so size doesn't vary on hidpi systems */
   height: 32px;
   width: 32px;
diff --git a/application/palemoon/themes/osx/downloads/download-glow.png b/application/palemoon/themes/osx/downloads/download-glow.png
deleted file mode 100644
index 53182d7a40..0000000000
Binary files a/application/palemoon/themes/osx/downloads/download-glow.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/downloads/downloads.css b/application/palemoon/themes/osx/downloads/downloads.css
index 267574e2ca..2f9733a98e 100644
--- a/application/palemoon/themes/osx/downloads/downloads.css
+++ b/application/palemoon/themes/osx/downloads/downloads.css
@@ -57,7 +57,7 @@
 #downloadsSummary,
 richlistitem[type="download"] {
   height: 7em;
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
   color: inherit;
 }
 
@@ -104,7 +104,7 @@ richlistitem[type="download"]:first-child {
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   /* Prevent flickering when changing states. */
   height: 32px;
   width: 32px;
@@ -251,37 +251,39 @@ richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:acti
 /*** Main indicator icon ***/
 
 #downloads-indicator-icon {
-  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
+  background: -moz-image-rect(var(--toolbarbutton-image),
                               0, 108, 18, 90) center no-repeat;
   min-width: 18px;
   min-height: 18px;
 }
 
 toolbar[brighttext] #downloads-indicator-icon {
-  background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"),
+  background: -moz-image-rect(var(--toolbarbutton-inverted-image),
                               0, 108, 18, 90) center no-repeat;
 }
 
 #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
-  background-image: url("chrome://browser/skin/downloads/download-glow.png");
+  background: -moz-image-rect(var(--toolbarbutton-image),
+                              19, 108, 36, 90) center no-repeat;
 }
 
 /* In the next few rules, we use :not([counter]) as a shortcut that is
    equivalent to -moz-any([progress], [paused]). */
 
 #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
+  background: -moz-image-rect(var(--toolbarbutton-image),
                               0, 108, 18, 90) center no-repeat;
   background-size: 12px;
 }
 
 toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background: -moz-image-rect(url("chrome://browser/skin/Toolbar-inverted.png"),
+  background: -moz-image-rect(var(--toolbarbutton-inverted-image),
                               0, 108, 18, 90) center no-repeat;
 }
 
 #downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter {
-  background-image: url("chrome://browser/skin/downloads/download-glow.png");
+  background: -moz-image-rect(var(--toolbarbutton-image),
+                              19, 108, 36, 90) center no-repeat;
 }
 
 /*** Download notifications ***/
@@ -376,7 +378,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0;
 }
 
diff --git a/application/palemoon/themes/osx/engineManager.css b/application/palemoon/themes/osx/engineManager.css
index 18817cd4f2..c6d42cce29 100644
--- a/application/palemoon/themes/osx/engineManager.css
+++ b/application/palemoon/themes/osx/engineManager.css
@@ -5,8 +5,8 @@
 %endif
 
 #engineList treechildren::-moz-tree-image(engineName) {
-  -moz-margin-end: 4px;
-  -moz-margin-start: 1px;
+  margin-inline-end: 4px;
+  margin-inline-start: 1px;
   width: 16px;
   height: 16px;
 }
diff --git a/application/palemoon/themes/osx/feeds/subscribe-ui.css b/application/palemoon/themes/osx/feeds/subscribe-ui.css
index 8ca53283bd..f21c037e67 100644
--- a/application/palemoon/themes/osx/feeds/subscribe-ui.css
+++ b/application/palemoon/themes/osx/feeds/subscribe-ui.css
@@ -7,17 +7,17 @@
 }
 
 .handlersMenuPopup > menuitem {
-  -moz-padding-start: 23px;
+  padding-inline-start: 23px;
 }
 
 .handlersMenuPopup > menuitem.menuitem-iconic {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
   display: -moz-box;
   min-width: 16px;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
 }
 
 .chooseApplicationMenuItem {
diff --git a/application/palemoon/themes/osx/feeds/subscribe.css b/application/palemoon/themes/osx/feeds/subscribe.css
index 780a7f8b2f..3a93c64563 100644
--- a/application/palemoon/themes/osx/feeds/subscribe.css
+++ b/application/palemoon/themes/osx/feeds/subscribe.css
@@ -10,7 +10,7 @@ html {
 #feedBody {
   border: 1px solid THreeDShadow;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   margin: 2em auto;
   background: -moz-Field;
 }
@@ -25,9 +25,9 @@ html {
 #feedHeader {  
   margin-top: 4.9em;
   margin-bottom: 1em;
-  -moz-margin-start: 1.4em;
-  -moz-margin-end: 1em;
-  -moz-padding-start: 2.9em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
   font-size: 110%;
   color: InfoText;
 }
@@ -54,12 +54,12 @@ html {
 
 #feedHeader[firstrun="true"] #feedIntroText {
   padding-top: 0.1em;
-  -moz-padding-start: 0.6em;
+  padding-inline-start: 0.6em;
   display: block;
 }
 
 #feedHeader[firstrun="true"] > #feedSubscribeLine {
-  -moz-padding-start: 1.8em;
+  padding-inline-start: 1.8em;
 }
 
 #feedSubscribeLine {
@@ -95,8 +95,8 @@ h2 {
 
 #feedTitleLink {
   float: right;
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -106,15 +106,15 @@ a[href] img {
 }
 
 #feedTitleContainer {
-  -moz-margin-start: 0;
-  -moz-margin-end: .6em;
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
   margin-top: 0;
   margin-bottom: 0;
 }
 
 #feedTitleImage {
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
   max-width: 300px;
diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 9f45210a93..9b48763549 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -17,8 +17,6 @@ browser.jar:
 #endif
 * skin/classic/browser/autocomplete.css
   skin/classic/browser/actionicon-tab.png
-  skin/classic/browser/appmenu-icons.png
-  skin/classic/browser/appmenu-dropmarker.png
 * skin/classic/browser/browser.css
   skin/classic/browser/click-to-play-warning-stripes.png
 * skin/classic/browser/engineManager.css
@@ -68,6 +66,8 @@ browser.jar:
   skin/classic/browser/slowStartup-16.png
   skin/classic/browser/Toolbar.png
   skin/classic/browser/Toolbar-inverted.png
+  skin/classic/browser/Toolbar.svg
+  skin/classic/browser/Toolbar-inverted.svg
   skin/classic/browser/toolbarbutton-dropdown-arrow.png
   skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
   skin/classic/browser/urlbar-arrow.png
@@ -84,7 +84,6 @@ browser.jar:
   skin/classic/browser/webRTC-sharingDevice-16.png
 #endif
   skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
-  skin/classic/browser/downloads/download-glow.png                    (downloads/download-glow.png)
   skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
   skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
   skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
@@ -119,6 +118,7 @@ browser.jar:
   skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
   skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
   skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
+  skin/classic/browser/places/libraryToolbar.svg                      (places/libraryToolbar.svg)
   skin/classic/browser/places/starred48.png                           (places/starred48.png)
   skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
   skin/classic/browser/places/unfiledBookmarks.png                    (places/unfiledBookmarks.png)
diff --git a/application/palemoon/themes/osx/pageInfo.css b/application/palemoon/themes/osx/pageInfo.css
index f205b57bbe..f958d9ce2f 100644
--- a/application/palemoon/themes/osx/pageInfo.css
+++ b/application/palemoon/themes/osx/pageInfo.css
@@ -6,7 +6,7 @@
 
 /* View buttons */
 #viewGroup {
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
 }
 
 #viewGroup > radio {
@@ -31,7 +31,7 @@
 
 #topBar {
   border-bottom: 2px groove ThreeDFace;
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
@@ -98,7 +98,7 @@ textbox {
 }
 
 textbox.header {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .iframe {
@@ -121,8 +121,8 @@ groupbox.collapsable caption .caption-icon {
   height: 9px;
   background-repeat: no-repeat;
   background-position: center;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: 2px;
   background-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
@@ -142,7 +142,7 @@ groupbox tree {
 }
 
 #securityBox description { 
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 #general-security-identity {
@@ -187,8 +187,8 @@ treechildren::-moz-tree-cell-text(broken) {
 #feedListbox richlistitem {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
@@ -225,8 +225,8 @@ treechildren::-moz-tree-cell-text(broken) {
 .permission {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
diff --git a/application/palemoon/themes/osx/permissions/aboutPermissions.css b/application/palemoon/themes/osx/permissions/aboutPermissions.css
index f9a4a88af2..4886da2be9 100644
--- a/application/palemoon/themes/osx/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/osx/permissions/aboutPermissions.css
@@ -43,7 +43,7 @@
 .site-favicon {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
@@ -60,7 +60,7 @@
 
 #site-description {
   font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
+  margin-inline-start: 6px; /* to match button margin */
 }
 
 #site-label {
@@ -72,7 +72,7 @@
 #defaults-description {
   font-size: 125%;
   font-weight: bold;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 .pref-item {
@@ -82,7 +82,7 @@
 .pref-icon {
   width: 36px;
   height: 36px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 .pref-icon[type="password"] {
diff --git a/application/palemoon/themes/osx/places/libraryToolbar.svg b/application/palemoon/themes/osx/places/libraryToolbar.svg
new file mode 100644
index 0000000000..5fcf42ae3a
--- /dev/null
+++ b/application/palemoon/themes/osx/places/libraryToolbar.svg
@@ -0,0 +1,41 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16">
+  <defs>
+    <linearGradient id="starGradient" x1="24.5" x2="24.5" y1="1081" y2="1121" gradientTransform="matrix(.318 0 0 .317 30.2 -342)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#f9f3ac"/>
+      <stop offset="1" stop-color="#ffdc46"/>
+    </linearGradient>
+    <linearGradient id="fileGradient" x1="5" x2="5" y1=".842" y2="9.16" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset="1" stop-color="#e3f1fc"/>
+    </linearGradient>
+  </defs>
+  <g id="file">
+    <use width="100%" height="100%" transform="translate(6 6)" xlink:href="#file-individual"/>
+    <use width="100%" height="100%" transform="translate(4 4)" xlink:href="#file-individual"/>
+    <use width="100%" height="100%" transform="translate(2 2)" xlink:href="#file-individual"/>
+    <g id="file-individual">
+      <path fill="url(#fileGradient)" d="M1 0h8v10H1z"/>
+      <path fill="#9c9c9c" d="M1 0v10h8V0zm1 1h6v8H2z"/>
+    </g>
+  </g>
+  <g id="view">
+    <path fill="#a7dd8c" d="M17 2v1h2V2z"/>
+    <path fill="#eaedf4" d="M20 2v1h7V2zm8 0v1h3V2zm-8 2v1h7V4zm8 0v1h3V4zm-8 2v1h7V6zm8 0v1h3V6zm-8 3v1h7V9zm8 0v1h3V9zm-8 2v1h7v-1zm8 0v1h3v-1zm-8 2v1h7v-1zm8 0v1h3v-1z"/>
+    <path fill-opacity=".3" d="M17 3v1h2V3zm3 0v1h7V3zm8 0v1h3V3zM17 5v1h2V5zm3 0v1h7V5zm8 0v1h3V5zM17 7v1h2V7zm3 0v1h7V7zm8 0v1h3V7zm-11 3v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1z"/>
+    <path fill="#c5a2ec" d="M17 4v1h2V4z"/>
+    <path fill="#ec8e8e" d="M17 6v1h2V6z"/>
+    <path fill="#8ebbec" d="M17 9v1h2V9z"/>
+    <path fill="#a7dd8c" d="M17 11v1h2v-1z"/>
+    <path fill="#fac090" d="M17 13v1h2v-1z"/>
+  </g>
+  <g id="bk-restore">
+    <g id="star">
+      <path fill="url(#starGradient)" d="M34.2 9.73c.213-2.14.213-2.14-.921-3.23-1.66-1.6-1.52-2.14.636-2.41 1.76-.22 1.78-.23 2.61-1.93.488-.992 1.05-1.7 1.34-1.7.293 0 .856.717 1.35 1.72.841 1.71.854 1.72 2.61 1.94 2.15.268 2.28.789.629 2.38-1.13 1.09-1.13 1.09-.921 3.23.251 2.52.023 2.65-2.26 1.32-1.41-.823-1.41-.823-2.81 0-2.28 1.33-2.51 1.2-2.26-1.32z"/>
+      <path fill="#cd9a34" d="M38 0c-.299 0-.462.127-.608.245a2.635 2.635 0 0 0-.405.427 7.3 7.3 0 0 0-.769 1.26c-.396.805-.589 1.13-.738 1.24-.15.111-.468.179-1.3.283-.535.067-.96.148-1.32.287-.357.139-.715.384-.825.8-.11.417.055.788.274 1.12.219.328.53.662.939 1.06.539.519.706.698.767.911.06.213.04.683-.062 1.7-.06.607-.095 1.08-.07 1.47.012.198.037.381.107.566a.995.995 0 0 0 .411.502c.408.238.81.117 1.19-.035.38-.152.808-.391 1.36-.712.67-.391.938-.508 1.05-.508.114 0 .383.117 1.05.508.55.32.981.56 1.36.712.38.152.78.274 1.19.035a.995.995 0 0 0 .411-.502c.071-.185.096-.367.108-.566.025-.397-.01-.867-.07-1.47-.103-1.02-.124-1.49-.062-1.7.06-.213.228-.392.767-.911.407-.392.717-.723.935-1.05.218-.325.386-.693.276-1.11-.11-.416-.467-.657-.822-.794-.355-.137-.78-.217-1.31-.283-.833-.104-1.15-.169-1.3-.281-.15-.111-.343-.437-.743-1.25a7.138 7.138 0 0 0-.776-1.27 2.608 2.608 0 0 0-.405-.429C38.464.136 38.3.007 38 .007zm0 1.24c.042.044.073.07.126.137.192.245.428.627.648 1.07.4.814.612 1.31 1.09 1.66.473.351.997.391 1.83.495.488.06.849.14 1.04.214.194.075.154.1.135.029-.019-.071.014-.014-.122.188s-.401.5-.78.866c-.539.519-.912.86-1.07 1.41-.158.555-.077 1.1.024 2.12.06.589.083 1.03.067 1.29-.004.072-.012.088-.02.128.008-.01.047-.001-.137-.075-.264-.106-.672-.326-1.21-.64-.67-.39-1.07-.662-1.62-.662-.555 0-.954.272-1.62.663-.535.313-.945.533-1.21.639-.184.073-.145.065-.137.075-.008-.04-.016-.056-.02-.128-.017-.26.01-.704.068-1.29.102-1.02.182-1.56.025-2.12-.158-.555-.533-.896-1.07-1.41-.381-.367-.646-.67-.783-.873-.136-.204-.104-.263-.122-.197-.018.066-.054.04.14-.036.197-.076.556-.158 1.05-.219.839-.105 1.36-.146 1.84-.495.475-.349.685-.84 1.08-1.65.218-.442.453-.82.644-1.06.051-.065.082-.089.124-.133z"/>
+    </g>
+    <path fill="#169103" d="M43 6.7c-2.37 0-4.34 1.65-4.85 3.87h2.03c.458-1.13 1.54-1.94 2.82-1.94.692 0 1.23.154 1.77.541l-1.39 2.17H48v-4.65l-1.85 1.08c-.923-.698-2-1.08-3.15-1.08zm-5 4.65V16l1.85-1.08c.923.698 2 1.08 3.15 1.08 2.37 0 4.34-1.65 4.85-3.87h-2.03c-.458 1.13-1.54 1.94-2.82 1.94-.692 0-1.23-.154-1.77-.541l1.39-2.17z"/>
+  </g>
+</svg>
diff --git a/application/palemoon/themes/osx/places/organizer.css b/application/palemoon/themes/osx/places/organizer.css
index 611c0c00c0..ffcd6c5237 100644
--- a/application/palemoon/themes/osx/places/organizer.css
+++ b/application/palemoon/themes/osx/places/organizer.css
@@ -2,10 +2,24 @@
  * 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/. */
 
+:root {
+  --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
+  --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.png");
+}
+
+
+/* Use SVG for HiDPI 133%+ */
+@media (min-resolution: 1.33dppx) {
+  :root {
+    --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
+    --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.svg");
+  }
+}
+
 /* Toolbar */
 #placesToolbar {
   padding: 3px;
-  -moz-padding-end: 6px;
+  padding-inline-end: 6px;
 }
 
 #placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon {
@@ -14,7 +28,7 @@
 
 #back-button,
 #forward-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: var(--toolbarbutton-image);
 }
 
 #back-button {
@@ -34,35 +48,23 @@
 #organizeButton, 
 #viewMenu, 
 #maintenanceButton {
-  list-style-image: url("chrome://browser/skin/places/libraryToolbar.png");
+  list-style-image: var(--library-toolbar-image);
 }
 
 /* organize button */
 #organizeButton {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
-#organizeButton:hover,
-#organizeButton[open="true"] {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
 
 /* view button */
 #viewMenu {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
-#viewMenu:hover,
-#viewMenu[open="true"] {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
 
 /* maintenance button */
 #maintenanceButton {
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
-#maintenanceButton:hover,
-#maintenanceButton[open="true"] {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
 
 /* Root View */
 #placesView {
@@ -76,7 +78,7 @@
 }
 
 #infoBoxExpanderLabel {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 #searchFilter {
@@ -92,8 +94,8 @@
 }
 
 #clearDownloadsButton {
-  -moz-padding-start: 9px;
-  -moz-padding-end: 9px;
+  padding-inline-start: 9px;
+  padding-inline-end: 9px;
 }
 
 /* hover-over/open button highlighting */
diff --git a/application/palemoon/themes/osx/places/places.css b/application/palemoon/themes/osx/places/places.css
index 4243779522..b30c56bd85 100644
--- a/application/palemoon/themes/osx/places/places.css
+++ b/application/palemoon/themes/osx/places/places.css
@@ -142,5 +142,5 @@ treechildren::-moz-tree-cell-text(cutting) {
 #viewButton > .button-box > .button-menu-dropmarker {
   height: auto;
   width: auto;
-  -moz-margin-end: -3px;
+  margin-inline-end: -3px;
 }
diff --git a/application/palemoon/themes/osx/preferences/applications.css b/application/palemoon/themes/osx/preferences/applications.css
index 80699b4635..fdf5614772 100644
--- a/application/palemoon/themes/osx/preferences/applications.css
+++ b/application/palemoon/themes/osx/preferences/applications.css
@@ -11,18 +11,18 @@
 .actionsMenu {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: -2px;
-  -moz-margin-end: 0;
+  margin-inline-start: -2px;
+  margin-inline-end: 0;
 }
 
 .typeIcon,
 .actionIcon {
-  -moz-margin-start: 3px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 3px;
+  margin-inline-end: 3px;
 }
 
 richlistitem label {
-  -moz-margin-start: 1px;
+  margin-inline-start: 1px;
   margin-top: 2px;
 }
 
@@ -51,14 +51,14 @@ menuitem[appHandlerIcon="plugin"] {
 }
 
 .actionsMenu .menulist-icon {
-  -moz-margin-end: 3px;
+  margin-inline-end: 3px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-padding-start: 0px;
-  -moz-padding-end: 2px;
+  padding-inline-start: 0px;
+  padding-inline-end: 2px;
 }
 
 .actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
 }
diff --git a/application/palemoon/themes/osx/sanitizeDialog.css b/application/palemoon/themes/osx/sanitizeDialog.css
index 40dc4b2512..2fbedeb76a 100644
--- a/application/palemoon/themes/osx/sanitizeDialog.css
+++ b/application/palemoon/themes/osx/sanitizeDialog.css
@@ -3,12 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #sanitizeDurationChoice {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 /* Align the duration label with the warning box and item list */
 #sanitizeDurationLabel {
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 
@@ -79,15 +79,15 @@
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 
 /* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 .dialog-button[dlgtype="cancel"] {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
diff --git a/application/palemoon/themes/osx/searchbar.css b/application/palemoon/themes/osx/searchbar.css
index e770ab6a9f..e21101ba4f 100644
--- a/application/palemoon/themes/osx/searchbar.css
+++ b/application/palemoon/themes/osx/searchbar.css
@@ -28,7 +28,7 @@
   min-width: 0;
   margin: 0;
   padding: 0;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
   -moz-box-align: center;
   background: none;
   border: none;
diff --git a/application/palemoon/themes/osx/statusbar/overlay.css b/application/palemoon/themes/osx/statusbar/overlay.css
index ab1cc8f930..d54334206b 100644
--- a/application/palemoon/themes/osx/statusbar/overlay.css
+++ b/application/palemoon/themes/osx/statusbar/overlay.css
@@ -60,7 +60,7 @@
 toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 {
 	margin: 0px 2px !important;
-	-moz-margin-start: 3px !important;
+	margin-inline-start: 3px !important;
 }
 
 /*
diff --git a/application/palemoon/themes/osx/syncCommon.css b/application/palemoon/themes/osx/syncCommon.css
index f0beae0d53..838788cd52 100644
--- a/application/palemoon/themes/osx/syncCommon.css
+++ b/application/palemoon/themes/osx/syncCommon.css
@@ -8,7 +8,7 @@
 }
 
 .statusIcon {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   max-height: 16px;
   max-width: 16px;
 }
diff --git a/application/palemoon/themes/osx/syncSetup.css b/application/palemoon/themes/osx/syncSetup.css
index fff65e9632..8898951ebd 100644
--- a/application/palemoon/themes/osx/syncSetup.css
+++ b/application/palemoon/themes/osx/syncSetup.css
@@ -99,7 +99,7 @@ description > .text-link:focus {
 }
 
 .inputColumn {
-  -moz-margin-end: 2px
+  margin-inline-end: 2px
 }
 
 .pin {
diff --git a/application/palemoon/themes/osx/tabbrowser/newtab-glass.png b/application/palemoon/themes/osx/tabbrowser/newtab-glass.png
deleted file mode 100644
index 15185beb6e..0000000000
Binary files a/application/palemoon/themes/osx/tabbrowser/newtab-glass.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/tabbrowser/tab-arrow-left-glass.png b/application/palemoon/themes/osx/tabbrowser/tab-arrow-left-glass.png
deleted file mode 100644
index aac93a7273..0000000000
Binary files a/application/palemoon/themes/osx/tabbrowser/tab-arrow-left-glass.png and /dev/null differ
diff --git a/application/palemoon/themes/shared/plugin-doorhanger.inc.css b/application/palemoon/themes/shared/plugin-doorhanger.inc.css
index bda08e4f61..798be2c1de 100644
--- a/application/palemoon/themes/shared/plugin-doorhanger.inc.css
+++ b/application/palemoon/themes/shared/plugin-doorhanger.inc.css
@@ -16,7 +16,7 @@
 }
 
 .center-item-label {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   margin-bottom: 0;
   text-overflow: ellipsis;
 }
@@ -26,7 +26,7 @@
   background-repeat: no-repeat;
   width: 16px;
   height: 15px;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 .click-to-play-plugins-notification-button-container {
diff --git a/application/palemoon/themes/windows/aboutCertError.css b/application/palemoon/themes/windows/aboutCertError.css
index dbb3530253..100bb3d3bb 100644
--- a/application/palemoon/themes/windows/aboutCertError.css
+++ b/application/palemoon/themes/windows/aboutCertError.css
@@ -33,7 +33,7 @@ h2 {
   border-radius: 10px;
   box-shadow: 0px 0px 8px red;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
   background-origin: content-box;
 }
@@ -43,16 +43,16 @@ h2 {
 }
 
 #errorTitle {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 #errorLongContent {
-  -moz-margin-start: 80px;
+  margin-inline-start: 80px;
 }
 
 .expander > button {
-  -moz-padding-start: 20px;
-  -moz-margin-start: -20px;
+  padding-inline-start: 20px;
+  margin-inline-start: -20px;
   background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat;
   border: none;
   font: inherit;
diff --git a/application/palemoon/themes/windows/aboutPrivateBrowsing.css b/application/palemoon/themes/windows/aboutPrivateBrowsing.css
index cd6026b8ea..35843adce6 100644
--- a/application/palemoon/themes/windows/aboutPrivateBrowsing.css
+++ b/application/palemoon/themes/windows/aboutPrivateBrowsing.css
@@ -21,7 +21,7 @@ body.normal > #errorPageContainer {
 }
 
 #startPrivateBrowsingDesc > button {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #footerDesc > p {
@@ -30,7 +30,7 @@ body.normal > #errorPageContainer {
 
 #moreInfo {
   font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */
-  -moz-padding-start: 25px;
+  padding-inline-start: 25px;
   background: url("chrome://global/skin/icons/information-16.png") no-repeat top left;
 }
 
diff --git a/application/palemoon/themes/windows/aboutSyncTabs.css b/application/palemoon/themes/windows/aboutSyncTabs.css
index 4f21a9d408..1fcd8304f7 100644
--- a/application/palemoon/themes/windows/aboutSyncTabs.css
+++ b/application/palemoon/themes/windows/aboutSyncTabs.css
@@ -22,18 +22,18 @@
   margin-top: 4px;
   width: 45em;
   height: 32px;
-  -moz-margin-start: 2em;
-  -moz-margin-end: 2em;
+  margin-inline-start: 2em;
+  margin-inline-end: 2em;
 }
 
 #tabsListHeading {
   font-size: 140%;
   font-weight: bold;
-  -moz-margin-start: 40px;
+  margin-inline-start: 40px;
 }
 
 richlistitem {
-  -moz-margin-end: 2em;
+  margin-inline-end: 2em;
 }
 
 richlistitem[selected="true"],
@@ -46,7 +46,7 @@ richlistitem[type="tab"] {
   border: #999999 1px solid !important;
   padding: 2px 5px;
   margin-bottom: 4px;
-  -moz-margin-start: 4em;
+  margin-inline-start: 4em;
   border-radius: 6px;
   background-color: menu;
   width: 44em;
@@ -64,7 +64,7 @@ richlistitem[type="tab"][selected="true"] {
 richlistitem[type="client"] {
   min-height: 2em;
   color: #000000;
-  -moz-margin-start: 2em;
+  margin-inline-start: 2em;
   margin-top: 2px;
   margin-bottom: 3px;
   width: 42em;
@@ -96,6 +96,6 @@ richlistitem.desktop[type="client"] {
 }
 
 .tabIcon {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
   padding-top: 2px;
 }
diff --git a/application/palemoon/themes/windows/autocomplete.css b/application/palemoon/themes/windows/autocomplete.css
index b3cab44c8e..dbdc3f6d4f 100644
--- a/application/palemoon/themes/windows/autocomplete.css
+++ b/application/palemoon/themes/windows/autocomplete.css
@@ -74,7 +74,7 @@ panel[type="private-autocomplete-richlistbox"],
 }
 
 .private-autocomplete-treebody::-moz-tree-cell-text {
-  -moz-padding-start: 8px;
+  padding-inline-start: 8px;
 }
 
 treechildren.private-autocomplete-treebody::-moz-tree-row(selected) {
@@ -163,8 +163,8 @@ treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) {
 .ac-type-icon {
   width: 16px; 
   height: 16px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 4px;
+  margin-inline-start: 6px;
+  margin-inline-end: 4px;
   margin-bottom: -1px;
 }
 
diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css
index 88c3087ae0..f41a583e41 100644
--- a/application/palemoon/themes/windows/browser.css
+++ b/application/palemoon/themes/windows/browser.css
@@ -31,6 +31,9 @@
 %endif
 
 :root {
+  --fullscreen-background-color: #556;
+  --fullscreen-text-color: #fff;
+
   --toolbox-after-color: ThreeDShadow;
 
   --toolbar-custom-color: hsl(210,75%,92%);
@@ -285,12 +288,12 @@
   height: auto;
   padding: 0;
   margin: 0;
-  -moz-margin-start: .5em;
+  margin-inline-start: .5em;
 }
 
 .splitmenu-menuitem {
-  -moz-margin-end: 1px;
-  -moz-padding-end: 0.5em;
+  margin-inline-end: 1px;
+  padding-inline-end: 0.5em;
 }
 
 .splitmenu-menu {
@@ -310,7 +313,7 @@
 }
 
 #appmenuPrimaryPane {
-  -moz-border-end: 1px solid ThreeDShadow;
+  border-inline-end: 1px solid ThreeDShadow;
 }
 
 @media (-moz-windows-default-theme) {
@@ -322,13 +325,13 @@
   #appmenuPrimaryPane {
     background-color: rgba(255,255,255,0.5);
     padding: 2px;
-    -moz-border-end: none;
+    border-inline-end: none;
   }
   #appmenuSecondaryPane {
     background-color: #f1f5fb;
     box-shadow: 1px 0 2px rgb(204,214,234) inset;
-    -moz-padding-start: 3px;
-    -moz-padding-end: 2px;
+    padding-inline-start: 3px;
+    padding-inline-end: 2px;
     padding-top: 2px;
     padding-bottom: 2px;
     font-family: "Segoe UI Semibold", "Segoe UI", sans-serif;
@@ -446,7 +449,7 @@
     -moz-appearance: none;
     margin-top: 3px;
     margin-bottom: 3px;
-    -moz-margin-start: 30px;
+    margin-inline-start: 30px;
     padding: 0;
     border-top: 1px solid #d6e5f5;
     border-bottom: none;
@@ -454,17 +457,17 @@
 
   @media (min-resolution: 1.25dppx) {
     .appmenu-menuseparator {
-      -moz-margin-start: 25px;
+      margin-inline-start: 25px;
     }
   }
   @media (min-resolution: 1.5dppx) {
     .appmenu-menuseparator {
-      -moz-margin-start: 24px;
+      margin-inline-start: 24px;
     }
   }
   @media (min-resolution: 2dppx) {
     .appmenu-menuseparator {
-      -moz-margin-start: 22px;
+      margin-inline-start: 22px;
     }
   }
 
@@ -628,7 +631,7 @@
 
 @media not all and (-moz-windows-classic) {
   #titlebar-min {
-    -moz-margin-end: 2px;
+    margin-inline-end: 2px;
   }
 }
 
@@ -643,8 +646,8 @@ toolbarbutton.bookmark-item:hover:active:not([disabled="true"]),
 toolbarbutton.bookmark-item[open="true"] {
   padding-top: 3px;
   padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
 }
 
 .bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon {
@@ -684,7 +687,7 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 /* ::::: bookmark items ::::: */
@@ -785,7 +788,7 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
 
 .toolbarbutton-1 > .toolbarbutton-icon,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) {
@@ -827,11 +830,11 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-  -moz-padding-start: 0;
+  padding-inline-start: 0;
   -moz-box-align: center;
 }
 
@@ -866,15 +869,15 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 @navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon,
 @navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
-  -moz-padding-end: 17px;
+  padding-inline-end: 17px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
-  -moz-margin-start: -15px;
+  margin-inline-start: -15px;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  -moz-border-end: none;
+  border-inline-end: none;
 }
 
 @navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
@@ -886,7 +889,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   display: -moz-box;
   width: 1px;
   height: 18px;
-  -moz-margin-end: -1px;
+  margin-inline-end: -1px;
   background-image: linear-gradient(var(--toolbarbutton-border-color) 0, var(--toolbarbutton-border-color) 18px);
   background-clip: padding-box;
   background-position: center;
@@ -942,7 +945,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
 
 @navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon {
-  -moz-border-start-color: hsla(210,54%,20%,.35);
+  border-inline-start-color: hsla(210,54%,20%,.35);
 }
 
 @navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon {
@@ -1020,7 +1023,7 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 @conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon {
   clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path);
-  -moz-margin-start: -6px !important;
+  margin-inline-start: -6px !important;
   border-left-style: none;
   border-radius: 0;
   padding-left: 7px;
@@ -1048,8 +1051,8 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(18px, 20px, 38px, 0);
   padding-top: 3px;
   padding-bottom: 3px;
-  -moz-padding-start: 5px;
-  -moz-padding-end: 0;
+  padding-inline-start: 5px;
+  padding-inline-end: 0;
   position: relative;
   z-index: 1;
   border-radius: 0 10000px 10000px 0;
@@ -1212,45 +1215,86 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
-  -moz-margin-start: 4px;
+  -moz-box-align: start;
+  /* Make sure the window controls are always last on the toolbar */
+  -moz-box-ordinal-group: 100;
+  margin-inline-start: 4px;
 }
 
 #minimize-button,
 #restore-button,
 #close-button {
+  -moz-appearance: none;
+  border-style: none;
   list-style-image: url("chrome://global/skin/icons/windowControls.png");
+  margin: 0;
   padding: 0;
 }
 
 #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);
-  -moz-appearance: none;
-  border-style: none;
-  margin: 2px;
+  -moz-image-region: rect(0, 49px, 16px, 32px);
 }
+
 #close-button:hover {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
+  -moz-image-region: rect(16px, 49px, 32px, 32px);
 }
+
 #close-button:hover:active {
-  -moz-image-region: rect(32px, 48px, 48px, 32px);
+  -moz-image-region: rect(32px, 49px, 48px, 32px);
+}
+
+#minimize-button:-moz-locale-dir(rtl),
+#restore-button:-moz-locale-dir(rtl),
+#close-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+@media (-moz-os-version: windows-win10) {
+  #window-controls {
+    margin-inline-start: 0;
+  }
+
+  #window-controls > toolbarbutton {
+    margin: 0;
+    padding: 2px 4px;
+    transition: background-color linear 120ms;
+  }
+
+  #minimize-button,
+  #restore-button,
+  #close-button,
+  #minimize-button:hover,
+  #restore-button:hover,
+  #close-button:hover,
+  #minimize-button:hover:active,
+  #restore-button:hover:active,
+  #close-button:hover:active {
+    -moz-image-region: auto;
+  }
 }
 
 /* ::::: Location Bar ::::: */
@@ -1267,7 +1311,7 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
 
 #urlbar {
   width: 7em;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
 }
 
 @media (-moz-windows-default-theme) {
@@ -1286,13 +1330,13 @@ toolbar[brighttext] #bookmarks-menu-button.bookmark-item {
 
 @conditionalForwardWithUrlbar@ + #urlbar-container {
   padding-left: @conditionalForwardWithUrlbarWidth@px;
-  -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
+  margin-inline-start: -@conditionalForwardWithUrlbarWidth@px;
   position: relative;
   pointer-events: none;
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
-  -moz-border-start: none;
+  border-inline-start: none;
   margin-left: 0;
   pointer-events: all;
 }
@@ -1342,7 +1386,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 }
 
 .urlbar-input-box {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   min-width: 4em;
 }
 
@@ -1370,25 +1414,25 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 #urlbar-search-splitter {
   min-width: 6px;
-  -moz-margin-start: -3px;
+  margin-inline-start: -3px;
   border: none;
   background: transparent;
 }
 
 #urlbar-search-splitter + #urlbar-container > #urlbar ,
 #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 #urlbar-display-box {
-  -moz-border-end: 1px solid #AAA;
-  -moz-margin-end: 3px;
+  border-inline-end: 1px solid #AAA;
+  margin-inline-end: 3px;
 }
 
 #urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
   color: GrayText;
 }
 
@@ -1410,7 +1454,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 }
 
 #notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
   border-radius: 0;
 }
 
@@ -1420,7 +1464,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
   color: hsl(92,100%,20%);
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   background-image: -moz-linear-gradient(hsla(92,81%,16%,0),
                                          hsla(92,81%,16%,.08) 25%,
                                          hsla(92,81%,16%,.08) 75%,
@@ -1432,7 +1476,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain {
   color: rgb(0,79,168);
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   background-image: -moz-linear-gradient(rgba(0,79,168,0),
                                          rgba(0,79,168,.08) 25%,
                                          rgba(0,79,168,.08) 75%,
@@ -1460,8 +1504,8 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
 }
 
 #identity-icon-labels {
-  -moz-padding-start: 2px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 2px;
+  padding-inline-end: 5px;
 }
 
 /* Address bar shading for SSL */
@@ -1540,14 +1584,14 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
   height: 16px;
   margin-top: 1px;
   margin-bottom: 1px;
-  -moz-margin-start: 3px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 3px;
+  margin-inline-end: 2px;
   list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon {
-  -moz-margin-end: 1px;
+  margin-inline-end: 1px;
 }
 
 /* Since we already have a padlock, always use the generic icon until the favicon loads
@@ -1796,7 +1840,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #sidebar-title {
-  -moz-padding-start: 0px;
+  padding-inline-start: 0px;
 }
 
 /* ::::: throbber ::::: */
@@ -1874,12 +1918,12 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   /* Hide the transparent top border by default */
   margin-top: -1px;
   /* Reduce the gap between the tabs */
-  -moz-margin-start: -1px;
+  margin-inline-start: -1px;
   box-shadow: var(--tab-box-shadow);
 }
 
 .tabbrowser-tab {
-  -moz-padding-end: 3px;
+  padding-inline-end: 3px;
 }
 
 /* Override the default (globally-set) tab width values; increase
@@ -1996,8 +2040,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   width: 16px;
   height: 16px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-  -moz-margin-start: 2px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 2px;
+  margin-inline-end: 3px;
 }
 
 .tab-throbber {
@@ -2010,8 +2054,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
-  -moz-margin-start: 5px;
-  -moz-margin-end: 5px;
+  margin-inline-start: 5px;
+  margin-inline-end: 5px;
 }
 
 /* tabbrowser-tab focus ring */
@@ -2042,7 +2086,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* Tab sound indicator */
 .tab-icon-sound {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   width: 16px;
   height: 16px;
   padding: 0;
@@ -2273,9 +2317,9 @@ toolbar[brighttext] .tabs-closebutton {
 }
 
 .tabs-closebutton > .toolbarbutton-icon {
-  -moz-margin-end: 0px !important;
-  -moz-padding-end: 2px !important;
-  -moz-padding-start: 2px !important;
+  margin-inline-end: 0px !important;
+  padding-inline-end: 2px !important;
+  padding-inline-start: 2px !important;
 }
 
 toolbarbutton.chevron {
@@ -2301,7 +2345,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 #sidebar-throbber[loading="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
 }
 
 /* Pale Moon: Feed icon */
@@ -2353,7 +2397,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 .menupopup-drop-indicator {
   list-style-image: none;
   height: 2px;
-  -moz-margin-end: -4em;
+  margin-inline-end: -4em;
   background-color: Highlight;
 }
 
@@ -2379,13 +2423,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 /* Popup Body Text */
 .identity-popup-description {
   white-space: pre-wrap;
-  -moz-padding-start: 15px;
+  padding-inline-start: 15px;
   margin: 2px 0 4px;
 }
 
 .identity-popup-label {
   white-space: pre-wrap;
-  -moz-padding-start: 15px;
+  padding-inline-start: 15px;
   margin: 0;
 }
 
@@ -2419,7 +2463,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
 #identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
   margin-top: 10px;
-  -moz-margin-start: -24px;
+  margin-inline-start: -24px;
 }
 
 #identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
@@ -2430,13 +2474,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #identity-popup-more-info-button {
   margin-top: 6px;
   margin-bottom: 0;
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 .popup-notification-icon {
   width: 64px;
   height: 64px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 .popup-notification-icon[popupid="geolocation"] {
@@ -2470,8 +2514,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 .popup-progress-label,
 .popup-progress-meter {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 .popup-progress-cancel {
@@ -2530,7 +2574,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   border-width: 0 8px 0 0;
   border-style: solid;
   border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill;
-  -moz-margin-end: -8px;
+  margin-inline-end: -8px;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
@@ -2792,8 +2836,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 #allTabs-filter {
-  -moz-margin-start: 24px;
-  -moz-margin-end: 0;
+  margin-inline-start: 24px;
+  margin-inline-end: 0;
 }
 
 #allTabs-tab-close-button > .toolbarbutton-icon {
@@ -2811,10 +2855,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   height: 22px;
   padding-top: 1px;
   padding-bottom: 5px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 5px;
+  padding-inline-start: 1px;
+  padding-inline-end: 5px;
   margin-top: -2px;
-  -moz-margin-start: -2px;
+  margin-inline-start: -2px;
   border-bottom-right-radius: 4px;
 }
 
@@ -2940,7 +2984,7 @@ toolbar[brighttext] #addonbar-closebutton {
   text-shadow: none;
   background-image: linear-gradient(#B4211B, #8A1915);
   border-radius: 1px;
-  -moz-margin-end: 5px;
+  margin-inline-end: 5px;
 }
 %endif
 
@@ -2961,7 +3005,7 @@ toolbar[brighttext] #addonbar-closebutton {
 }
 
 .toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 @navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
@@ -3018,7 +3062,7 @@ toolbar[brighttext] #addonbar-closebutton {
 
   #appmenu-popup {
     margin-top: -1px;
-    -moz-margin-start: 1px;
+    margin-inline-start: 1px;
   }
 
   .panel-promo-message {
@@ -3090,19 +3134,19 @@ toolbar[brighttext] #addonbar-closebutton {
 
   .sidebar-splitter {
     border: 0;
-    -moz-border-end: 1px solid #A9B7C9;
+    border-inline-end: 1px solid #A9B7C9;
     min-width: 0;
     width: 3px;
     background-color: transparent;
-    -moz-margin-start: -3px;
+    margin-inline-start: -3px;
     position: relative;
   }
 
   #appcontent ~ .sidebar-splitter {
-    -moz-border-start: 1px solid #A9B7C9;
-    -moz-border-end: none;
-    -moz-margin-start: 0;
-    -moz-margin-end: -3px;
+    border-inline-start: 1px solid #A9B7C9;
+    border-inline-end: none;
+    margin-inline-start: 0;
+    margin-inline-end: -3px;
   }
 
   .menu-accel,
@@ -3143,7 +3187,8 @@ toolbar[brighttext] #addonbar-closebutton {
         --window-text-color: black;
       }
       
-      #titlebar-min:not(:-moz-window-inactive):not(:-moz-lwtheme) {
+      #titlebar-min:not(:-moz-window-inactive):not(:-moz-lwtheme),
+      #minimize-button:not(:-moz-lwtheme) {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
       }
 
@@ -3151,29 +3196,35 @@ toolbar[brighttext] #addonbar-closebutton {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize);
       }
 
-      #main-window[sizemode="maximized"] #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme) {
+      #main-window[sizemode="maximized"] #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme),
+      #restore-button:not(:-moz-lwtheme) {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
       }
       
-      #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme) {
+      #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme),
+      #close-button:not(:-moz-lwtheme) {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
       }
 
-      .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover {
+      .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover,
+      #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover {
         background-color: hsla(0, 0%, 0%, .17);
       }
 
-      .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active	{
+      .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active,
+      #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover:active	{
         background-color: hsla(0, 0%, 0%, .27);
         transition: none;
       }
       
-      #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover {
+      #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover,
+      #close-button:not(:-moz-lwtheme):hover {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight);
         background-color: hsla(0, 86%, 49%, 1);
       }
 
-      #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active	{
+      #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active,
+      #close-button:not(:-moz-lwtheme):hover:active	{
         background-color: hsla(0, 60%, 49%, 0.6);
         transition: none;
       }
@@ -3188,8 +3239,14 @@ toolbar[brighttext] #addonbar-closebutton {
       :root:not(:-moz-window-inactive):not(:-moz-lwtheme) {
         --window-text-color: -moz-win-accentcolortext;
       }
+
+      #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) {
+        --fullscreen-background-color: -moz-win-accentcolor;
+        --fullscreen-text-color: -moz-win-accentcolortext;
+      }
       
-      #titlebar-min {
+      #titlebar-min,
+      #minimize-button {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
       }
 
@@ -3197,26 +3254,31 @@ toolbar[brighttext] #addonbar-closebutton {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize);
       }
 
-      #main-window[sizemode="maximized"] #titlebar-max {
+      #main-window[sizemode="maximized"] #titlebar-max,
+      #restore-button {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
       }
 
-      #titlebar-close {
+      #titlebar-close,
+      #close-button {
         list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
       }
       
-      .titlebar-button:hover {
+      .titlebar-button:hover,
+      #window-controls > toolbarbutton:not(#close-button):hover {
         background-color: hsla(0, 0%, 0%, .17);
       }
 
-      .titlebar-button:hover:active {
+      .titlebar-button:hover:active,
+      #window-controls > toolbarbutton:not(#close-button):hover:active {
         background-color: hsla(0, 0%, 0%, .27);
         transition: none;
       }
       
       @media (-moz-windows-accent-color-is-dark) {
         /* dark accent color */
-        #titlebar-min {
+        #titlebar-min,
+        #minimize-button {
           list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight);
         }
 
@@ -3224,7 +3286,8 @@ toolbar[brighttext] #addonbar-closebutton {
           list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight);
         }
 
-        #main-window[sizemode="maximized"] #titlebar-max {
+        #main-window[sizemode="maximized"] #titlebar-max,
+        #restore-button {
           list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight);
         }
 
@@ -3232,20 +3295,24 @@ toolbar[brighttext] #addonbar-closebutton {
           list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight);
         }
       
-        .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover {
+        .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover,
+        #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover {
           background-color: hsla(0, 0%, 100%, .17);
         }
 
-        .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active	{
+        .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active,
+        #window-controls > toolbarbutton:not(#close-button):not(:-moz-lwtheme):hover:active	{
           background-color: hsla(0, 0%, 100%, .27);
           transition: none;
         }
       
-        #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover {
+        #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover,
+        #close-button:not(:-moz-lwtheme):hover {
           background-color: hsla(0, 86%, 49%, 1);
         }
 
-        #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active	{
+        #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active,
+        #close-button:not(:-moz-lwtheme):hover:active {
           background-color: hsla(0, 60%, 39%, 1);
           transition: none;
         }
@@ -3301,13 +3368,15 @@ toolbar[brighttext] #addonbar-closebutton {
       padding-right: 19px;
     }
     
-    #titlebar-close:hover {
+    #titlebar-close:hover,
+    #close-button:hover {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight);
       background-color: hsla(0, 86%, 49%, 1);
       transition: background-color linear 160ms;
     }
 
-    #titlebar-close:hover:active {
+    #titlebar-close:hover:active,
+    #close-button:hover:active {
       background-color: hsla(0, 86%, 49%, 0.6); 
       transition: none;
     }
@@ -3341,16 +3410,19 @@ toolbar[brighttext] #addonbar-closebutton {
     
     /* light persona */
     
-    .titlebar-button:-moz-lwtheme-darktext:hover {
+    .titlebar-button:-moz-lwtheme-darktext:hover,
+    #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-darktext:hover {
       background-color: hsla(0, 0%, 0%, .17);
     }
 
-    .titlebar-button:-moz-lwtheme-darktext:hover:active {
+    .titlebar-button:-moz-lwtheme-darktext:hover:active,
+    #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-darktext:hover:active {
       background-color: hsla(0, 0%, 0%, .27);
       transition: none;
     }
     
-    #titlebar-min:-moz-lwtheme-darktext {
+    #titlebar-min:-moz-lwtheme-darktext,
+    #minimize-button:-moz-lwtheme-darktext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline);
     }
 
@@ -3358,29 +3430,35 @@ toolbar[brighttext] #addonbar-closebutton {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline);
     }
 
-    #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext {
+    #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext,
+    #restore-button:-moz-lwtheme-darktext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline);
     }
 
-    #titlebar-close:-moz-lwtheme-darktext {
+    #titlebar-close:-moz-lwtheme-darktext,
+    #close-button:-moz-lwtheme-darktext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline);
     }
-    #titlebar-close:hover:-moz-lwtheme-darktext {
+    #titlebar-close:hover:-moz-lwtheme-darktext,
+    #close-button:hover:-moz-lwtheme-darktext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline);
     }
         
     /* dark persona */
     
-    .titlebar-button:-moz-lwtheme-brighttext:hover {
+    .titlebar-button:-moz-lwtheme-brighttext:hover,
+    #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-brighttext:hover {
       background-color: hsla(0, 0%, 100%, .27);
     }
 
-    .titlebar-button:-moz-lwtheme-brighttext:hover:active {
+    .titlebar-button:-moz-lwtheme-brighttext:hover:active,
+    #window-controls > toolbarbutton:not(#close-button):-moz-lwtheme-brighttext:hover:active {
       background-color: hsla(0, 0%, 100%, .37);
       transition: none;
     }
     
-    #titlebar-min:-moz-lwtheme-brighttext {
+    #titlebar-min:-moz-lwtheme-brighttext,
+    #minimize-button:-moz-lwtheme-brighttext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline-inverted);
     }
 
@@ -3388,14 +3466,17 @@ toolbar[brighttext] #addonbar-closebutton {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline-inverted);
     }
 
-    #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext {
+    #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext,
+    #restore-button:-moz-lwtheme-brighttext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline-inverted);
     }
 
-    #titlebar-close:-moz-lwtheme-brighttext {
+    #titlebar-close:-moz-lwtheme-brighttext,
+    #close-button:-moz-lwtheme-brighttext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted);
     }
-    #titlebar-close:hover:-moz-lwtheme-brighttext {
+    #titlebar-close:hover:-moz-lwtheme-brighttext,
+    #close-button:hover:-moz-lwtheme-brighttext {
       list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted);
     }
         
@@ -3550,8 +3631,9 @@ toolbar[brighttext] #addonbar-closebutton {
 /* ==== ==== */
 
   #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) {
+    --window-text-color: var(--fullscreen-text-color);
     -moz-appearance: none;
-    background-color: #556;
+    background-color: var(--fullscreen-background-color);
   }
 
   #toolbar-menubar:not(:-moz-lwtheme),
@@ -3756,35 +3838,6 @@ toolbar[brighttext] #addonbar-closebutton {
   }
 }
 
-/* ::::: fullscreen window controls ::::: */
-
-#window-controls {
-  -moz-box-align: start;
-}
-
-#minimize-button,
-#restore-button,
-#close-button {
-  -moz-appearance: none;
-  border-style: none;
-  margin: 0;
-}
-#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);
-}
-
-#minimize-button:-moz-locale-dir(rtl),
-#restore-button:-moz-locale-dir(rtl),
-#close-button:-moz-locale-dir(rtl) {
-  transform: scaleX(-1);
-}
-
 /* ::::: splitmenu highlight style that imitates Windows 7 start menu ::::: */
 @media (-moz-os-version: windows-vista) and (-moz-windows-default-theme),
        (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
@@ -3796,10 +3849,10 @@ toolbar[brighttext] #addonbar-closebutton {
     border: 1px solid transparent;
   }
   .splitmenu-menuitem {
-    -moz-margin-end: 0;
+    margin-inline-end: 0;
   }
   .splitmenu-menu {
-    -moz-margin-start: -1px;
+    margin-inline-start: -1px;
   }
   .splitmenu-menuitem:-moz-locale-dir(ltr),
   .splitmenu-menu:-moz-locale-dir(rtl) {
@@ -3813,11 +3866,11 @@ toolbar[brighttext] #addonbar-closebutton {
   }
 
   .splitmenu-menuitem > .menu-text {
-    -moz-margin-start: 1px !important;
-    -moz-margin-end: 3px !important;
+    margin-inline-start: 1px !important;
+    margin-inline-end: 3px !important;
   }
   .splitmenu-menu > .menu-right {
-    -moz-margin-end: -3px;
+    margin-inline-end: -3px;
   }
 
   .splitmenu-menuitem[iconic],
@@ -3827,11 +3880,11 @@ toolbar[brighttext] #addonbar-closebutton {
   .splitmenu-menuitem[iconic] > .menu-iconic-left {
     margin-top: -3px;
     margin-bottom: -2px;
-    -moz-margin-start: -1px;
+    margin-inline-start: -1px;
   }
   .splitmenu-menuitem[iconic] > .menu-iconic-text {
-    -moz-margin-start: 2px !important;
-    -moz-margin-end: 3px !important;
+    margin-inline-start: 2px !important;
+    margin-inline-end: 3px !important;
   }
   .splitmenu-menu[iconic] > .menu-right {
     margin-top: -1px;
diff --git a/application/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css b/application/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css
index bd3b7899de..3b8e43bc84 100644
--- a/application/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css
+++ b/application/palemoon/themes/windows/downloads/allDownloadsViewOverlay.css
@@ -13,8 +13,8 @@
 }
 
 .downloadTypeIcon {
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px;
+  margin-inline-start: 8px;
+  margin-inline-end: 8px;
   /* explicitly size the icon, so size doesn't vary on hidpi systems */
   height: 32px;
   width: 32px;
diff --git a/application/palemoon/themes/windows/downloads/downloads.css b/application/palemoon/themes/windows/downloads/downloads.css
index f16989655b..040f890714 100644
--- a/application/palemoon/themes/windows/downloads/downloads.css
+++ b/application/palemoon/themes/windows/downloads/downloads.css
@@ -88,7 +88,7 @@
 #downloadsSummary,
 richlistitem[type="download"] {
   height: 7em;
-  -moz-padding-end: 0;
+  padding-inline-end: 0;
   color: inherit;
 }
 
@@ -143,7 +143,7 @@ richlistitem[type="download"]:first-child {
 }
 
 .downloadTypeIcon {
-  -moz-margin-end: 8px;
+  margin-inline-end: 8px;
   /* Prevent flickering when changing states. */
   height: 32px;
   width: 32px;
@@ -465,7 +465,7 @@ toolbar[brighttext] #downloads-indicator-counter {
   background-image: linear-gradient(#505050, #575757);
   border: 1px solid;
   border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4);
-  -moz-border-start: none;
+  border-inline-start: none;
   border-radius: 0 2px 2px 0;
 }
 
diff --git a/application/palemoon/themes/windows/engineManager.css b/application/palemoon/themes/windows/engineManager.css
index 18817cd4f2..c6d42cce29 100644
--- a/application/palemoon/themes/windows/engineManager.css
+++ b/application/palemoon/themes/windows/engineManager.css
@@ -5,8 +5,8 @@
 %endif
 
 #engineList treechildren::-moz-tree-image(engineName) {
-  -moz-margin-end: 4px;
-  -moz-margin-start: 1px;
+  margin-inline-end: 4px;
+  margin-inline-start: 1px;
   width: 16px;
   height: 16px;
 }
diff --git a/application/palemoon/themes/windows/feeds/subscribe-ui.css b/application/palemoon/themes/windows/feeds/subscribe-ui.css
index 8ca53283bd..f21c037e67 100644
--- a/application/palemoon/themes/windows/feeds/subscribe-ui.css
+++ b/application/palemoon/themes/windows/feeds/subscribe-ui.css
@@ -7,17 +7,17 @@
 }
 
 .handlersMenuPopup > menuitem {
-  -moz-padding-start: 23px;
+  padding-inline-start: 23px;
 }
 
 .handlersMenuPopup > menuitem.menuitem-iconic {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 .handlersMenuPopup > .menuitem-iconic  > .menu-iconic-left {
   display: -moz-box;
   min-width: 16px;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
 }
 
 .chooseApplicationMenuItem {
diff --git a/application/palemoon/themes/windows/feeds/subscribe.css b/application/palemoon/themes/windows/feeds/subscribe.css
index dc9304b8a6..d6247569b1 100644
--- a/application/palemoon/themes/windows/feeds/subscribe.css
+++ b/application/palemoon/themes/windows/feeds/subscribe.css
@@ -10,7 +10,7 @@ html {
 #feedBody {
   border: 1px solid THreeDShadow;
   padding: 3em;
-  -moz-padding-start: 30px;
+  padding-inline-start: 30px;
   margin: 2em auto;
   background: -moz-Field;
 }
@@ -25,9 +25,9 @@ html {
 #feedHeader {  
   margin-top: 4.9em;
   margin-bottom: 1em;
-  -moz-margin-start: 1.4em;
-  -moz-margin-end: 1em;
-  -moz-padding-start: 2.9em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
   font-size: 110%;
   color: InfoText;
 }
@@ -54,12 +54,12 @@ html {
 
 #feedHeader[firstrun="true"] #feedIntroText {
   padding-top: 0.1em;
-  -moz-padding-start: 0.6em;
+  padding-inline-start: 0.6em;
   display: block;
 }
 
 #feedHeader[firstrun="true"] > #feedSubscribeLine {
-  -moz-padding-start: 1.8em;
+  padding-inline-start: 1.8em;
 }
 
 #feedSubscribeLine {
@@ -99,8 +99,8 @@ h2 {
 
 #feedTitleLink {
   float: right;
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -110,15 +110,15 @@ a[href] img {
 }
 
 #feedTitleContainer {
-  -moz-margin-start: 0;
-  -moz-margin-end: .6em;
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
   margin-top: 0;
   margin-bottom: 0;
 }
 
 #feedTitleImage {
-  -moz-margin-start: .6em;
-  -moz-margin-end: 0;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
   margin-top: 0;
   margin-bottom: 0;
   max-width: 300px;
diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn
index 4422bb666f..f90de60a10 100644
--- a/application/palemoon/themes/windows/jar.mn
+++ b/application/palemoon/themes/windows/jar.mn
@@ -112,6 +112,7 @@ browser.jar:
   skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
   skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
   skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
+  skin/classic/browser/places/libraryToolbar.svg                      (places/libraryToolbar.svg)
   skin/classic/browser/places/starred48.png                           (places/starred48.png)
   skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
   skin/classic/browser/places/tag.png                                 (places/tag.png)
diff --git a/application/palemoon/themes/windows/pageInfo.css b/application/palemoon/themes/windows/pageInfo.css
index ec65cc4084..3bbfc933b0 100644
--- a/application/palemoon/themes/windows/pageInfo.css
+++ b/application/palemoon/themes/windows/pageInfo.css
@@ -6,7 +6,7 @@
 
 /* View buttons */
 #viewGroup {
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
 }
 
 #viewGroup > radio {
@@ -31,7 +31,7 @@
 
 #topBar {
   border-bottom: 2px groove ThreeDFace;
-  -moz-padding-start: 10px;
+  padding-inline-start: 10px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
@@ -98,7 +98,7 @@ textbox {
 }
 
 textbox.header {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 .iframe {
@@ -121,8 +121,8 @@ groupbox.collapsable caption .caption-icon {
   height: 9px;
   background-repeat: no-repeat;
   background-position: center;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: 2px;
   background-image: url("chrome://global/skin/tree/twisty.svg#open");
 }
 
@@ -142,7 +142,7 @@ groupbox tree {
 }
 
 #securityBox description { 
-  -moz-margin-start: 10px;
+  margin-inline-start: 10px;
 }
 
 #general-security-identity {
@@ -197,8 +197,8 @@ treechildren::-moz-tree-cell-text(broken) {
 #feedListbox richlistitem {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
@@ -235,8 +235,8 @@ treechildren::-moz-tree-cell-text(broken) {
 .permission {
   padding-top: 6px;
   padding-bottom: 6px;
-  -moz-padding-start: 7px;
-  -moz-padding-end: 7px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
   min-height: 25px;
   border-bottom: 1px dotted #C0C0C0;
 }
diff --git a/application/palemoon/themes/windows/permissions/aboutPermissions.css b/application/palemoon/themes/windows/permissions/aboutPermissions.css
index 60ee816733..d3ceed7567 100644
--- a/application/palemoon/themes/windows/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/windows/permissions/aboutPermissions.css
@@ -43,7 +43,7 @@
 .site-favicon {
   height: 16px;
   width: 16px;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
@@ -60,7 +60,7 @@
 
 #site-description {
   font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
+  margin-inline-start: 6px; /* to match button margin */
 }
 
 #site-label {
@@ -72,7 +72,7 @@
 #defaults-description {
   font-size: 125%;
   font-weight: bold;
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
 }
 
 .pref-item {
@@ -82,7 +82,7 @@
 .pref-icon {
   width: 48px;
   height: 48px;
-  -moz-margin-end: 10px;
+  margin-inline-end: 10px;
 }
 
 .pref-icon[type="password"] {
diff --git a/application/palemoon/themes/windows/places/editBookmarkOverlay.css b/application/palemoon/themes/windows/places/editBookmarkOverlay.css
index be3ea83f4b..3d67cd3f4c 100644
--- a/application/palemoon/themes/windows/places/editBookmarkOverlay.css
+++ b/application/palemoon/themes/windows/places/editBookmarkOverlay.css
@@ -24,7 +24,7 @@
 .expander-down {
   min-width: 0;
   margin: 0;
-  -moz-margin-end: 4px;
+  margin-inline-end: 4px;
 }
 
 .expander-up > .button-box,
diff --git a/application/palemoon/themes/windows/places/libraryToolbar.svg b/application/palemoon/themes/windows/places/libraryToolbar.svg
new file mode 100644
index 0000000000..5fcf42ae3a
--- /dev/null
+++ b/application/palemoon/themes/windows/places/libraryToolbar.svg
@@ -0,0 +1,41 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="16" viewBox="0 0 48 16">
+  <defs>
+    <linearGradient id="starGradient" x1="24.5" x2="24.5" y1="1081" y2="1121" gradientTransform="matrix(.318 0 0 .317 30.2 -342)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#f9f3ac"/>
+      <stop offset="1" stop-color="#ffdc46"/>
+    </linearGradient>
+    <linearGradient id="fileGradient" x1="5" x2="5" y1=".842" y2="9.16" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset="1" stop-color="#e3f1fc"/>
+    </linearGradient>
+  </defs>
+  <g id="file">
+    <use width="100%" height="100%" transform="translate(6 6)" xlink:href="#file-individual"/>
+    <use width="100%" height="100%" transform="translate(4 4)" xlink:href="#file-individual"/>
+    <use width="100%" height="100%" transform="translate(2 2)" xlink:href="#file-individual"/>
+    <g id="file-individual">
+      <path fill="url(#fileGradient)" d="M1 0h8v10H1z"/>
+      <path fill="#9c9c9c" d="M1 0v10h8V0zm1 1h6v8H2z"/>
+    </g>
+  </g>
+  <g id="view">
+    <path fill="#a7dd8c" d="M17 2v1h2V2z"/>
+    <path fill="#eaedf4" d="M20 2v1h7V2zm8 0v1h3V2zm-8 2v1h7V4zm8 0v1h3V4zm-8 2v1h7V6zm8 0v1h3V6zm-8 3v1h7V9zm8 0v1h3V9zm-8 2v1h7v-1zm8 0v1h3v-1zm-8 2v1h7v-1zm8 0v1h3v-1z"/>
+    <path fill-opacity=".3" d="M17 3v1h2V3zm3 0v1h7V3zm8 0v1h3V3zM17 5v1h2V5zm3 0v1h7V5zm8 0v1h3V5zM17 7v1h2V7zm3 0v1h7V7zm8 0v1h3V7zm-11 3v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1zm-11 2v1h2v-1zm3 0v1h7v-1zm8 0v1h3v-1z"/>
+    <path fill="#c5a2ec" d="M17 4v1h2V4z"/>
+    <path fill="#ec8e8e" d="M17 6v1h2V6z"/>
+    <path fill="#8ebbec" d="M17 9v1h2V9z"/>
+    <path fill="#a7dd8c" d="M17 11v1h2v-1z"/>
+    <path fill="#fac090" d="M17 13v1h2v-1z"/>
+  </g>
+  <g id="bk-restore">
+    <g id="star">
+      <path fill="url(#starGradient)" d="M34.2 9.73c.213-2.14.213-2.14-.921-3.23-1.66-1.6-1.52-2.14.636-2.41 1.76-.22 1.78-.23 2.61-1.93.488-.992 1.05-1.7 1.34-1.7.293 0 .856.717 1.35 1.72.841 1.71.854 1.72 2.61 1.94 2.15.268 2.28.789.629 2.38-1.13 1.09-1.13 1.09-.921 3.23.251 2.52.023 2.65-2.26 1.32-1.41-.823-1.41-.823-2.81 0-2.28 1.33-2.51 1.2-2.26-1.32z"/>
+      <path fill="#cd9a34" d="M38 0c-.299 0-.462.127-.608.245a2.635 2.635 0 0 0-.405.427 7.3 7.3 0 0 0-.769 1.26c-.396.805-.589 1.13-.738 1.24-.15.111-.468.179-1.3.283-.535.067-.96.148-1.32.287-.357.139-.715.384-.825.8-.11.417.055.788.274 1.12.219.328.53.662.939 1.06.539.519.706.698.767.911.06.213.04.683-.062 1.7-.06.607-.095 1.08-.07 1.47.012.198.037.381.107.566a.995.995 0 0 0 .411.502c.408.238.81.117 1.19-.035.38-.152.808-.391 1.36-.712.67-.391.938-.508 1.05-.508.114 0 .383.117 1.05.508.55.32.981.56 1.36.712.38.152.78.274 1.19.035a.995.995 0 0 0 .411-.502c.071-.185.096-.367.108-.566.025-.397-.01-.867-.07-1.47-.103-1.02-.124-1.49-.062-1.7.06-.213.228-.392.767-.911.407-.392.717-.723.935-1.05.218-.325.386-.693.276-1.11-.11-.416-.467-.657-.822-.794-.355-.137-.78-.217-1.31-.283-.833-.104-1.15-.169-1.3-.281-.15-.111-.343-.437-.743-1.25a7.138 7.138 0 0 0-.776-1.27 2.608 2.608 0 0 0-.405-.429C38.464.136 38.3.007 38 .007zm0 1.24c.042.044.073.07.126.137.192.245.428.627.648 1.07.4.814.612 1.31 1.09 1.66.473.351.997.391 1.83.495.488.06.849.14 1.04.214.194.075.154.1.135.029-.019-.071.014-.014-.122.188s-.401.5-.78.866c-.539.519-.912.86-1.07 1.41-.158.555-.077 1.1.024 2.12.06.589.083 1.03.067 1.29-.004.072-.012.088-.02.128.008-.01.047-.001-.137-.075-.264-.106-.672-.326-1.21-.64-.67-.39-1.07-.662-1.62-.662-.555 0-.954.272-1.62.663-.535.313-.945.533-1.21.639-.184.073-.145.065-.137.075-.008-.04-.016-.056-.02-.128-.017-.26.01-.704.068-1.29.102-1.02.182-1.56.025-2.12-.158-.555-.533-.896-1.07-1.41-.381-.367-.646-.67-.783-.873-.136-.204-.104-.263-.122-.197-.018.066-.054.04.14-.036.197-.076.556-.158 1.05-.219.839-.105 1.36-.146 1.84-.495.475-.349.685-.84 1.08-1.65.218-.442.453-.82.644-1.06.051-.065.082-.089.124-.133z"/>
+    </g>
+    <path fill="#169103" d="M43 6.7c-2.37 0-4.34 1.65-4.85 3.87h2.03c.458-1.13 1.54-1.94 2.82-1.94.692 0 1.23.154 1.77.541l-1.39 2.17H48v-4.65l-1.85 1.08c-.923-.698-2-1.08-3.15-1.08zm-5 4.65V16l1.85-1.08c.923.698 2 1.08 3.15 1.08 2.37 0 4.34-1.65 4.85-3.87h-2.03c-.458 1.13-1.54 1.94-2.82 1.94-.692 0-1.23-.154-1.77-.541l1.39-2.17z"/>
+  </g>
+</svg>
diff --git a/application/palemoon/themes/windows/places/organizer.css b/application/palemoon/themes/windows/places/organizer.css
index 45851d0da6..0a947c2ac0 100644
--- a/application/palemoon/themes/windows/places/organizer.css
+++ b/application/palemoon/themes/windows/places/organizer.css
@@ -6,19 +6,21 @@
   --toolbar-custom-color: hsl(210,75%,92%);
   --toolbar-highlight-top: rgba(255,255,255,.5);
   --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png");
+  --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.png");
 }
 
 /* Use SVG for HiDPI 133%+ */
 @media (min-resolution: 1.33dppx) {
   :root {
     --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg");
+    --library-toolbar-image: url("chrome://browser/skin/places/libraryToolbar.svg");
   }
 }
 
 /* Toolbar */
 #placesToolbar {
   padding: 3px;
-  -moz-padding-end: 6px;
+  padding-inline-end: 6px;
 }
 
 #placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon {
@@ -45,14 +47,14 @@
 
 /* Menu */
 #placesMenu {
-  -moz-margin-start: 6px;
+  margin-inline-start: 6px;
   -moz-appearance: none;
   border: none;
 }
 
 #placesMenu > menu {
-  -moz-padding-start: 4px;
-  -moz-padding-end: 1px;
+  padding-inline-start: 4px;
+  padding-inline-end: 1px;
   padding-top: 2px;
   padding-bottom: 2px;
   -moz-appearance: toolbarbutton;
@@ -73,14 +75,14 @@
 
 #placesMenu > menu[open="true"] {
   border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
-  -moz-padding-start: 5px;
-  -moz-padding-end: 0px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0px;
   padding-top: 3px;
   padding-bottom: 1px;
 }
 
 #placesMenu > menu > .menubar-text {
-  -moz-padding-end: 8px;
+  padding-inline-end: 8px;
   background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat;
 }
 
@@ -92,35 +94,23 @@
 #organizeButton, 
 #viewMenu, 
 #maintenanceButton {
-  list-style-image: url("chrome://browser/skin/places/libraryToolbar.png");
+  list-style-image: var(--library-toolbar-image);
 }
 
 /* organize button */
 #organizeButton {
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
-#organizeButton:hover,
-#organizeButton[open="true"] {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
 
 /* view button */
 #viewMenu {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
-#viewMenu:hover,
-#viewMenu[open="true"] {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
 
 /* maintenance button */
 #maintenanceButton {
   -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
-#maintenanceButton:hover,
-#maintenanceButton[open="true"] {
-  -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
 
 /* Root View */
 #placesView {
@@ -134,12 +124,12 @@
 }
 
 #infoBoxExpanderLabel {
-  -moz-padding-start: 2px;
+  padding-inline-start: 2px;
 }
 
 #organizerScopeBar {
   padding: 2px 0;
-  -moz-padding-end: 3px;
+  padding-inline-end: 3px;
 }
 
 #organizerScopeBar > toolbarbutton {
@@ -181,8 +171,8 @@
 }
 
 #clearDownloadsButton {
-  -moz-padding-start: 9px;
-  -moz-padding-end: 9px;
+  padding-inline-start: 9px;
+  padding-inline-end: 9px;
 }
 
 #placesView {
@@ -205,11 +195,11 @@
 @media (-moz-windows-default-theme) {
   #placesView > splitter {
     border: 0;
-    -moz-border-end: 1px solid #A9B7C9;
+    border-inline-end: 1px solid #A9B7C9;
     min-width: 0;
     width: 3px;
     background-color: transparent;
-    -moz-margin-start: -3px;
+    margin-inline-start: -3px;
     position: relative;
   }
 }
@@ -245,7 +235,7 @@
   #searchFilter {
     -moz-appearance: none;
     padding: 2px;
-    -moz-padding-start: 4px;
+    padding-inline-start: 4px;
     background-clip: padding-box;
     border: 1px solid rgba(0,0,0,.32);
     border-radius: 2px;
diff --git a/application/palemoon/themes/windows/places/places.css b/application/palemoon/themes/windows/places/places.css
index bb160463e0..a16b82113d 100644
--- a/application/palemoon/themes/windows/places/places.css
+++ b/application/palemoon/themes/windows/places/places.css
@@ -168,5 +168,5 @@ treechildren::-moz-tree-cell-text(cutting) {
 #viewButton > .button-box > .button-menu-dropmarker {
   height: auto;
   width: auto;
-  -moz-margin-end: -3px;
+  margin-inline-end: -3px;
 }
diff --git a/application/palemoon/themes/windows/preferences/applications.css b/application/palemoon/themes/windows/preferences/applications.css
index 80699b4635..fdf5614772 100644
--- a/application/palemoon/themes/windows/preferences/applications.css
+++ b/application/palemoon/themes/windows/preferences/applications.css
@@ -11,18 +11,18 @@
 .actionsMenu {
   margin-top: 0;
   margin-bottom: 0;
-  -moz-margin-start: -2px;
-  -moz-margin-end: 0;
+  margin-inline-start: -2px;
+  margin-inline-end: 0;
 }
 
 .typeIcon,
 .actionIcon {
-  -moz-margin-start: 3px;
-  -moz-margin-end: 3px;
+  margin-inline-start: 3px;
+  margin-inline-end: 3px;
 }
 
 richlistitem label {
-  -moz-margin-start: 1px;
+  margin-inline-start: 1px;
   margin-top: 2px;
 }
 
@@ -51,14 +51,14 @@ menuitem[appHandlerIcon="plugin"] {
 }
 
 .actionsMenu .menulist-icon {
-  -moz-margin-end: 3px;
+  margin-inline-end: 3px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  -moz-padding-start: 0px;
-  -moz-padding-end: 2px;
+  padding-inline-start: 0px;
+  padding-inline-end: 2px;
 }
 
 .actionsMenu > menupopup > menuitem {
-  -moz-padding-start: 4px;
+  padding-inline-start: 4px;
 }
diff --git a/application/palemoon/themes/windows/sanitizeDialog.css b/application/palemoon/themes/windows/sanitizeDialog.css
index 4312eb8fb7..58e1f2983f 100644
--- a/application/palemoon/themes/windows/sanitizeDialog.css
+++ b/application/palemoon/themes/windows/sanitizeDialog.css
@@ -3,12 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #sanitizeDurationChoice {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 
 /* Align the duration label with the warning box and item list */
 #sanitizeDurationLabel {
-  -moz-margin-start: 3px;
+  margin-inline-start: 3px;
 }
 
 
@@ -79,15 +79,15 @@
 
 /* Make the item list the same width as the warning box */
 #itemList {
-  -moz-margin-start: 0;
-  -moz-margin-end: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 0;
 }
 
 
 /* Align the last dialog button with the end of the warning box */
 .prefWindow-dlgbuttons {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
 .dialog-button[dlgtype="cancel"] {
-  -moz-margin-end: 0;
+  margin-inline-end: 0;
 }
diff --git a/application/palemoon/themes/windows/searchbar.css b/application/palemoon/themes/windows/searchbar.css
index 86a485530c..d660772b91 100644
--- a/application/palemoon/themes/windows/searchbar.css
+++ b/application/palemoon/themes/windows/searchbar.css
@@ -22,7 +22,7 @@
   width: 16px;
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
-  -moz-margin-start: 2px;
+  margin-inline-start: 2px;
 }
 
 .searchbar-engine-button {
@@ -30,7 +30,7 @@
   min-width: 0;
   margin: 0;
   padding: 0;
-  -moz-padding-end: 2px;
+  padding-inline-end: 2px;
   -moz-box-align: center;
   background: none;
   border: none;
diff --git a/application/palemoon/themes/windows/statusbar/overlay.css b/application/palemoon/themes/windows/statusbar/overlay.css
index 7f9a5982fe..d9a36789ba 100644
--- a/application/palemoon/themes/windows/statusbar/overlay.css
+++ b/application/palemoon/themes/windows/statusbar/overlay.css
@@ -58,7 +58,7 @@ toolbar[brighttext] #status4evar-download-button #status4evar-download-icon
 
 toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label
 {
-	-moz-margin-start: 5px !important;
+	margin-inline-start: 5px !important;
 }
 
 /*
@@ -77,7 +77,7 @@ splitter.status4evar-status-splitter
 
 #urlbar-progress-alt
 {
-	-moz-margin-end: -2px;
+	margin-inline-end: -2px;
 }
 
 /*
diff --git a/application/palemoon/themes/windows/syncCommon.css b/application/palemoon/themes/windows/syncCommon.css
index f0beae0d53..838788cd52 100644
--- a/application/palemoon/themes/windows/syncCommon.css
+++ b/application/palemoon/themes/windows/syncCommon.css
@@ -8,7 +8,7 @@
 }
 
 .statusIcon {
-  -moz-margin-start: 4px;
+  margin-inline-start: 4px;
   max-height: 16px;
   max-width: 16px;
 }
diff --git a/application/palemoon/themes/windows/syncSetup.css b/application/palemoon/themes/windows/syncSetup.css
index fff65e9632..8898951ebd 100644
--- a/application/palemoon/themes/windows/syncSetup.css
+++ b/application/palemoon/themes/windows/syncSetup.css
@@ -99,7 +99,7 @@ description > .text-link:focus {
 }
 
 .inputColumn {
-  -moz-margin-end: 2px
+  margin-inline-end: 2px
 }
 
 .pin {
diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess
index 28d5092011..8fe7583391 100644
--- a/build/autoconf/config.guess
+++ b/build/autoconf/config.guess
@@ -381,11 +381,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+  _ISAINFO=`isainfo -k 2>/dev/null`
+  if [ "$_ISAINFO" = "amd64" ]; then
+    SUN_ARCH=x86_64
+  elif [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+    # If there is a compiler, see if it is configured for 64-bit objects.
+    # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+    # This test works for both compilers.
+      if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
diff --git a/build/ppCheck.py b/build/ppCheck.py
new file mode 100644
index 0000000000..1e27ca1715
--- /dev/null
+++ b/build/ppCheck.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+import os, sys
+
+if not len(sys.argv) is 2 or not os.path.exists(sys.argv[1]):
+  print("\nYou did not supply a valid path to check.")
+  exit(1)
+else:
+  print("\nChecking for un-preprocessed files...", end = ' ')
+  DIST_PATH = sys.argv[1]
+
+PP_FILE_TYPES = (
+  '.css',
+  '.dtd',
+  '.html',
+  '.js',
+  '.jsm',
+  '.xhtml',
+  '.xml',
+  '.xul',
+  '.manifest',
+  '.properties',
+  '.rdf'
+)
+
+PP_SPECIAL_TYPES = ('.css')
+
+PP_DIRECTIVES = [
+  'define',
+  'if',
+  'ifdef',
+  'ifndef',
+  'elif',
+  'elifdef',
+  'endif',
+  'error',
+  'expand',
+  'filter',
+  'include',
+  'literal',
+  'undef',
+  'unfilter'
+]
+
+PP_FILES = []
+PP_BAD_FILES = []
+
+for root, directories, filenames in os.walk(DIST_PATH):
+  for filename in filenames: 
+    if filename.endswith(PP_FILE_TYPES):
+      PP_FILES += [ os.path.join(root, filename).replace(os.sep, '/') ]
+
+for file in PP_FILES:
+  with open(file) as fp:
+    marker = '%' if file.endswith(PP_SPECIAL_TYPES) else '#'
+    directives = tuple(marker + directive for directive in PP_DIRECTIVES)
+    for line in fp:
+      if line.startswith(directives):
+        PP_BAD_FILES += [ file.replace(DIST_PATH + '/', '') ]
+  fp.close()
+
+PP_BAD_FILES = list(dict.fromkeys(PP_BAD_FILES))
+
+print('Done!')
+
+if len(PP_BAD_FILES) > 0:
+  print("\nWARNING: The following {0} file(s) in {1} may require preprocessing:\n".format(len(PP_BAD_FILES), DIST_PATH))
+  for file in PP_BAD_FILES:
+    print(file)
+
+exit(0)
\ No newline at end of file
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index f53d89e819..d8d0614d57 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -860,6 +860,12 @@ nsDocShell::~nsDocShell()
     shPrivate->SetRootDocShell(nullptr);
   }
 
+  if (mContentViewer) {
+    mContentViewer->Close(nullptr);
+    mContentViewer->Destroy();
+    mContentViewer = nullptr;
+  }
+
   if (--gDocShellCount == 0) {
     NS_IF_RELEASE(sURIFixup);
   }
diff --git a/dom/inputmethod/moz.build b/dom/inputmethod/moz.build
index 84b3cb8ab2..e6d9945655 100644
--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@@ -6,11 +6,8 @@
 
 EXTRA_COMPONENTS += [
     'InputMethod.manifest',
-    'MozKeyboard.js',
-]
-
-EXTRA_PP_JS_MODULES += [
     'Keyboard.jsm',
+    'MozKeyboard.js',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/js/src/jit/CompileInfo.h b/js/src/jit/CompileInfo.h
index 44848890c4..f7f8c70bb8 100644
--- a/js/src/jit/CompileInfo.h
+++ b/js/src/jit/CompileInfo.h
@@ -487,7 +487,7 @@ class CompileInfo
 
         // Function.arguments can be used to access all arguments in non-strict
         // scripts, so we can't optimize out any arguments.
-        if ((hasArguments() || !script()->strict()) &&
+        if ((mayReadFrameArgsDirectly_ || !script()->strict()) &&
             firstArgSlot() <= slot && slot - firstArgSlot() < nargs())
         {
             return true;
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 5ea7a01881..c0d09d2a0b 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -851,12 +851,6 @@ NS_IMPL_ISUPPORTS(VsyncChildCreateCallback, nsIIPCBackgroundChildCreateCallback)
 static StaticRefPtr<RefreshDriverTimer> sRegularRateTimer;
 static StaticRefPtr<InactiveRefreshDriverTimer> sThrottledRateTimer;
 
-#ifdef XP_WIN
-static int32_t sHighPrecisionTimerRequests = 0;
-// a bare pointer to avoid introducing a static constructor
-static nsITimer *sDisableHighPrecisionTimersTimer = nullptr;
-#endif
-
 static void
 CreateContentVsyncRefreshTimer(void*)
 {
@@ -934,16 +928,6 @@ nsRefreshDriver::Shutdown()
 
   sRegularRateTimer = nullptr;
   sThrottledRateTimer = nullptr;
-
-#ifdef XP_WIN
-  if (sDisableHighPrecisionTimersTimer) {
-    sDisableHighPrecisionTimersTimer->Cancel();
-    NS_RELEASE(sDisableHighPrecisionTimersTimer);
-    timeEndPeriod(1);
-  } else if (sHighPrecisionTimerRequests) {
-    timeEndPeriod(1);
-  }
-#endif
 }
 
 /* static */ int32_t
@@ -1062,7 +1046,6 @@ nsRefreshDriver::nsRefreshDriver(nsPresContext* aPresContext)
     mNeedToRecomputeVisibility(false),
     mTestControllingRefreshes(false),
     mViewManagerFlushIsPending(false),
-    mRequestedHighPrecision(false),
     mInRefresh(false),
     mWaitingForTransaction(false),
     mSkippedPaints(false),
@@ -1300,83 +1283,6 @@ nsRefreshDriver::StopTimer()
 
   mActiveTimer->RemoveRefreshDriver(this);
   mActiveTimer = nullptr;
-
-  if (mRequestedHighPrecision) {
-    SetHighPrecisionTimersEnabled(false);
-  }
-}
-
-#ifdef XP_WIN
-static void
-DisableHighPrecisionTimersCallback(nsITimer *aTimer, void *aClosure)
-{
-  timeEndPeriod(1);
-  NS_RELEASE(sDisableHighPrecisionTimersTimer);
-}
-#endif
-
-void
-nsRefreshDriver::ConfigureHighPrecision()
-{
-  bool haveUnthrottledFrameRequestCallbacks =
-    mFrameRequestCallbackDocs.Length() > 0;
-
-  // if the only change that's needed is that we need high precision,
-  // then just set that
-  if (!mThrottled && !mRequestedHighPrecision &&
-      haveUnthrottledFrameRequestCallbacks) {
-    SetHighPrecisionTimersEnabled(true);
-  } else if (mRequestedHighPrecision && !haveUnthrottledFrameRequestCallbacks) {
-    SetHighPrecisionTimersEnabled(false);
-  }
-}
-
-void
-nsRefreshDriver::SetHighPrecisionTimersEnabled(bool aEnable)
-{
-  LOG("[%p] SetHighPrecisionTimersEnabled (%s)", this, aEnable ? "true" : "false");
-
-  if (aEnable) {
-    NS_ASSERTION(!mRequestedHighPrecision, "SetHighPrecisionTimersEnabled(true) called when already requested!");
-#ifdef XP_WIN
-    if (++sHighPrecisionTimerRequests == 1) {
-      // If we had a timer scheduled to disable it, that means that it's already
-      // enabled; just cancel the timer.  Otherwise, really enable it.
-      if (sDisableHighPrecisionTimersTimer) {
-        sDisableHighPrecisionTimersTimer->Cancel();
-        NS_RELEASE(sDisableHighPrecisionTimersTimer);
-      } else {
-        timeBeginPeriod(1);
-      }
-    }
-#endif
-    mRequestedHighPrecision = true;
-  } else {
-    NS_ASSERTION(mRequestedHighPrecision, "SetHighPrecisionTimersEnabled(false) called when not requested!");
-#ifdef XP_WIN
-    if (--sHighPrecisionTimerRequests == 0) {
-      // Don't jerk us around between high precision and low precision
-      // timers; instead, only allow leaving high precision timers
-      // after 90 seconds.  This is arbitrary, but hopefully good
-      // enough.
-      NS_ASSERTION(!sDisableHighPrecisionTimersTimer, "We shouldn't have an outstanding disable-high-precision timer !");
-
-      nsCOMPtr<nsITimer> timer = do_CreateInstance(NS_TIMER_CONTRACTID);
-      if (timer) {
-        timer.forget(&sDisableHighPrecisionTimersTimer);
-        sDisableHighPrecisionTimersTimer->InitWithFuncCallback(DisableHighPrecisionTimersCallback,
-                                                               nullptr,
-                                                               90 * 1000,
-                                                               nsITimer::TYPE_ONE_SHOT);
-      } else {
-        // might happen if we're shutting down XPCOM; just drop the time period down
-        // immediately
-        timeEndPeriod(1);
-      }
-    }
-#endif
-    mRequestedHighPrecision = false;
-  }
 }
 
 uint32_t
@@ -1993,8 +1899,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
     observer->DidRefresh();
   }
 
-  ConfigureHighPrecision();
-
   NS_ASSERTION(mInRefresh, "Still in refresh");
 
   if (mPresContext->IsRoot() && XRE_IsContentProcess() && gfxPrefs::AlwaysPaint()) {
@@ -2247,7 +2151,6 @@ nsRefreshDriver::ScheduleFrameRequestCallbacks(nsIDocument* aDocument)
   }
 
   // make sure that the timer is running
-  ConfigureHighPrecision();
   EnsureTimerStarted();
 }
 
@@ -2256,7 +2159,6 @@ nsRefreshDriver::RevokeFrameRequestCallbacks(nsIDocument* aDocument)
 {
   mFrameRequestCallbackDocs.RemoveElement(aDocument);
   mThrottledFrameRequestCallbackDocs.RemoveElement(aDocument);
-  ConfigureHighPrecision();
   // No need to worry about restarting our timer in slack mode if it's already
   // running; that will happen automatically when it fires.
 }
diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h
index b2dd9be4be..4e839e7641 100644
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -450,7 +450,6 @@ private:
   bool mNeedToRecomputeVisibility;
   bool mTestControllingRefreshes;
   bool mViewManagerFlushIsPending;
-  bool mRequestedHighPrecision;
   bool mInRefresh;
 
   // True if the refresh driver is suspended waiting for transaction
@@ -502,10 +501,6 @@ private:
 
   friend class mozilla::RefreshDriverTimer;
 
-  // turn on or turn off high precision based on various factors
-  void ConfigureHighPrecision();
-  void SetHighPrecisionTimersEnabled(bool aEnable);
-
   static void Shutdown();
 
   // `true` if we are currently in jank-critical mode.
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index afc4ed96f4..e2537968cc 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -1031,6 +1031,7 @@ nsContainerFrame::ReflowChild(nsIFrame*                aKidFrame,
 
   if (0 == (aFlags & NS_FRAME_NO_MOVE_VIEW)) {
     PositionFrameView(aKidFrame);
+    PositionChildViews(aKidFrame);
   }
 
   // Reflow the child frame
@@ -1074,6 +1075,7 @@ nsContainerFrame::ReflowChild(nsIFrame*                aKidFrame,
 
   if (0 == (aFlags & NS_FRAME_NO_MOVE_VIEW)) {
     PositionFrameView(aKidFrame);
+    PositionChildViews(aKidFrame);
   }
 
   // Reflow the child frame
@@ -1923,6 +1925,10 @@ nsContainerFrame::RenumberFrameAndDescendants(int32_t* aOrdinal,
             nsIFrame *f = bullet;
             do {
               nsIFrame *parent = f->GetParent();
+              if (!parent) {
+                // We may have an orphan situation in some corner cases.
+                break;
+              }
               parent->ChildIsDirty(f);
               f = parent;
             } while (f != listItem);
diff --git a/media/libaom/generate_sources_mozbuild.py b/media/libaom/generate_sources_mozbuild.py
index a5a75d8bee..180837b248 100644
--- a/media/libaom/generate_sources_mozbuild.py
+++ b/media/libaom/generate_sources_mozbuild.py
@@ -9,7 +9,7 @@ import os
 import re
 import subprocess
 
-AOM_DIR = '../../third_party/aom'
+AOM_DIR = '../../media/libaom/src'
 
 def write_aom_config(system, arch, variables, cache_variables):
     # read template cmake file
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh
index fc12b7230c..662eeb6077 100755
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -15,7 +15,7 @@
 
 export LC_ALL=C
 BASE_DIR=$(pwd)
-LIBAOM_SRC_DIR="../../third_party/aom"
+LIBAOM_SRC_DIR="../../media/libaom/src"
 LIBAOM_CONFIG_DIR="config"
 
 # Print license header.
diff --git a/media/libaom/moz.build b/media/libaom/moz.build
index e376878cc4..f2d122d763 100644
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -134,10 +134,10 @@ if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
 ASFLAGS += CONFIG['VPX_ASFLAGS']
 ASFLAGS += [
     '-I.',
-    '-I%s/third_party/aom' % TOPSRCDIR,
+    '-I%s/media/libaom/src' % TOPSRCDIR,
 ]
 
 LOCAL_INCLUDES += [
     '/media/libaom/config', # aom_version.h
-    '/third_party/aom',
+    '/media/libaom/src',
 ]
diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild
index da408d72b1..ff91ede846 100644
--- a/media/libaom/sources.mozbuild
+++ b/media/libaom/sources.mozbuild
@@ -2,543 +2,543 @@
 
 files = {
   'ARM_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/arm.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '../../media/libaom/src/aom/aom.h',
+    '../../media/libaom/src/aom/aom_codec.h',
+    '../../media/libaom/src/aom/aom_decoder.h',
+    '../../media/libaom/src/aom/aom_encoder.h',
+    '../../media/libaom/src/aom/aom_frame_buffer.h',
+    '../../media/libaom/src/aom/aom_image.h',
+    '../../media/libaom/src/aom/aom_integer.h',
+    '../../media/libaom/src/aom/aomcx.h',
+    '../../media/libaom/src/aom/aomdx.h',
+    '../../media/libaom/src/aom_mem/aom_mem.h',
+    '../../media/libaom/src/aom_ports/aom_timer.h',
+    '../../media/libaom/src/aom_ports/arm.h',
+    '../../media/libaom/src/aom_ports/bitops.h',
+    '../../media/libaom/src/aom_ports/mem.h',
+    '../../media/libaom/src/aom_ports/sanitizer.h',
+    '../../media/libaom/src/aom_ports/system_state.h',
+    '../../media/libaom/src/aom_scale/aom_scale.h',
+    '../../media/libaom/src/aom_scale/yv12config.h',
   ],
   'ARM_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c',
-    '../../third_party/aom/aom_dsp/arm/fwd_txfm_neon.c',
-    '../../third_party/aom/aom_dsp/arm/intrapred_neon.c',
-    '../../third_party/aom/aom_dsp/arm/loopfilter_neon.c',
-    '../../third_party/aom/aom_dsp/arm/subtract_neon.c',
-    '../../third_party/aom/aom_dsp/avg.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/arm_cpudetect.c',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/arm/av1_inv_txfm_neon.c',
-    '../../third_party/aom/av1/common/arm/av1_txfm_neon.c',
-    '../../third_party/aom/av1/common/arm/blend_a64_hmask_neon.c',
-    '../../third_party/aom/av1/common/arm/blend_a64_vmask_neon.c',
-    '../../third_party/aom/av1/common/arm/cfl_neon.c',
-    '../../third_party/aom/av1/common/arm/convolve_neon.c',
-    '../../third_party/aom/av1/common/arm/jnt_convolve_neon.c',
-    '../../third_party/aom/av1/common/arm/reconinter_neon.c',
-    '../../third_party/aom/av1/common/arm/selfguided_neon.c',
-    '../../third_party/aom/av1/common/arm/warp_plane_neon.c',
-    '../../third_party/aom/av1/common/arm/wiener_convolve_neon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_neon.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/obu.c',
-    '../../third_party/aom/av1/encoder/arm/neon/av1_error_neon.c',
-    '../../third_party/aom/av1/encoder/arm/neon/quantize_neon.c',
+    '../../media/libaom/src/aom/src/aom_codec.c',
+    '../../media/libaom/src/aom/src/aom_decoder.c',
+    '../../media/libaom/src/aom/src/aom_encoder.c',
+    '../../media/libaom/src/aom/src/aom_image.c',
+    '../../media/libaom/src/aom/src/aom_integer.c',
+    '../../media/libaom/src/aom_dsp/aom_convolve.c',
+    '../../media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '../../media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c',
+    '../../media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c',
+    '../../media/libaom/src/aom_dsp/arm/intrapred_neon.c',
+    '../../media/libaom/src/aom_dsp/arm/loopfilter_neon.c',
+    '../../media/libaom/src/aom_dsp/arm/subtract_neon.c',
+    '../../media/libaom/src/aom_dsp/avg.c',
+    '../../media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '../../media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '../../media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '../../media/libaom/src/aom_dsp/daalaboolreader.c',
+    '../../media/libaom/src/aom_dsp/entcode.c',
+    '../../media/libaom/src/aom_dsp/entdec.c',
+    '../../media/libaom/src/aom_dsp/fft.c',
+    '../../media/libaom/src/aom_dsp/grain_synthesis.c',
+    '../../media/libaom/src/aom_dsp/intrapred.c',
+    '../../media/libaom/src/aom_dsp/loopfilter.c',
+    '../../media/libaom/src/aom_dsp/subtract.c',
+    '../../media/libaom/src/aom_mem/aom_mem.c',
+    '../../media/libaom/src/aom_ports/arm_cpudetect.c',
+    '../../media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '../../media/libaom/src/aom_scale/generic/aom_scale.c',
+    '../../media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '../../media/libaom/src/aom_scale/generic/yv12config.c',
+    '../../media/libaom/src/aom_scale/generic/yv12extend.c',
+    '../../media/libaom/src/aom_util/aom_thread.c',
+    '../../media/libaom/src/aom_util/debug_util.c',
+    '../../media/libaom/src/av1/av1_dx_iface.c',
+    '../../media/libaom/src/av1/common/alloccommon.c',
+    '../../media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c',
+    '../../media/libaom/src/av1/common/arm/av1_txfm_neon.c',
+    '../../media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c',
+    '../../media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c',
+    '../../media/libaom/src/av1/common/arm/cfl_neon.c',
+    '../../media/libaom/src/av1/common/arm/convolve_neon.c',
+    '../../media/libaom/src/av1/common/arm/jnt_convolve_neon.c',
+    '../../media/libaom/src/av1/common/arm/reconinter_neon.c',
+    '../../media/libaom/src/av1/common/arm/selfguided_neon.c',
+    '../../media/libaom/src/av1/common/arm/warp_plane_neon.c',
+    '../../media/libaom/src/av1/common/arm/wiener_convolve_neon.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '../../media/libaom/src/av1/common/av1_loopfilter.c',
+    '../../media/libaom/src/av1/common/av1_rtcd.c',
+    '../../media/libaom/src/av1/common/av1_txfm.c',
+    '../../media/libaom/src/av1/common/blockd.c',
+    '../../media/libaom/src/av1/common/cdef.c',
+    '../../media/libaom/src/av1/common/cdef_block.c',
+    '../../media/libaom/src/av1/common/cdef_block_neon.c',
+    '../../media/libaom/src/av1/common/cfl.c',
+    '../../media/libaom/src/av1/common/convolve.c',
+    '../../media/libaom/src/av1/common/debugmodes.c',
+    '../../media/libaom/src/av1/common/entropy.c',
+    '../../media/libaom/src/av1/common/entropymode.c',
+    '../../media/libaom/src/av1/common/entropymv.c',
+    '../../media/libaom/src/av1/common/frame_buffers.c',
+    '../../media/libaom/src/av1/common/idct.c',
+    '../../media/libaom/src/av1/common/mvref_common.c',
+    '../../media/libaom/src/av1/common/obu_util.c',
+    '../../media/libaom/src/av1/common/odintrin.c',
+    '../../media/libaom/src/av1/common/pred_common.c',
+    '../../media/libaom/src/av1/common/quant_common.c',
+    '../../media/libaom/src/av1/common/reconinter.c',
+    '../../media/libaom/src/av1/common/reconintra.c',
+    '../../media/libaom/src/av1/common/resize.c',
+    '../../media/libaom/src/av1/common/restoration.c',
+    '../../media/libaom/src/av1/common/scale.c',
+    '../../media/libaom/src/av1/common/scan.c',
+    '../../media/libaom/src/av1/common/seg_common.c',
+    '../../media/libaom/src/av1/common/thread_common.c',
+    '../../media/libaom/src/av1/common/tile_common.c',
+    '../../media/libaom/src/av1/common/timing.c',
+    '../../media/libaom/src/av1/common/txb_common.c',
+    '../../media/libaom/src/av1/common/warped_motion.c',
+    '../../media/libaom/src/av1/decoder/decodeframe.c',
+    '../../media/libaom/src/av1/decoder/decodemv.c',
+    '../../media/libaom/src/av1/decoder/decoder.c',
+    '../../media/libaom/src/av1/decoder/decodetxb.c',
+    '../../media/libaom/src/av1/decoder/detokenize.c',
+    '../../media/libaom/src/av1/decoder/obu.c',
+    '../../media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c',
+    '../../media/libaom/src/av1/encoder/arm/neon/quantize_neon.c',
   ],
   'GENERIC_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '../../media/libaom/src/aom/aom.h',
+    '../../media/libaom/src/aom/aom_codec.h',
+    '../../media/libaom/src/aom/aom_decoder.h',
+    '../../media/libaom/src/aom/aom_encoder.h',
+    '../../media/libaom/src/aom/aom_frame_buffer.h',
+    '../../media/libaom/src/aom/aom_image.h',
+    '../../media/libaom/src/aom/aom_integer.h',
+    '../../media/libaom/src/aom/aomcx.h',
+    '../../media/libaom/src/aom/aomdx.h',
+    '../../media/libaom/src/aom_mem/aom_mem.h',
+    '../../media/libaom/src/aom_ports/aom_timer.h',
+    '../../media/libaom/src/aom_ports/bitops.h',
+    '../../media/libaom/src/aom_ports/mem.h',
+    '../../media/libaom/src/aom_ports/sanitizer.h',
+    '../../media/libaom/src/aom_ports/system_state.h',
+    '../../media/libaom/src/aom_scale/aom_scale.h',
+    '../../media/libaom/src/aom_scale/yv12config.h',
   ],
   'GENERIC_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/avg.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '../../media/libaom/src/aom/src/aom_codec.c',
+    '../../media/libaom/src/aom/src/aom_decoder.c',
+    '../../media/libaom/src/aom/src/aom_encoder.c',
+    '../../media/libaom/src/aom/src/aom_image.c',
+    '../../media/libaom/src/aom/src/aom_integer.c',
+    '../../media/libaom/src/aom_dsp/aom_convolve.c',
+    '../../media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '../../media/libaom/src/aom_dsp/avg.c',
+    '../../media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '../../media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '../../media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '../../media/libaom/src/aom_dsp/daalaboolreader.c',
+    '../../media/libaom/src/aom_dsp/entcode.c',
+    '../../media/libaom/src/aom_dsp/entdec.c',
+    '../../media/libaom/src/aom_dsp/fft.c',
+    '../../media/libaom/src/aom_dsp/grain_synthesis.c',
+    '../../media/libaom/src/aom_dsp/intrapred.c',
+    '../../media/libaom/src/aom_dsp/loopfilter.c',
+    '../../media/libaom/src/aom_dsp/subtract.c',
+    '../../media/libaom/src/aom_mem/aom_mem.c',
+    '../../media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '../../media/libaom/src/aom_scale/generic/aom_scale.c',
+    '../../media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '../../media/libaom/src/aom_scale/generic/yv12config.c',
+    '../../media/libaom/src/aom_scale/generic/yv12extend.c',
+    '../../media/libaom/src/aom_util/aom_thread.c',
+    '../../media/libaom/src/aom_util/debug_util.c',
+    '../../media/libaom/src/av1/av1_dx_iface.c',
+    '../../media/libaom/src/av1/common/alloccommon.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '../../media/libaom/src/av1/common/av1_loopfilter.c',
+    '../../media/libaom/src/av1/common/av1_rtcd.c',
+    '../../media/libaom/src/av1/common/av1_txfm.c',
+    '../../media/libaom/src/av1/common/blockd.c',
+    '../../media/libaom/src/av1/common/cdef.c',
+    '../../media/libaom/src/av1/common/cdef_block.c',
+    '../../media/libaom/src/av1/common/cfl.c',
+    '../../media/libaom/src/av1/common/convolve.c',
+    '../../media/libaom/src/av1/common/debugmodes.c',
+    '../../media/libaom/src/av1/common/entropy.c',
+    '../../media/libaom/src/av1/common/entropymode.c',
+    '../../media/libaom/src/av1/common/entropymv.c',
+    '../../media/libaom/src/av1/common/frame_buffers.c',
+    '../../media/libaom/src/av1/common/idct.c',
+    '../../media/libaom/src/av1/common/mvref_common.c',
+    '../../media/libaom/src/av1/common/obu_util.c',
+    '../../media/libaom/src/av1/common/odintrin.c',
+    '../../media/libaom/src/av1/common/pred_common.c',
+    '../../media/libaom/src/av1/common/quant_common.c',
+    '../../media/libaom/src/av1/common/reconinter.c',
+    '../../media/libaom/src/av1/common/reconintra.c',
+    '../../media/libaom/src/av1/common/resize.c',
+    '../../media/libaom/src/av1/common/restoration.c',
+    '../../media/libaom/src/av1/common/scale.c',
+    '../../media/libaom/src/av1/common/scan.c',
+    '../../media/libaom/src/av1/common/seg_common.c',
+    '../../media/libaom/src/av1/common/thread_common.c',
+    '../../media/libaom/src/av1/common/tile_common.c',
+    '../../media/libaom/src/av1/common/timing.c',
+    '../../media/libaom/src/av1/common/txb_common.c',
+    '../../media/libaom/src/av1/common/warped_motion.c',
+    '../../media/libaom/src/av1/decoder/decodeframe.c',
+    '../../media/libaom/src/av1/decoder/decodemv.c',
+    '../../media/libaom/src/av1/decoder/decoder.c',
+    '../../media/libaom/src/av1/decoder/decodetxb.c',
+    '../../media/libaom/src/av1/decoder/detokenize.c',
+    '../../media/libaom/src/av1/decoder/obu.c',
   ],
   'IA32_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '../../media/libaom/src/aom/aom.h',
+    '../../media/libaom/src/aom/aom_codec.h',
+    '../../media/libaom/src/aom/aom_decoder.h',
+    '../../media/libaom/src/aom/aom_encoder.h',
+    '../../media/libaom/src/aom/aom_frame_buffer.h',
+    '../../media/libaom/src/aom/aom_image.h',
+    '../../media/libaom/src/aom/aom_integer.h',
+    '../../media/libaom/src/aom/aomcx.h',
+    '../../media/libaom/src/aom/aomdx.h',
+    '../../media/libaom/src/aom_mem/aom_mem.h',
+    '../../media/libaom/src/aom_ports/aom_timer.h',
+    '../../media/libaom/src/aom_ports/bitops.h',
+    '../../media/libaom/src/aom_ports/mem.h',
+    '../../media/libaom/src/aom_ports/sanitizer.h',
+    '../../media/libaom/src/aom_ports/system_state.h',
+    '../../media/libaom/src/aom_scale/aom_scale.h',
+    '../../media/libaom/src/aom_scale/yv12config.h',
   ],
   'IA32_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/avg.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
-    '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/avg_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/avg_intrin_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_asm_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_ports/x86_abi_support.asm',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
-    '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/cfl_avx2.c',
-    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
-    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
-    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
-    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
-    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_avx2.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse2.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '../../media/libaom/src/aom/src/aom_codec.c',
+    '../../media/libaom/src/aom/src/aom_decoder.c',
+    '../../media/libaom/src/aom/src/aom_encoder.c',
+    '../../media/libaom/src/aom/src/aom_image.c',
+    '../../media/libaom/src/aom/src/aom_integer.c',
+    '../../media/libaom/src/aom_dsp/aom_convolve.c',
+    '../../media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '../../media/libaom/src/aom_dsp/avg.c',
+    '../../media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '../../media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '../../media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '../../media/libaom/src/aom_dsp/daalaboolreader.c',
+    '../../media/libaom/src/aom_dsp/entcode.c',
+    '../../media/libaom/src/aom_dsp/entdec.c',
+    '../../media/libaom/src/aom_dsp/fft.c',
+    '../../media/libaom/src/aom_dsp/grain_synthesis.c',
+    '../../media/libaom/src/aom_dsp/intrapred.c',
+    '../../media/libaom/src/aom_dsp/loopfilter.c',
+    '../../media/libaom/src/aom_dsp/subtract.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '../../media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '../../media/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '../../media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '../../media/libaom/src/aom_mem/aom_mem.c',
+    '../../media/libaom/src/aom_ports/emms.asm',
+    '../../media/libaom/src/aom_ports/x86_abi_support.asm',
+    '../../media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '../../media/libaom/src/aom_scale/generic/aom_scale.c',
+    '../../media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '../../media/libaom/src/aom_scale/generic/yv12config.c',
+    '../../media/libaom/src/aom_scale/generic/yv12extend.c',
+    '../../media/libaom/src/aom_util/aom_thread.c',
+    '../../media/libaom/src/aom_util/debug_util.c',
+    '../../media/libaom/src/av1/av1_dx_iface.c',
+    '../../media/libaom/src/av1/common/alloccommon.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '../../media/libaom/src/av1/common/av1_loopfilter.c',
+    '../../media/libaom/src/av1/common/av1_rtcd.c',
+    '../../media/libaom/src/av1/common/av1_txfm.c',
+    '../../media/libaom/src/av1/common/blockd.c',
+    '../../media/libaom/src/av1/common/cdef.c',
+    '../../media/libaom/src/av1/common/cdef_block.c',
+    '../../media/libaom/src/av1/common/cdef_block_avx2.c',
+    '../../media/libaom/src/av1/common/cdef_block_sse2.c',
+    '../../media/libaom/src/av1/common/cdef_block_sse4.c',
+    '../../media/libaom/src/av1/common/cdef_block_ssse3.c',
+    '../../media/libaom/src/av1/common/cfl.c',
+    '../../media/libaom/src/av1/common/convolve.c',
+    '../../media/libaom/src/av1/common/debugmodes.c',
+    '../../media/libaom/src/av1/common/entropy.c',
+    '../../media/libaom/src/av1/common/entropymode.c',
+    '../../media/libaom/src/av1/common/entropymv.c',
+    '../../media/libaom/src/av1/common/frame_buffers.c',
+    '../../media/libaom/src/av1/common/idct.c',
+    '../../media/libaom/src/av1/common/mvref_common.c',
+    '../../media/libaom/src/av1/common/obu_util.c',
+    '../../media/libaom/src/av1/common/odintrin.c',
+    '../../media/libaom/src/av1/common/pred_common.c',
+    '../../media/libaom/src/av1/common/quant_common.c',
+    '../../media/libaom/src/av1/common/reconinter.c',
+    '../../media/libaom/src/av1/common/reconintra.c',
+    '../../media/libaom/src/av1/common/resize.c',
+    '../../media/libaom/src/av1/common/restoration.c',
+    '../../media/libaom/src/av1/common/scale.c',
+    '../../media/libaom/src/av1/common/scan.c',
+    '../../media/libaom/src/av1/common/seg_common.c',
+    '../../media/libaom/src/av1/common/thread_common.c',
+    '../../media/libaom/src/av1/common/tile_common.c',
+    '../../media/libaom/src/av1/common/timing.c',
+    '../../media/libaom/src/av1/common/txb_common.c',
+    '../../media/libaom/src/av1/common/warped_motion.c',
+    '../../media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '../../media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '../../media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '../../media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '../../media/libaom/src/av1/common/x86/cfl_avx2.c',
+    '../../media/libaom/src/av1/common/x86/cfl_sse2.c',
+    '../../media/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '../../media/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '../../media/libaom/src/av1/common/x86/convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/convolve_sse2.c',
+    '../../media/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '../../media/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '../../media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '../../media/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '../../media/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '../../media/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '../../media/libaom/src/av1/common/x86/warp_plane_avx2.c',
+    '../../media/libaom/src/av1/common/x86/warp_plane_sse2.c',
+    '../../media/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '../../media/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '../../media/libaom/src/av1/decoder/decodeframe.c',
+    '../../media/libaom/src/av1/decoder/decodemv.c',
+    '../../media/libaom/src/av1/decoder/decoder.c',
+    '../../media/libaom/src/av1/decoder/decodetxb.c',
+    '../../media/libaom/src/av1/decoder/detokenize.c',
+    '../../media/libaom/src/av1/decoder/obu.c',
   ],
   'X64_EXPORTS': [
-    '../../third_party/aom/aom/aom.h',
-    '../../third_party/aom/aom/aom_codec.h',
-    '../../third_party/aom/aom/aom_decoder.h',
-    '../../third_party/aom/aom/aom_encoder.h',
-    '../../third_party/aom/aom/aom_frame_buffer.h',
-    '../../third_party/aom/aom/aom_image.h',
-    '../../third_party/aom/aom/aom_integer.h',
-    '../../third_party/aom/aom/aomcx.h',
-    '../../third_party/aom/aom/aomdx.h',
-    '../../third_party/aom/aom_mem/aom_mem.h',
-    '../../third_party/aom/aom_ports/aom_timer.h',
-    '../../third_party/aom/aom_ports/bitops.h',
-    '../../third_party/aom/aom_ports/mem.h',
-    '../../third_party/aom/aom_ports/sanitizer.h',
-    '../../third_party/aom/aom_ports/system_state.h',
-    '../../third_party/aom/aom_scale/aom_scale.h',
-    '../../third_party/aom/aom_scale/yv12config.h',
+    '../../media/libaom/src/aom/aom.h',
+    '../../media/libaom/src/aom/aom_codec.h',
+    '../../media/libaom/src/aom/aom_decoder.h',
+    '../../media/libaom/src/aom/aom_encoder.h',
+    '../../media/libaom/src/aom/aom_frame_buffer.h',
+    '../../media/libaom/src/aom/aom_image.h',
+    '../../media/libaom/src/aom/aom_integer.h',
+    '../../media/libaom/src/aom/aomcx.h',
+    '../../media/libaom/src/aom/aomdx.h',
+    '../../media/libaom/src/aom_mem/aom_mem.h',
+    '../../media/libaom/src/aom_ports/aom_timer.h',
+    '../../media/libaom/src/aom_ports/bitops.h',
+    '../../media/libaom/src/aom_ports/mem.h',
+    '../../media/libaom/src/aom_ports/sanitizer.h',
+    '../../media/libaom/src/aom_ports/system_state.h',
+    '../../media/libaom/src/aom_scale/aom_scale.h',
+    '../../media/libaom/src/aom_scale/yv12config.h',
   ],
   'X64_SOURCES': [
-    '../../third_party/aom/aom/src/aom_codec.c',
-    '../../third_party/aom/aom/src/aom_decoder.c',
-    '../../third_party/aom/aom/src/aom_encoder.c',
-    '../../third_party/aom/aom/src/aom_image.c',
-    '../../third_party/aom/aom/src/aom_integer.c',
-    '../../third_party/aom/aom_dsp/aom_convolve.c',
-    '../../third_party/aom/aom_dsp/aom_dsp_rtcd.c',
-    '../../third_party/aom/aom_dsp/avg.c',
-    '../../third_party/aom/aom_dsp/binary_codes_reader.c',
-    '../../third_party/aom/aom_dsp/bitreader_buffer.c',
-    '../../third_party/aom/aom_dsp/bitwriter_buffer.c',
-    '../../third_party/aom/aom_dsp/blend_a64_hmask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_mask.c',
-    '../../third_party/aom/aom_dsp/blend_a64_vmask.c',
-    '../../third_party/aom/aom_dsp/daalaboolreader.c',
-    '../../third_party/aom/aom_dsp/entcode.c',
-    '../../third_party/aom/aom_dsp/entdec.c',
-    '../../third_party/aom/aom_dsp/fft.c',
-    '../../third_party/aom/aom_dsp/grain_synthesis.c',
-    '../../third_party/aom/aom_dsp/intrapred.c',
-    '../../third_party/aom/aom_dsp/loopfilter.c',
-    '../../third_party/aom/aom_dsp/subtract.c',
-    '../../third_party/aom/aom_dsp/x86/aom_asm_stubs.c',
-    '../../third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
-    '../../third_party/aom/aom_dsp/x86/avg_intrin_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/avg_intrin_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c',
-    '../../third_party/aom/aom_dsp/x86/fft_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/fft_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_asm_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/intrapred_avx2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_sse2.c',
-    '../../third_party/aom/aom_dsp/x86/intrapred_ssse3.c',
-    '../../third_party/aom/aom_dsp/x86/inv_wht_sse2.asm',
-    '../../third_party/aom/aom_dsp/x86/loopfilter_sse2.c',
-    '../../third_party/aom/aom_mem/aom_mem.c',
-    '../../third_party/aom/aom_ports/emms.asm',
-    '../../third_party/aom/aom_scale/aom_scale_rtcd.c',
-    '../../third_party/aom/aom_scale/generic/aom_scale.c',
-    '../../third_party/aom/aom_scale/generic/gen_scalers.c',
-    '../../third_party/aom/aom_scale/generic/yv12config.c',
-    '../../third_party/aom/aom_scale/generic/yv12extend.c',
-    '../../third_party/aom/aom_util/aom_thread.c',
-    '../../third_party/aom/aom_util/debug_util.c',
-    '../../third_party/aom/av1/av1_dx_iface.c',
-    '../../third_party/aom/av1/common/alloccommon.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm1d.c',
-    '../../third_party/aom/av1/common/av1_inv_txfm2d.c',
-    '../../third_party/aom/av1/common/av1_loopfilter.c',
-    '../../third_party/aom/av1/common/av1_rtcd.c',
-    '../../third_party/aom/av1/common/av1_txfm.c',
-    '../../third_party/aom/av1/common/blockd.c',
-    '../../third_party/aom/av1/common/cdef.c',
-    '../../third_party/aom/av1/common/cdef_block.c',
-    '../../third_party/aom/av1/common/cdef_block_avx2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse2.c',
-    '../../third_party/aom/av1/common/cdef_block_sse4.c',
-    '../../third_party/aom/av1/common/cdef_block_ssse3.c',
-    '../../third_party/aom/av1/common/cfl.c',
-    '../../third_party/aom/av1/common/convolve.c',
-    '../../third_party/aom/av1/common/debugmodes.c',
-    '../../third_party/aom/av1/common/entropy.c',
-    '../../third_party/aom/av1/common/entropymode.c',
-    '../../third_party/aom/av1/common/entropymv.c',
-    '../../third_party/aom/av1/common/frame_buffers.c',
-    '../../third_party/aom/av1/common/idct.c',
-    '../../third_party/aom/av1/common/mvref_common.c',
-    '../../third_party/aom/av1/common/obu_util.c',
-    '../../third_party/aom/av1/common/odintrin.c',
-    '../../third_party/aom/av1/common/pred_common.c',
-    '../../third_party/aom/av1/common/quant_common.c',
-    '../../third_party/aom/av1/common/reconinter.c',
-    '../../third_party/aom/av1/common/reconintra.c',
-    '../../third_party/aom/av1/common/resize.c',
-    '../../third_party/aom/av1/common/restoration.c',
-    '../../third_party/aom/av1/common/scale.c',
-    '../../third_party/aom/av1/common/scan.c',
-    '../../third_party/aom/av1/common/seg_common.c',
-    '../../third_party/aom/av1/common/thread_common.c',
-    '../../third_party/aom/av1/common/tile_common.c',
-    '../../third_party/aom/av1/common/timing.c',
-    '../../third_party/aom/av1/common/txb_common.c',
-    '../../third_party/aom/av1/common/warped_motion.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c',
-    '../../third_party/aom/av1/common/x86/av1_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/cfl_avx2.c',
-    '../../third_party/aom/av1/common/x86/cfl_sse2.c',
-    '../../third_party/aom/av1/common/x86/cfl_ssse3.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/filterintra_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/intra_edge_sse4.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_sse2.c',
-    '../../third_party/aom/av1/common/x86/jnt_convolve_ssse3.c',
-    '../../third_party/aom/av1/common/x86/reconinter_avx2.c',
-    '../../third_party/aom/av1/common/x86/reconinter_sse4.c',
-    '../../third_party/aom/av1/common/x86/reconinter_ssse3.c',
-    '../../third_party/aom/av1/common/x86/selfguided_avx2.c',
-    '../../third_party/aom/av1/common/x86/selfguided_sse4.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_avx2.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse2.c',
-    '../../third_party/aom/av1/common/x86/warp_plane_sse4.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_avx2.c',
-    '../../third_party/aom/av1/common/x86/wiener_convolve_sse2.c',
-    '../../third_party/aom/av1/decoder/decodeframe.c',
-    '../../third_party/aom/av1/decoder/decodemv.c',
-    '../../third_party/aom/av1/decoder/decoder.c',
-    '../../third_party/aom/av1/decoder/decodetxb.c',
-    '../../third_party/aom/av1/decoder/detokenize.c',
-    '../../third_party/aom/av1/decoder/obu.c',
+    '../../media/libaom/src/aom/src/aom_codec.c',
+    '../../media/libaom/src/aom/src/aom_decoder.c',
+    '../../media/libaom/src/aom/src/aom_encoder.c',
+    '../../media/libaom/src/aom/src/aom_image.c',
+    '../../media/libaom/src/aom/src/aom_integer.c',
+    '../../media/libaom/src/aom_dsp/aom_convolve.c',
+    '../../media/libaom/src/aom_dsp/aom_dsp_rtcd.c',
+    '../../media/libaom/src/aom_dsp/avg.c',
+    '../../media/libaom/src/aom_dsp/binary_codes_reader.c',
+    '../../media/libaom/src/aom_dsp/bitreader_buffer.c',
+    '../../media/libaom/src/aom_dsp/bitwriter_buffer.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_hmask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_mask.c',
+    '../../media/libaom/src/aom_dsp/blend_a64_vmask.c',
+    '../../media/libaom/src/aom_dsp/daalaboolreader.c',
+    '../../media/libaom/src/aom_dsp/entcode.c',
+    '../../media/libaom/src/aom_dsp/entdec.c',
+    '../../media/libaom/src/aom_dsp/fft.c',
+    '../../media/libaom/src/aom_dsp/grain_synthesis.c',
+    '../../media/libaom/src/aom_dsp/intrapred.c',
+    '../../media/libaom/src/aom_dsp/loopfilter.c',
+    '../../media/libaom/src/aom_dsp/subtract.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_asm_stubs.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm',
+    '../../media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c',
+    '../../media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c',
+    '../../media/libaom/src/aom_dsp/x86/fft_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/fft_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_avx2.c',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_sse2.c',
+    '../../media/libaom/src/aom_dsp/x86/intrapred_ssse3.c',
+    '../../media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm',
+    '../../media/libaom/src/aom_dsp/x86/loopfilter_sse2.c',
+    '../../media/libaom/src/aom_mem/aom_mem.c',
+    '../../media/libaom/src/aom_ports/emms.asm',
+    '../../media/libaom/src/aom_scale/aom_scale_rtcd.c',
+    '../../media/libaom/src/aom_scale/generic/aom_scale.c',
+    '../../media/libaom/src/aom_scale/generic/gen_scalers.c',
+    '../../media/libaom/src/aom_scale/generic/yv12config.c',
+    '../../media/libaom/src/aom_scale/generic/yv12extend.c',
+    '../../media/libaom/src/aom_util/aom_thread.c',
+    '../../media/libaom/src/aom_util/debug_util.c',
+    '../../media/libaom/src/av1/av1_dx_iface.c',
+    '../../media/libaom/src/av1/common/alloccommon.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm1d.c',
+    '../../media/libaom/src/av1/common/av1_inv_txfm2d.c',
+    '../../media/libaom/src/av1/common/av1_loopfilter.c',
+    '../../media/libaom/src/av1/common/av1_rtcd.c',
+    '../../media/libaom/src/av1/common/av1_txfm.c',
+    '../../media/libaom/src/av1/common/blockd.c',
+    '../../media/libaom/src/av1/common/cdef.c',
+    '../../media/libaom/src/av1/common/cdef_block.c',
+    '../../media/libaom/src/av1/common/cdef_block_avx2.c',
+    '../../media/libaom/src/av1/common/cdef_block_sse2.c',
+    '../../media/libaom/src/av1/common/cdef_block_sse4.c',
+    '../../media/libaom/src/av1/common/cdef_block_ssse3.c',
+    '../../media/libaom/src/av1/common/cfl.c',
+    '../../media/libaom/src/av1/common/convolve.c',
+    '../../media/libaom/src/av1/common/debugmodes.c',
+    '../../media/libaom/src/av1/common/entropy.c',
+    '../../media/libaom/src/av1/common/entropymode.c',
+    '../../media/libaom/src/av1/common/entropymv.c',
+    '../../media/libaom/src/av1/common/frame_buffers.c',
+    '../../media/libaom/src/av1/common/idct.c',
+    '../../media/libaom/src/av1/common/mvref_common.c',
+    '../../media/libaom/src/av1/common/obu_util.c',
+    '../../media/libaom/src/av1/common/odintrin.c',
+    '../../media/libaom/src/av1/common/pred_common.c',
+    '../../media/libaom/src/av1/common/quant_common.c',
+    '../../media/libaom/src/av1/common/reconinter.c',
+    '../../media/libaom/src/av1/common/reconintra.c',
+    '../../media/libaom/src/av1/common/resize.c',
+    '../../media/libaom/src/av1/common/restoration.c',
+    '../../media/libaom/src/av1/common/scale.c',
+    '../../media/libaom/src/av1/common/scan.c',
+    '../../media/libaom/src/av1/common/seg_common.c',
+    '../../media/libaom/src/av1/common/thread_common.c',
+    '../../media/libaom/src/av1/common/tile_common.c',
+    '../../media/libaom/src/av1/common/timing.c',
+    '../../media/libaom/src/av1/common/txb_common.c',
+    '../../media/libaom/src/av1/common/warped_motion.c',
+    '../../media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c',
+    '../../media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c',
+    '../../media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c',
+    '../../media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/av1_txfm_sse4.c',
+    '../../media/libaom/src/av1/common/x86/cfl_avx2.c',
+    '../../media/libaom/src/av1/common/x86/cfl_sse2.c',
+    '../../media/libaom/src/av1/common/x86/cfl_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/convolve_2d_avx2.c',
+    '../../media/libaom/src/av1/common/x86/convolve_2d_sse2.c',
+    '../../media/libaom/src/av1/common/x86/convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/convolve_sse2.c',
+    '../../media/libaom/src/av1/common/x86/filterintra_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c',
+    '../../media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/intra_edge_sse4.c',
+    '../../media/libaom/src/av1/common/x86/jnt_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/jnt_convolve_sse2.c',
+    '../../media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/reconinter_avx2.c',
+    '../../media/libaom/src/av1/common/x86/reconinter_sse4.c',
+    '../../media/libaom/src/av1/common/x86/reconinter_ssse3.c',
+    '../../media/libaom/src/av1/common/x86/selfguided_avx2.c',
+    '../../media/libaom/src/av1/common/x86/selfguided_sse4.c',
+    '../../media/libaom/src/av1/common/x86/warp_plane_avx2.c',
+    '../../media/libaom/src/av1/common/x86/warp_plane_sse2.c',
+    '../../media/libaom/src/av1/common/x86/warp_plane_sse4.c',
+    '../../media/libaom/src/av1/common/x86/wiener_convolve_avx2.c',
+    '../../media/libaom/src/av1/common/x86/wiener_convolve_sse2.c',
+    '../../media/libaom/src/av1/decoder/decodeframe.c',
+    '../../media/libaom/src/av1/decoder/decodemv.c',
+    '../../media/libaom/src/av1/decoder/decoder.c',
+    '../../media/libaom/src/av1/decoder/decodetxb.c',
+    '../../media/libaom/src/av1/decoder/detokenize.c',
+    '../../media/libaom/src/av1/decoder/obu.c',
   ],
 }
diff --git a/third_party/aom/.clang-format b/media/libaom/src/.clang-format
similarity index 100%
rename from third_party/aom/.clang-format
rename to media/libaom/src/.clang-format
diff --git a/third_party/aom/.cmake-format.py b/media/libaom/src/.cmake-format.py
similarity index 100%
rename from third_party/aom/.cmake-format.py
rename to media/libaom/src/.cmake-format.py
diff --git a/third_party/aom/.mailmap b/media/libaom/src/.mailmap
similarity index 100%
rename from third_party/aom/.mailmap
rename to media/libaom/src/.mailmap
diff --git a/third_party/aom/AUTHORS b/media/libaom/src/AUTHORS
similarity index 100%
rename from third_party/aom/AUTHORS
rename to media/libaom/src/AUTHORS
diff --git a/third_party/aom/CHANGELOG b/media/libaom/src/CHANGELOG
similarity index 100%
rename from third_party/aom/CHANGELOG
rename to media/libaom/src/CHANGELOG
diff --git a/third_party/aom/CMakeLists.txt b/media/libaom/src/CMakeLists.txt
similarity index 100%
rename from third_party/aom/CMakeLists.txt
rename to media/libaom/src/CMakeLists.txt
diff --git a/third_party/aom/LICENSE b/media/libaom/src/LICENSE
similarity index 100%
rename from third_party/aom/LICENSE
rename to media/libaom/src/LICENSE
diff --git a/third_party/aom/PATENTS b/media/libaom/src/PATENTS
similarity index 100%
rename from third_party/aom/PATENTS
rename to media/libaom/src/PATENTS
diff --git a/third_party/aom/README.md b/media/libaom/src/README.md
similarity index 100%
rename from third_party/aom/README.md
rename to media/libaom/src/README.md
diff --git a/third_party/aom/aom/aom.h b/media/libaom/src/aom/aom.h
similarity index 100%
rename from third_party/aom/aom/aom.h
rename to media/libaom/src/aom/aom.h
diff --git a/third_party/aom/aom/aom_codec.h b/media/libaom/src/aom/aom_codec.h
similarity index 100%
rename from third_party/aom/aom/aom_codec.h
rename to media/libaom/src/aom/aom_codec.h
diff --git a/third_party/aom/aom/aom_decoder.h b/media/libaom/src/aom/aom_decoder.h
similarity index 100%
rename from third_party/aom/aom/aom_decoder.h
rename to media/libaom/src/aom/aom_decoder.h
diff --git a/third_party/aom/aom/aom_encoder.h b/media/libaom/src/aom/aom_encoder.h
similarity index 100%
rename from third_party/aom/aom/aom_encoder.h
rename to media/libaom/src/aom/aom_encoder.h
diff --git a/third_party/aom/aom/aom_frame_buffer.h b/media/libaom/src/aom/aom_frame_buffer.h
similarity index 100%
rename from third_party/aom/aom/aom_frame_buffer.h
rename to media/libaom/src/aom/aom_frame_buffer.h
diff --git a/third_party/aom/aom/aom_image.h b/media/libaom/src/aom/aom_image.h
similarity index 100%
rename from third_party/aom/aom/aom_image.h
rename to media/libaom/src/aom/aom_image.h
diff --git a/third_party/aom/aom/aom_integer.h b/media/libaom/src/aom/aom_integer.h
similarity index 100%
rename from third_party/aom/aom/aom_integer.h
rename to media/libaom/src/aom/aom_integer.h
diff --git a/third_party/aom/aom/aomcx.h b/media/libaom/src/aom/aomcx.h
similarity index 100%
rename from third_party/aom/aom/aomcx.h
rename to media/libaom/src/aom/aomcx.h
diff --git a/third_party/aom/aom/aomdx.h b/media/libaom/src/aom/aomdx.h
similarity index 100%
rename from third_party/aom/aom/aomdx.h
rename to media/libaom/src/aom/aomdx.h
diff --git a/third_party/aom/aom/exports_com b/media/libaom/src/aom/exports_com
similarity index 100%
rename from third_party/aom/aom/exports_com
rename to media/libaom/src/aom/exports_com
diff --git a/third_party/aom/aom/exports_dec b/media/libaom/src/aom/exports_dec
similarity index 100%
rename from third_party/aom/aom/exports_dec
rename to media/libaom/src/aom/exports_dec
diff --git a/third_party/aom/aom/exports_enc b/media/libaom/src/aom/exports_enc
similarity index 100%
rename from third_party/aom/aom/exports_enc
rename to media/libaom/src/aom/exports_enc
diff --git a/third_party/aom/aom/exports_test b/media/libaom/src/aom/exports_test
similarity index 100%
rename from third_party/aom/aom/exports_test
rename to media/libaom/src/aom/exports_test
diff --git a/third_party/aom/aom/internal/aom_codec_internal.h b/media/libaom/src/aom/internal/aom_codec_internal.h
similarity index 100%
rename from third_party/aom/aom/internal/aom_codec_internal.h
rename to media/libaom/src/aom/internal/aom_codec_internal.h
diff --git a/third_party/aom/aom/internal/aom_image_internal.h b/media/libaom/src/aom/internal/aom_image_internal.h
similarity index 100%
rename from third_party/aom/aom/internal/aom_image_internal.h
rename to media/libaom/src/aom/internal/aom_image_internal.h
diff --git a/third_party/aom/aom/src/aom_codec.c b/media/libaom/src/aom/src/aom_codec.c
similarity index 100%
rename from third_party/aom/aom/src/aom_codec.c
rename to media/libaom/src/aom/src/aom_codec.c
diff --git a/third_party/aom/aom/src/aom_decoder.c b/media/libaom/src/aom/src/aom_decoder.c
similarity index 100%
rename from third_party/aom/aom/src/aom_decoder.c
rename to media/libaom/src/aom/src/aom_decoder.c
diff --git a/third_party/aom/aom/src/aom_encoder.c b/media/libaom/src/aom/src/aom_encoder.c
similarity index 100%
rename from third_party/aom/aom/src/aom_encoder.c
rename to media/libaom/src/aom/src/aom_encoder.c
diff --git a/third_party/aom/aom/src/aom_image.c b/media/libaom/src/aom/src/aom_image.c
similarity index 100%
rename from third_party/aom/aom/src/aom_image.c
rename to media/libaom/src/aom/src/aom_image.c
diff --git a/third_party/aom/aom/src/aom_integer.c b/media/libaom/src/aom/src/aom_integer.c
similarity index 100%
rename from third_party/aom/aom/src/aom_integer.c
rename to media/libaom/src/aom/src/aom_integer.c
diff --git a/third_party/aom/aom_dsp/add_noise.c b/media/libaom/src/aom_dsp/add_noise.c
similarity index 100%
rename from third_party/aom/aom_dsp/add_noise.c
rename to media/libaom/src/aom_dsp/add_noise.c
diff --git a/third_party/aom/aom_dsp/aom_convolve.c b/media/libaom/src/aom_dsp/aom_convolve.c
similarity index 100%
rename from third_party/aom/aom_dsp/aom_convolve.c
rename to media/libaom/src/aom_dsp/aom_convolve.c
diff --git a/third_party/aom/aom_dsp/aom_dsp.cmake b/media/libaom/src/aom_dsp/aom_dsp.cmake
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp.cmake
rename to media/libaom/src/aom_dsp/aom_dsp.cmake
diff --git a/third_party/aom/aom_dsp/aom_dsp_common.h b/media/libaom/src/aom_dsp/aom_dsp_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp_common.h
rename to media/libaom/src/aom_dsp/aom_dsp_common.h
diff --git a/third_party/aom/aom_dsp/aom_dsp_rtcd.c b/media/libaom/src/aom_dsp/aom_dsp_rtcd.c
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp_rtcd.c
rename to media/libaom/src/aom_dsp/aom_dsp_rtcd.c
diff --git a/third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl b/media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/aom_dsp/aom_dsp_rtcd_defs.pl
rename to media/libaom/src/aom_dsp/aom_dsp_rtcd_defs.pl
diff --git a/third_party/aom/aom_dsp/aom_filter.h b/media/libaom/src/aom_dsp/aom_filter.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_filter.h
rename to media/libaom/src/aom_dsp/aom_filter.h
diff --git a/third_party/aom/aom_dsp/aom_simd.h b/media/libaom/src/aom_dsp/aom_simd.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_simd.h
rename to media/libaom/src/aom_dsp/aom_simd.h
diff --git a/third_party/aom/aom_dsp/aom_simd_inline.h b/media/libaom/src/aom_dsp/aom_simd_inline.h
similarity index 100%
rename from third_party/aom/aom_dsp/aom_simd_inline.h
rename to media/libaom/src/aom_dsp/aom_simd_inline.h
diff --git a/third_party/aom/aom_dsp/arm/avg_neon.c b/media/libaom/src/aom_dsp/arm/avg_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/avg_neon.c
rename to media/libaom/src/aom_dsp/arm/avg_neon.c
diff --git a/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c b/media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c
rename to media/libaom/src/aom_dsp/arm/blend_a64_mask_neon.c
diff --git a/third_party/aom/aom_dsp/arm/fwd_txfm_neon.c b/media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/fwd_txfm_neon.c
rename to media/libaom/src/aom_dsp/arm/fwd_txfm_neon.c
diff --git a/third_party/aom/aom_dsp/arm/hadamard_neon.c b/media/libaom/src/aom_dsp/arm/hadamard_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/hadamard_neon.c
rename to media/libaom/src/aom_dsp/arm/hadamard_neon.c
diff --git a/third_party/aom/aom_dsp/arm/intrapred_neon.c b/media/libaom/src/aom_dsp/arm/intrapred_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/intrapred_neon.c
rename to media/libaom/src/aom_dsp/arm/intrapred_neon.c
diff --git a/third_party/aom/aom_dsp/arm/loopfilter_neon.c b/media/libaom/src/aom_dsp/arm/loopfilter_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/loopfilter_neon.c
rename to media/libaom/src/aom_dsp/arm/loopfilter_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sad4d_neon.c b/media/libaom/src/aom_dsp/arm/sad4d_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/sad4d_neon.c
rename to media/libaom/src/aom_dsp/arm/sad4d_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sad_neon.c b/media/libaom/src/aom_dsp/arm/sad_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/sad_neon.c
rename to media/libaom/src/aom_dsp/arm/sad_neon.c
diff --git a/third_party/aom/aom_dsp/arm/subpel_variance_neon.c b/media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/subpel_variance_neon.c
rename to media/libaom/src/aom_dsp/arm/subpel_variance_neon.c
diff --git a/third_party/aom/aom_dsp/arm/subtract_neon.c b/media/libaom/src/aom_dsp/arm/subtract_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/subtract_neon.c
rename to media/libaom/src/aom_dsp/arm/subtract_neon.c
diff --git a/third_party/aom/aom_dsp/arm/sum_neon.h b/media/libaom/src/aom_dsp/arm/sum_neon.h
similarity index 100%
rename from third_party/aom/aom_dsp/arm/sum_neon.h
rename to media/libaom/src/aom_dsp/arm/sum_neon.h
diff --git a/third_party/aom/aom_dsp/arm/variance_neon.c b/media/libaom/src/aom_dsp/arm/variance_neon.c
similarity index 100%
rename from third_party/aom/aom_dsp/arm/variance_neon.c
rename to media/libaom/src/aom_dsp/arm/variance_neon.c
diff --git a/third_party/aom/aom_dsp/avg.c b/media/libaom/src/aom_dsp/avg.c
similarity index 100%
rename from third_party/aom/aom_dsp/avg.c
rename to media/libaom/src/aom_dsp/avg.c
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.c b/media/libaom/src/aom_dsp/binary_codes_reader.c
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_reader.c
rename to media/libaom/src/aom_dsp/binary_codes_reader.c
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.h b/media/libaom/src/aom_dsp/binary_codes_reader.h
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_reader.h
rename to media/libaom/src/aom_dsp/binary_codes_reader.h
diff --git a/third_party/aom/aom_dsp/binary_codes_writer.c b/media/libaom/src/aom_dsp/binary_codes_writer.c
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_writer.c
rename to media/libaom/src/aom_dsp/binary_codes_writer.c
diff --git a/third_party/aom/aom_dsp/binary_codes_writer.h b/media/libaom/src/aom_dsp/binary_codes_writer.h
similarity index 100%
rename from third_party/aom/aom_dsp/binary_codes_writer.h
rename to media/libaom/src/aom_dsp/binary_codes_writer.h
diff --git a/third_party/aom/aom_dsp/bitreader.h b/media/libaom/src/aom_dsp/bitreader.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitreader.h
rename to media/libaom/src/aom_dsp/bitreader.h
diff --git a/third_party/aom/aom_dsp/bitreader_buffer.c b/media/libaom/src/aom_dsp/bitreader_buffer.c
similarity index 100%
rename from third_party/aom/aom_dsp/bitreader_buffer.c
rename to media/libaom/src/aom_dsp/bitreader_buffer.c
diff --git a/third_party/aom/aom_dsp/bitreader_buffer.h b/media/libaom/src/aom_dsp/bitreader_buffer.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitreader_buffer.h
rename to media/libaom/src/aom_dsp/bitreader_buffer.h
diff --git a/third_party/aom/aom_dsp/bitwriter.h b/media/libaom/src/aom_dsp/bitwriter.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitwriter.h
rename to media/libaom/src/aom_dsp/bitwriter.h
diff --git a/third_party/aom/aom_dsp/bitwriter_buffer.c b/media/libaom/src/aom_dsp/bitwriter_buffer.c
similarity index 100%
rename from third_party/aom/aom_dsp/bitwriter_buffer.c
rename to media/libaom/src/aom_dsp/bitwriter_buffer.c
diff --git a/third_party/aom/aom_dsp/bitwriter_buffer.h b/media/libaom/src/aom_dsp/bitwriter_buffer.h
similarity index 100%
rename from third_party/aom/aom_dsp/bitwriter_buffer.h
rename to media/libaom/src/aom_dsp/bitwriter_buffer.h
diff --git a/third_party/aom/aom_dsp/blend.h b/media/libaom/src/aom_dsp/blend.h
similarity index 100%
rename from third_party/aom/aom_dsp/blend.h
rename to media/libaom/src/aom_dsp/blend.h
diff --git a/third_party/aom/aom_dsp/blend_a64_hmask.c b/media/libaom/src/aom_dsp/blend_a64_hmask.c
similarity index 100%
rename from third_party/aom/aom_dsp/blend_a64_hmask.c
rename to media/libaom/src/aom_dsp/blend_a64_hmask.c
diff --git a/third_party/aom/aom_dsp/blend_a64_mask.c b/media/libaom/src/aom_dsp/blend_a64_mask.c
similarity index 100%
rename from third_party/aom/aom_dsp/blend_a64_mask.c
rename to media/libaom/src/aom_dsp/blend_a64_mask.c
diff --git a/third_party/aom/aom_dsp/blend_a64_vmask.c b/media/libaom/src/aom_dsp/blend_a64_vmask.c
similarity index 100%
rename from third_party/aom/aom_dsp/blend_a64_vmask.c
rename to media/libaom/src/aom_dsp/blend_a64_vmask.c
diff --git a/third_party/aom/aom_dsp/blk_sse_sum.c b/media/libaom/src/aom_dsp/blk_sse_sum.c
similarity index 100%
rename from third_party/aom/aom_dsp/blk_sse_sum.c
rename to media/libaom/src/aom_dsp/blk_sse_sum.c
diff --git a/third_party/aom/aom_dsp/buf_ans.c b/media/libaom/src/aom_dsp/buf_ans.c
similarity index 100%
rename from third_party/aom/aom_dsp/buf_ans.c
rename to media/libaom/src/aom_dsp/buf_ans.c
diff --git a/third_party/aom/aom_dsp/buf_ans.h b/media/libaom/src/aom_dsp/buf_ans.h
similarity index 100%
rename from third_party/aom/aom_dsp/buf_ans.h
rename to media/libaom/src/aom_dsp/buf_ans.h
diff --git a/third_party/aom/aom_dsp/daalaboolreader.c b/media/libaom/src/aom_dsp/daalaboolreader.c
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolreader.c
rename to media/libaom/src/aom_dsp/daalaboolreader.c
diff --git a/third_party/aom/aom_dsp/daalaboolreader.h b/media/libaom/src/aom_dsp/daalaboolreader.h
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolreader.h
rename to media/libaom/src/aom_dsp/daalaboolreader.h
diff --git a/third_party/aom/aom_dsp/daalaboolwriter.c b/media/libaom/src/aom_dsp/daalaboolwriter.c
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolwriter.c
rename to media/libaom/src/aom_dsp/daalaboolwriter.c
diff --git a/third_party/aom/aom_dsp/daalaboolwriter.h b/media/libaom/src/aom_dsp/daalaboolwriter.h
similarity index 100%
rename from third_party/aom/aom_dsp/daalaboolwriter.h
rename to media/libaom/src/aom_dsp/daalaboolwriter.h
diff --git a/third_party/aom/aom_dsp/entcode.c b/media/libaom/src/aom_dsp/entcode.c
similarity index 100%
rename from third_party/aom/aom_dsp/entcode.c
rename to media/libaom/src/aom_dsp/entcode.c
diff --git a/third_party/aom/aom_dsp/entcode.h b/media/libaom/src/aom_dsp/entcode.h
similarity index 100%
rename from third_party/aom/aom_dsp/entcode.h
rename to media/libaom/src/aom_dsp/entcode.h
diff --git a/third_party/aom/aom_dsp/entdec.c b/media/libaom/src/aom_dsp/entdec.c
similarity index 100%
rename from third_party/aom/aom_dsp/entdec.c
rename to media/libaom/src/aom_dsp/entdec.c
diff --git a/third_party/aom/aom_dsp/entdec.h b/media/libaom/src/aom_dsp/entdec.h
similarity index 100%
rename from third_party/aom/aom_dsp/entdec.h
rename to media/libaom/src/aom_dsp/entdec.h
diff --git a/third_party/aom/aom_dsp/entenc.c b/media/libaom/src/aom_dsp/entenc.c
similarity index 100%
rename from third_party/aom/aom_dsp/entenc.c
rename to media/libaom/src/aom_dsp/entenc.c
diff --git a/third_party/aom/aom_dsp/entenc.h b/media/libaom/src/aom_dsp/entenc.h
similarity index 100%
rename from third_party/aom/aom_dsp/entenc.h
rename to media/libaom/src/aom_dsp/entenc.h
diff --git a/third_party/aom/aom_dsp/fastssim.c b/media/libaom/src/aom_dsp/fastssim.c
similarity index 100%
rename from third_party/aom/aom_dsp/fastssim.c
rename to media/libaom/src/aom_dsp/fastssim.c
diff --git a/third_party/aom/aom_dsp/fft.c b/media/libaom/src/aom_dsp/fft.c
similarity index 100%
rename from third_party/aom/aom_dsp/fft.c
rename to media/libaom/src/aom_dsp/fft.c
diff --git a/third_party/aom/aom_dsp/fft_common.h b/media/libaom/src/aom_dsp/fft_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/fft_common.h
rename to media/libaom/src/aom_dsp/fft_common.h
diff --git a/third_party/aom/aom_dsp/fwd_txfm.c b/media/libaom/src/aom_dsp/fwd_txfm.c
similarity index 100%
rename from third_party/aom/aom_dsp/fwd_txfm.c
rename to media/libaom/src/aom_dsp/fwd_txfm.c
diff --git a/third_party/aom/aom_dsp/grain_synthesis.c b/media/libaom/src/aom_dsp/grain_synthesis.c
similarity index 100%
rename from third_party/aom/aom_dsp/grain_synthesis.c
rename to media/libaom/src/aom_dsp/grain_synthesis.c
diff --git a/third_party/aom/aom_dsp/grain_synthesis.h b/media/libaom/src/aom_dsp/grain_synthesis.h
similarity index 100%
rename from third_party/aom/aom_dsp/grain_synthesis.h
rename to media/libaom/src/aom_dsp/grain_synthesis.h
diff --git a/third_party/aom/aom_dsp/grain_table.c b/media/libaom/src/aom_dsp/grain_table.c
similarity index 100%
rename from third_party/aom/aom_dsp/grain_table.c
rename to media/libaom/src/aom_dsp/grain_table.c
diff --git a/third_party/aom/aom_dsp/grain_table.h b/media/libaom/src/aom_dsp/grain_table.h
similarity index 100%
rename from third_party/aom/aom_dsp/grain_table.h
rename to media/libaom/src/aom_dsp/grain_table.h
diff --git a/third_party/aom/aom_dsp/intrapred.c b/media/libaom/src/aom_dsp/intrapred.c
similarity index 100%
rename from third_party/aom/aom_dsp/intrapred.c
rename to media/libaom/src/aom_dsp/intrapred.c
diff --git a/third_party/aom/aom_dsp/intrapred_common.h b/media/libaom/src/aom_dsp/intrapred_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/intrapred_common.h
rename to media/libaom/src/aom_dsp/intrapred_common.h
diff --git a/third_party/aom/aom_dsp/loopfilter.c b/media/libaom/src/aom_dsp/loopfilter.c
similarity index 100%
rename from third_party/aom/aom_dsp/loopfilter.c
rename to media/libaom/src/aom_dsp/loopfilter.c
diff --git a/third_party/aom/aom_dsp/mips/add_noise_msa.c b/media/libaom/src/aom_dsp/mips/add_noise_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/add_noise_msa.c
rename to media/libaom/src/aom_dsp/mips/add_noise_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve8_horiz_msa.c
rename to media/libaom/src/aom_dsp/mips/aom_convolve8_horiz_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve8_vert_msa.c
rename to media/libaom/src/aom_dsp/mips/aom_convolve8_vert_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c b/media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve_copy_msa.c
rename to media/libaom/src/aom_dsp/mips/aom_convolve_copy_msa.c
diff --git a/third_party/aom/aom_dsp/mips/aom_convolve_msa.h b/media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/aom_convolve_msa.h
rename to media/libaom/src/aom_dsp/mips/aom_convolve_msa.h
diff --git a/third_party/aom/aom_dsp/mips/common_dspr2.c b/media/libaom/src/aom_dsp/mips/common_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/common_dspr2.c
rename to media/libaom/src/aom_dsp/mips/common_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/common_dspr2.h b/media/libaom/src/aom_dsp/mips/common_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/common_dspr2.h
rename to media/libaom/src/aom_dsp/mips/common_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/convolve2_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve2_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve2_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve2_horiz_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve2_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve2_vert_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve2_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve8_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve8_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve8_horiz_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve8_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve8_vert_dspr2.c
rename to media/libaom/src/aom_dsp/mips/convolve8_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/convolve_common_dspr2.h b/media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/convolve_common_dspr2.h
rename to media/libaom/src/aom_dsp/mips/convolve_common_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/intrapred16_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred16_dspr2.c
rename to media/libaom/src/aom_dsp/mips/intrapred16_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred4_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred4_dspr2.c
rename to media/libaom/src/aom_dsp/mips/intrapred4_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred8_dspr2.c b/media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred8_dspr2.c
rename to media/libaom/src/aom_dsp/mips/intrapred8_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/intrapred_msa.c b/media/libaom/src/aom_dsp/mips/intrapred_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/intrapred_msa.c
rename to media/libaom/src/aom_dsp/mips/intrapred_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_16_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_16_msa.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_16_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_4_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_4_msa.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_4_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_8_msa.c b/media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_8_msa.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_8_msa.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_filters_dspr2.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_filters_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_macros_dspr2.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_macros_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h b/media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_masks_dspr2.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_masks_dspr2.h
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_mb_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_mb_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_mb_horiz_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c b/media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
rename to media/libaom/src/aom_dsp/mips/loopfilter_mb_vert_dspr2.c
diff --git a/third_party/aom/aom_dsp/mips/loopfilter_msa.h b/media/libaom/src/aom_dsp/mips/loopfilter_msa.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/loopfilter_msa.h
rename to media/libaom/src/aom_dsp/mips/loopfilter_msa.h
diff --git a/third_party/aom/aom_dsp/mips/macros_msa.h b/media/libaom/src/aom_dsp/mips/macros_msa.h
similarity index 100%
rename from third_party/aom/aom_dsp/mips/macros_msa.h
rename to media/libaom/src/aom_dsp/mips/macros_msa.h
diff --git a/third_party/aom/aom_dsp/mips/sad_msa.c b/media/libaom/src/aom_dsp/mips/sad_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/sad_msa.c
rename to media/libaom/src/aom_dsp/mips/sad_msa.c
diff --git a/third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c b/media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/sub_pixel_variance_msa.c
rename to media/libaom/src/aom_dsp/mips/sub_pixel_variance_msa.c
diff --git a/third_party/aom/aom_dsp/mips/subtract_msa.c b/media/libaom/src/aom_dsp/mips/subtract_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/subtract_msa.c
rename to media/libaom/src/aom_dsp/mips/subtract_msa.c
diff --git a/third_party/aom/aom_dsp/mips/variance_msa.c b/media/libaom/src/aom_dsp/mips/variance_msa.c
similarity index 100%
rename from third_party/aom/aom_dsp/mips/variance_msa.c
rename to media/libaom/src/aom_dsp/mips/variance_msa.c
diff --git a/third_party/aom/aom_dsp/noise_model.c b/media/libaom/src/aom_dsp/noise_model.c
similarity index 100%
rename from third_party/aom/aom_dsp/noise_model.c
rename to media/libaom/src/aom_dsp/noise_model.c
diff --git a/third_party/aom/aom_dsp/noise_model.h b/media/libaom/src/aom_dsp/noise_model.h
similarity index 100%
rename from third_party/aom/aom_dsp/noise_model.h
rename to media/libaom/src/aom_dsp/noise_model.h
diff --git a/third_party/aom/aom_dsp/noise_util.c b/media/libaom/src/aom_dsp/noise_util.c
similarity index 100%
rename from third_party/aom/aom_dsp/noise_util.c
rename to media/libaom/src/aom_dsp/noise_util.c
diff --git a/third_party/aom/aom_dsp/noise_util.h b/media/libaom/src/aom_dsp/noise_util.h
similarity index 100%
rename from third_party/aom/aom_dsp/noise_util.h
rename to media/libaom/src/aom_dsp/noise_util.h
diff --git a/third_party/aom/aom_dsp/postproc.h b/media/libaom/src/aom_dsp/postproc.h
similarity index 100%
rename from third_party/aom/aom_dsp/postproc.h
rename to media/libaom/src/aom_dsp/postproc.h
diff --git a/third_party/aom/aom_dsp/prob.h b/media/libaom/src/aom_dsp/prob.h
similarity index 100%
rename from third_party/aom/aom_dsp/prob.h
rename to media/libaom/src/aom_dsp/prob.h
diff --git a/third_party/aom/aom_dsp/psnr.c b/media/libaom/src/aom_dsp/psnr.c
similarity index 100%
rename from third_party/aom/aom_dsp/psnr.c
rename to media/libaom/src/aom_dsp/psnr.c
diff --git a/third_party/aom/aom_dsp/psnr.h b/media/libaom/src/aom_dsp/psnr.h
similarity index 100%
rename from third_party/aom/aom_dsp/psnr.h
rename to media/libaom/src/aom_dsp/psnr.h
diff --git a/third_party/aom/aom_dsp/psnrhvs.c b/media/libaom/src/aom_dsp/psnrhvs.c
similarity index 100%
rename from third_party/aom/aom_dsp/psnrhvs.c
rename to media/libaom/src/aom_dsp/psnrhvs.c
diff --git a/third_party/aom/aom_dsp/quantize.c b/media/libaom/src/aom_dsp/quantize.c
similarity index 100%
rename from third_party/aom/aom_dsp/quantize.c
rename to media/libaom/src/aom_dsp/quantize.c
diff --git a/third_party/aom/aom_dsp/quantize.h b/media/libaom/src/aom_dsp/quantize.h
similarity index 100%
rename from third_party/aom/aom_dsp/quantize.h
rename to media/libaom/src/aom_dsp/quantize.h
diff --git a/third_party/aom/aom_dsp/recenter.h b/media/libaom/src/aom_dsp/recenter.h
similarity index 100%
rename from third_party/aom/aom_dsp/recenter.h
rename to media/libaom/src/aom_dsp/recenter.h
diff --git a/third_party/aom/aom_dsp/sad.c b/media/libaom/src/aom_dsp/sad.c
similarity index 100%
rename from third_party/aom/aom_dsp/sad.c
rename to media/libaom/src/aom_dsp/sad.c
diff --git a/third_party/aom/aom_dsp/sad_av1.c b/media/libaom/src/aom_dsp/sad_av1.c
similarity index 100%
rename from third_party/aom/aom_dsp/sad_av1.c
rename to media/libaom/src/aom_dsp/sad_av1.c
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics_arm.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics_c.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v128_intrinsics_x86.h
rename to media/libaom/src/aom_dsp/simd/v128_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_arm.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_c.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_v128.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_v128.h
diff --git a/third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v256_intrinsics_x86.h
rename to media/libaom/src/aom_dsp/simd/v256_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics_arm.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics_arm.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_c.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics_c.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics_c.h
diff --git a/third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h b/media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/simd/v64_intrinsics_x86.h
rename to media/libaom/src/aom_dsp/simd/v64_intrinsics_x86.h
diff --git a/third_party/aom/aom_dsp/sse.c b/media/libaom/src/aom_dsp/sse.c
similarity index 100%
rename from third_party/aom/aom_dsp/sse.c
rename to media/libaom/src/aom_dsp/sse.c
diff --git a/third_party/aom/aom_dsp/ssim.c b/media/libaom/src/aom_dsp/ssim.c
similarity index 100%
rename from third_party/aom/aom_dsp/ssim.c
rename to media/libaom/src/aom_dsp/ssim.c
diff --git a/third_party/aom/aom_dsp/ssim.h b/media/libaom/src/aom_dsp/ssim.h
similarity index 100%
rename from third_party/aom/aom_dsp/ssim.h
rename to media/libaom/src/aom_dsp/ssim.h
diff --git a/third_party/aom/aom_dsp/subtract.c b/media/libaom/src/aom_dsp/subtract.c
similarity index 100%
rename from third_party/aom/aom_dsp/subtract.c
rename to media/libaom/src/aom_dsp/subtract.c
diff --git a/third_party/aom/aom_dsp/sum_squares.c b/media/libaom/src/aom_dsp/sum_squares.c
similarity index 100%
rename from third_party/aom/aom_dsp/sum_squares.c
rename to media/libaom/src/aom_dsp/sum_squares.c
diff --git a/third_party/aom/aom_dsp/txfm_common.h b/media/libaom/src/aom_dsp/txfm_common.h
similarity index 100%
rename from third_party/aom/aom_dsp/txfm_common.h
rename to media/libaom/src/aom_dsp/txfm_common.h
diff --git a/third_party/aom/aom_dsp/variance.c b/media/libaom/src/aom_dsp/variance.c
similarity index 100%
rename from third_party/aom/aom_dsp/variance.c
rename to media/libaom/src/aom_dsp/variance.c
diff --git a/third_party/aom/aom_dsp/variance.h b/media/libaom/src/aom_dsp/variance.h
similarity index 100%
rename from third_party/aom/aom_dsp/variance.h
rename to media/libaom/src/aom_dsp/variance.h
diff --git a/third_party/aom/aom_dsp/x86/adaptive_quantize_avx2.c b/media/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/adaptive_quantize_avx2.c
rename to media/libaom/src/aom_dsp/x86/adaptive_quantize_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/adaptive_quantize_sse2.c b/media/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/adaptive_quantize_sse2.c
rename to media/libaom/src/aom_dsp/x86/adaptive_quantize_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/aom_asm_stubs.c b/media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_asm_stubs.c
rename to media/libaom/src/aom_dsp/x86/aom_asm_stubs.c
diff --git a/third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_convolve_copy_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_convolve_copy_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_high_subpixel_8t_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_high_subpixel_bilinear_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_8t_ssse3.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm b/media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
rename to media/libaom/src/aom_dsp/x86/aom_subpixel_bilinear_ssse3.asm
diff --git a/third_party/aom/aom_dsp/x86/avg_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/avg_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/avg_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/avg_intrin_sse2.c b/media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/avg_intrin_sse2.c
rename to media/libaom/src/aom_dsp/x86/avg_intrin_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/bitdepth_conversion_avx2.h b/media/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/bitdepth_conversion_avx2.h
rename to media/libaom/src/aom_dsp/x86/bitdepth_conversion_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/bitdepth_conversion_sse2.h b/media/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/bitdepth_conversion_sse2.h
rename to media/libaom/src/aom_dsp/x86/bitdepth_conversion_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_hmask_sse4.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_hmask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c b/media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_mask_avx2.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_mask_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_mask_sse4.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_mask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c b/media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_a64_vmask_sse4.c
rename to media/libaom/src/aom_dsp/x86/blend_a64_vmask_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/blend_mask_sse4.h b/media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_mask_sse4.h
rename to media/libaom/src/aom_dsp/x86/blend_mask_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/blend_sse4.h b/media/libaom/src/aom_dsp/x86/blend_sse4.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blend_sse4.h
rename to media/libaom/src/aom_dsp/x86/blend_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/blk_sse_sum_avx2.c b/media/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blk_sse_sum_avx2.c
rename to media/libaom/src/aom_dsp/x86/blk_sse_sum_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/blk_sse_sum_sse2.c b/media/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/blk_sse_sum_sse2.c
rename to media/libaom/src/aom_dsp/x86/blk_sse_sum_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/common_avx2.h b/media/libaom/src/aom_dsp/x86/common_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/common_avx2.h
rename to media/libaom/src/aom_dsp/x86/common_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve.h b/media/libaom/src/aom_dsp/x86/convolve.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve.h
rename to media/libaom/src/aom_dsp/x86/convolve.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_avx2.h b/media/libaom/src/aom_dsp/x86/convolve_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_avx2.h
rename to media/libaom/src/aom_dsp/x86/convolve_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_common_intrin.h b/media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_common_intrin.h
rename to media/libaom/src/aom_dsp/x86/convolve_common_intrin.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_sse2.h b/media/libaom/src/aom_dsp/x86/convolve_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_sse2.h
rename to media/libaom/src/aom_dsp/x86/convolve_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/convolve_sse4_1.h b/media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/convolve_sse4_1.h
rename to media/libaom/src/aom_dsp/x86/convolve_sse4_1.h
diff --git a/third_party/aom/aom_dsp/x86/fft_avx2.c b/media/libaom/src/aom_dsp/x86/fft_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fft_avx2.c
rename to media/libaom/src/aom_dsp/x86/fft_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/fft_sse2.c b/media/libaom/src/aom_dsp/x86/fft_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fft_sse2.c
rename to media/libaom/src/aom_dsp/x86/fft_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h b/media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_impl_sse2.h
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_impl_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_sse2.c
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h b/media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_sse2.h
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm b/media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/fwd_txfm_ssse3_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_adaptive_quantize_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_adaptive_quantize_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_adaptive_quantize_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_adaptive_quantize_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_adaptive_quantize_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_convolve_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_convolve_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_convolve_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_convolve_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c b/media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_convolve_ssse3.c
rename to media/libaom/src/aom_dsp/x86/highbd_convolve_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_asm_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_intrapred_asm_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_intrapred_asm_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_intrapred_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_intrapred_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_loopfilter_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_loopfilter_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_loopfilter_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_loopfilter_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_quantize_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_quantize_intrin_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_quantize_intrin_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_sad4d_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_sad4d_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_sad_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_sad_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_subpel_variance_impl_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_subtract_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_subtract_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_avx2.c b/media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_avx2.c
rename to media/libaom/src/aom_dsp/x86/highbd_variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm b/media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_impl_sse2.asm
rename to media/libaom/src/aom_dsp/x86/highbd_variance_impl_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_sse2.c b/media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_sse2.c
rename to media/libaom/src/aom_dsp/x86/highbd_variance_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/highbd_variance_sse4.c b/media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/highbd_variance_sse4.c
rename to media/libaom/src/aom_dsp/x86/highbd_variance_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_asm_sse2.asm b/media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_asm_sse2.asm
rename to media/libaom/src/aom_dsp/x86/intrapred_asm_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/intrapred_avx2.c b/media/libaom/src/aom_dsp/x86/intrapred_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_avx2.c
rename to media/libaom/src/aom_dsp/x86/intrapred_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_sse2.c b/media/libaom/src/aom_dsp/x86/intrapred_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_sse2.c
rename to media/libaom/src/aom_dsp/x86/intrapred_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/intrapred_ssse3.c b/media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/intrapred_ssse3.c
rename to media/libaom/src/aom_dsp/x86/intrapred_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/inv_wht_sse2.asm b/media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/inv_wht_sse2.asm
rename to media/libaom/src/aom_dsp/x86/inv_wht_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c b/media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/jnt_sad_ssse3.c
rename to media/libaom/src/aom_dsp/x86/jnt_sad_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c b/media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/jnt_variance_ssse3.c
rename to media/libaom/src/aom_dsp/x86/jnt_variance_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/loopfilter_sse2.c b/media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/loopfilter_sse2.c
rename to media/libaom/src/aom_dsp/x86/loopfilter_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/lpf_common_sse2.h b/media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/lpf_common_sse2.h
rename to media/libaom/src/aom_dsp/x86/lpf_common_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
rename to media/libaom/src/aom_dsp/x86/masked_sad_intrin_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
rename to media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h b/media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.h
rename to media/libaom/src/aom_dsp/x86/masked_sad_intrin_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.c
rename to media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h b/media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/masked_variance_intrin_ssse3.h
rename to media/libaom/src/aom_dsp/x86/masked_variance_intrin_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/mem_sse2.h b/media/libaom/src/aom_dsp/x86/mem_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/mem_sse2.h
rename to media/libaom/src/aom_dsp/x86/mem_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_intrinsic_sse4.h
rename to media/libaom/src/aom_dsp/x86/obmc_intrinsic_sse4.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h b/media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_intrinsic_ssse3.h
rename to media/libaom/src/aom_dsp/x86/obmc_intrinsic_ssse3.h
diff --git a/third_party/aom/aom_dsp/x86/obmc_sad_avx2.c b/media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_sad_avx2.c
rename to media/libaom/src/aom_dsp/x86/obmc_sad_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_sad_sse4.c b/media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_sad_sse4.c
rename to media/libaom/src/aom_dsp/x86/obmc_sad_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_variance_avx2.c b/media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_variance_avx2.c
rename to media/libaom/src/aom_dsp/x86/obmc_variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/obmc_variance_sse4.c b/media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/obmc_variance_sse4.c
rename to media/libaom/src/aom_dsp/x86/obmc_variance_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm b/media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_avx_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/quantize_avx_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/quantize_sse2.c b/media/libaom/src/aom_dsp/x86/quantize_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_sse2.c
rename to media/libaom/src/aom_dsp/x86/quantize_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_ssse3.c b/media/libaom/src/aom_dsp/x86/quantize_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_ssse3.c
rename to media/libaom/src/aom_dsp/x86/quantize_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm b/media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_ssse3_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/quantize_ssse3_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/quantize_x86.h b/media/libaom/src/aom_dsp/x86/quantize_x86.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/quantize_x86.h
rename to media/libaom/src/aom_dsp/x86/quantize_x86.h
diff --git a/third_party/aom/aom_dsp/x86/sad4d_avx2.c b/media/libaom/src/aom_dsp/x86/sad4d_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad4d_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad4d_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad4d_sse2.asm b/media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad4d_sse2.asm
rename to media/libaom/src/aom_dsp/x86/sad4d_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sad_avx2.c b/media/libaom/src/aom_dsp/x86/sad_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_highbd_avx2.c b/media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_highbd_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad_highbd_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_impl_avx2.c b/media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_impl_avx2.c
rename to media/libaom/src/aom_dsp/x86/sad_impl_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sad_sse2.asm b/media/libaom/src/aom_dsp/x86/sad_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sad_sse2.asm
rename to media/libaom/src/aom_dsp/x86/sad_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sse_avx2.c b/media/libaom/src/aom_dsp/x86/sse_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sse_avx2.c
rename to media/libaom/src/aom_dsp/x86/sse_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sse_sse4.c b/media/libaom/src/aom_dsp/x86/sse_sse4.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sse_sse4.c
rename to media/libaom/src/aom_dsp/x86/sse_sse4.c
diff --git a/third_party/aom/aom_dsp/x86/ssim_sse2_x86_64.asm b/media/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/ssim_sse2_x86_64.asm
rename to media/libaom/src/aom_dsp/x86/ssim_sse2_x86_64.asm
diff --git a/third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm b/media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/subpel_variance_sse2.asm
rename to media/libaom/src/aom_dsp/x86/subpel_variance_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/subtract_avx2.c b/media/libaom/src/aom_dsp/x86/subtract_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/subtract_avx2.c
rename to media/libaom/src/aom_dsp/x86/subtract_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/subtract_sse2.asm b/media/libaom/src/aom_dsp/x86/subtract_sse2.asm
similarity index 100%
rename from third_party/aom/aom_dsp/x86/subtract_sse2.asm
rename to media/libaom/src/aom_dsp/x86/subtract_sse2.asm
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_avx2.c b/media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sum_squares_avx2.c
rename to media/libaom/src/aom_dsp/x86/sum_squares_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_sse2.c b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sum_squares_sse2.c
rename to media/libaom/src/aom_dsp/x86/sum_squares_sse2.c
diff --git a/third_party/aom/aom_dsp/x86/sum_squares_sse2.h b/media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/sum_squares_sse2.h
rename to media/libaom/src/aom_dsp/x86/sum_squares_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/synonyms.h b/media/libaom/src/aom_dsp/x86/synonyms.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/synonyms.h
rename to media/libaom/src/aom_dsp/x86/synonyms.h
diff --git a/third_party/aom/aom_dsp/x86/synonyms_avx2.h b/media/libaom/src/aom_dsp/x86/synonyms_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/synonyms_avx2.h
rename to media/libaom/src/aom_dsp/x86/synonyms_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/transpose_sse2.h b/media/libaom/src/aom_dsp/x86/transpose_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/transpose_sse2.h
rename to media/libaom/src/aom_dsp/x86/transpose_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/txfm_common_avx2.h b/media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/txfm_common_avx2.h
rename to media/libaom/src/aom_dsp/x86/txfm_common_avx2.h
diff --git a/third_party/aom/aom_dsp/x86/txfm_common_sse2.h b/media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
similarity index 100%
rename from third_party/aom/aom_dsp/x86/txfm_common_sse2.h
rename to media/libaom/src/aom_dsp/x86/txfm_common_sse2.h
diff --git a/third_party/aom/aom_dsp/x86/variance_avx2.c b/media/libaom/src/aom_dsp/x86/variance_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_avx2.c
rename to media/libaom/src/aom_dsp/x86/variance_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/variance_impl_avx2.c b/media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_impl_avx2.c
rename to media/libaom/src/aom_dsp/x86/variance_impl_avx2.c
diff --git a/third_party/aom/aom_dsp/x86/variance_impl_ssse3.c b/media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_impl_ssse3.c
rename to media/libaom/src/aom_dsp/x86/variance_impl_ssse3.c
diff --git a/third_party/aom/aom_dsp/x86/variance_sse2.c b/media/libaom/src/aom_dsp/x86/variance_sse2.c
similarity index 100%
rename from third_party/aom/aom_dsp/x86/variance_sse2.c
rename to media/libaom/src/aom_dsp/x86/variance_sse2.c
diff --git a/third_party/aom/aom_mem/aom_mem.c b/media/libaom/src/aom_mem/aom_mem.c
similarity index 100%
rename from third_party/aom/aom_mem/aom_mem.c
rename to media/libaom/src/aom_mem/aom_mem.c
diff --git a/third_party/aom/aom_mem/aom_mem.cmake b/media/libaom/src/aom_mem/aom_mem.cmake
similarity index 100%
rename from third_party/aom/aom_mem/aom_mem.cmake
rename to media/libaom/src/aom_mem/aom_mem.cmake
diff --git a/third_party/aom/aom_mem/aom_mem.h b/media/libaom/src/aom_mem/aom_mem.h
similarity index 100%
rename from third_party/aom/aom_mem/aom_mem.h
rename to media/libaom/src/aom_mem/aom_mem.h
diff --git a/third_party/aom/aom_mem/include/aom_mem_intrnl.h b/media/libaom/src/aom_mem/include/aom_mem_intrnl.h
similarity index 100%
rename from third_party/aom/aom_mem/include/aom_mem_intrnl.h
rename to media/libaom/src/aom_mem/include/aom_mem_intrnl.h
diff --git a/third_party/aom/aom_ports/aom_once.h b/media/libaom/src/aom_ports/aom_once.h
similarity index 100%
rename from third_party/aom/aom_ports/aom_once.h
rename to media/libaom/src/aom_ports/aom_once.h
diff --git a/third_party/aom/aom_ports/aom_ports.cmake b/media/libaom/src/aom_ports/aom_ports.cmake
similarity index 100%
rename from third_party/aom/aom_ports/aom_ports.cmake
rename to media/libaom/src/aom_ports/aom_ports.cmake
diff --git a/third_party/aom/aom_ports/aom_timer.h b/media/libaom/src/aom_ports/aom_timer.h
similarity index 100%
rename from third_party/aom/aom_ports/aom_timer.h
rename to media/libaom/src/aom_ports/aom_timer.h
diff --git a/third_party/aom/aom_ports/arm.h b/media/libaom/src/aom_ports/arm.h
similarity index 100%
rename from third_party/aom/aom_ports/arm.h
rename to media/libaom/src/aom_ports/arm.h
diff --git a/third_party/aom/aom_ports/arm_cpudetect.c b/media/libaom/src/aom_ports/arm_cpudetect.c
similarity index 100%
rename from third_party/aom/aom_ports/arm_cpudetect.c
rename to media/libaom/src/aom_ports/arm_cpudetect.c
diff --git a/third_party/aom/aom_ports/bitops.h b/media/libaom/src/aom_ports/bitops.h
similarity index 100%
rename from third_party/aom/aom_ports/bitops.h
rename to media/libaom/src/aom_ports/bitops.h
diff --git a/third_party/aom/aom_ports/emmintrin_compat.h b/media/libaom/src/aom_ports/emmintrin_compat.h
similarity index 100%
rename from third_party/aom/aom_ports/emmintrin_compat.h
rename to media/libaom/src/aom_ports/emmintrin_compat.h
diff --git a/third_party/aom/aom_ports/emms.asm b/media/libaom/src/aom_ports/emms.asm
similarity index 100%
rename from third_party/aom/aom_ports/emms.asm
rename to media/libaom/src/aom_ports/emms.asm
diff --git a/third_party/aom/aom_ports/mem.h b/media/libaom/src/aom_ports/mem.h
similarity index 100%
rename from third_party/aom/aom_ports/mem.h
rename to media/libaom/src/aom_ports/mem.h
diff --git a/third_party/aom/aom_ports/mem_ops.h b/media/libaom/src/aom_ports/mem_ops.h
similarity index 100%
rename from third_party/aom/aom_ports/mem_ops.h
rename to media/libaom/src/aom_ports/mem_ops.h
diff --git a/third_party/aom/aom_ports/mem_ops_aligned.h b/media/libaom/src/aom_ports/mem_ops_aligned.h
similarity index 100%
rename from third_party/aom/aom_ports/mem_ops_aligned.h
rename to media/libaom/src/aom_ports/mem_ops_aligned.h
diff --git a/third_party/aom/aom_ports/msvc.h b/media/libaom/src/aom_ports/msvc.h
similarity index 100%
rename from third_party/aom/aom_ports/msvc.h
rename to media/libaom/src/aom_ports/msvc.h
diff --git a/third_party/aom/aom_ports/ppc.h b/media/libaom/src/aom_ports/ppc.h
similarity index 100%
rename from third_party/aom/aom_ports/ppc.h
rename to media/libaom/src/aom_ports/ppc.h
diff --git a/third_party/aom/aom_ports/ppc_cpudetect.c b/media/libaom/src/aom_ports/ppc_cpudetect.c
similarity index 100%
rename from third_party/aom/aom_ports/ppc_cpudetect.c
rename to media/libaom/src/aom_ports/ppc_cpudetect.c
diff --git a/third_party/aom/aom_ports/sanitizer.h b/media/libaom/src/aom_ports/sanitizer.h
similarity index 100%
rename from third_party/aom/aom_ports/sanitizer.h
rename to media/libaom/src/aom_ports/sanitizer.h
diff --git a/third_party/aom/aom_ports/system_state.h b/media/libaom/src/aom_ports/system_state.h
similarity index 100%
rename from third_party/aom/aom_ports/system_state.h
rename to media/libaom/src/aom_ports/system_state.h
diff --git a/third_party/aom/aom_ports/x86.h b/media/libaom/src/aom_ports/x86.h
similarity index 100%
rename from third_party/aom/aom_ports/x86.h
rename to media/libaom/src/aom_ports/x86.h
diff --git a/third_party/aom/aom_ports/x86_abi_support.asm b/media/libaom/src/aom_ports/x86_abi_support.asm
similarity index 100%
rename from third_party/aom/aom_ports/x86_abi_support.asm
rename to media/libaom/src/aom_ports/x86_abi_support.asm
diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/media/libaom/src/aom_scale/aom_scale.cmake
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale.cmake
rename to media/libaom/src/aom_scale/aom_scale.cmake
diff --git a/third_party/aom/aom_scale/aom_scale.h b/media/libaom/src/aom_scale/aom_scale.h
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale.h
rename to media/libaom/src/aom_scale/aom_scale.h
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.c b/media/libaom/src/aom_scale/aom_scale_rtcd.c
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale_rtcd.c
rename to media/libaom/src/aom_scale/aom_scale_rtcd.c
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.pl b/media/libaom/src/aom_scale/aom_scale_rtcd.pl
similarity index 100%
rename from third_party/aom/aom_scale/aom_scale_rtcd.pl
rename to media/libaom/src/aom_scale/aom_scale_rtcd.pl
diff --git a/third_party/aom/aom_scale/generic/aom_scale.c b/media/libaom/src/aom_scale/generic/aom_scale.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/aom_scale.c
rename to media/libaom/src/aom_scale/generic/aom_scale.c
diff --git a/third_party/aom/aom_scale/generic/gen_scalers.c b/media/libaom/src/aom_scale/generic/gen_scalers.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/gen_scalers.c
rename to media/libaom/src/aom_scale/generic/gen_scalers.c
diff --git a/third_party/aom/aom_scale/generic/yv12config.c b/media/libaom/src/aom_scale/generic/yv12config.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/yv12config.c
rename to media/libaom/src/aom_scale/generic/yv12config.c
diff --git a/third_party/aom/aom_scale/generic/yv12extend.c b/media/libaom/src/aom_scale/generic/yv12extend.c
similarity index 100%
rename from third_party/aom/aom_scale/generic/yv12extend.c
rename to media/libaom/src/aom_scale/generic/yv12extend.c
diff --git a/third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c b/media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
similarity index 100%
rename from third_party/aom/aom_scale/mips/dspr2/yv12extend_dspr2.c
rename to media/libaom/src/aom_scale/mips/dspr2/yv12extend_dspr2.c
diff --git a/third_party/aom/aom_scale/yv12config.h b/media/libaom/src/aom_scale/yv12config.h
similarity index 100%
rename from third_party/aom/aom_scale/yv12config.h
rename to media/libaom/src/aom_scale/yv12config.h
diff --git a/third_party/aom/aom_util/aom_thread.c b/media/libaom/src/aom_util/aom_thread.c
similarity index 100%
rename from third_party/aom/aom_util/aom_thread.c
rename to media/libaom/src/aom_util/aom_thread.c
diff --git a/third_party/aom/aom_util/aom_thread.h b/media/libaom/src/aom_util/aom_thread.h
similarity index 100%
rename from third_party/aom/aom_util/aom_thread.h
rename to media/libaom/src/aom_util/aom_thread.h
diff --git a/third_party/aom/aom_util/aom_util.cmake b/media/libaom/src/aom_util/aom_util.cmake
similarity index 100%
rename from third_party/aom/aom_util/aom_util.cmake
rename to media/libaom/src/aom_util/aom_util.cmake
diff --git a/third_party/aom/aom_util/debug_util.c b/media/libaom/src/aom_util/debug_util.c
similarity index 100%
rename from third_party/aom/aom_util/debug_util.c
rename to media/libaom/src/aom_util/debug_util.c
diff --git a/third_party/aom/aom_util/debug_util.h b/media/libaom/src/aom_util/debug_util.h
similarity index 100%
rename from third_party/aom/aom_util/debug_util.h
rename to media/libaom/src/aom_util/debug_util.h
diff --git a/third_party/aom/aom_util/endian_inl.h b/media/libaom/src/aom_util/endian_inl.h
similarity index 100%
rename from third_party/aom/aom_util/endian_inl.h
rename to media/libaom/src/aom_util/endian_inl.h
diff --git a/third_party/aom/apps/aomdec.c b/media/libaom/src/apps/aomdec.c
similarity index 100%
rename from third_party/aom/apps/aomdec.c
rename to media/libaom/src/apps/aomdec.c
diff --git a/third_party/aom/apps/aomenc.c b/media/libaom/src/apps/aomenc.c
similarity index 100%
rename from third_party/aom/apps/aomenc.c
rename to media/libaom/src/apps/aomenc.c
diff --git a/third_party/aom/apps/aomenc.h b/media/libaom/src/apps/aomenc.h
similarity index 100%
rename from third_party/aom/apps/aomenc.h
rename to media/libaom/src/apps/aomenc.h
diff --git a/third_party/aom/av1/av1.cmake b/media/libaom/src/av1/av1.cmake
similarity index 100%
rename from third_party/aom/av1/av1.cmake
rename to media/libaom/src/av1/av1.cmake
diff --git a/third_party/aom/av1/av1_cx_iface.c b/media/libaom/src/av1/av1_cx_iface.c
similarity index 100%
rename from third_party/aom/av1/av1_cx_iface.c
rename to media/libaom/src/av1/av1_cx_iface.c
diff --git a/third_party/aom/av1/av1_dx_iface.c b/media/libaom/src/av1/av1_dx_iface.c
similarity index 100%
rename from third_party/aom/av1/av1_dx_iface.c
rename to media/libaom/src/av1/av1_dx_iface.c
diff --git a/third_party/aom/av1/av1_iface_common.h b/media/libaom/src/av1/av1_iface_common.h
similarity index 100%
rename from third_party/aom/av1/av1_iface_common.h
rename to media/libaom/src/av1/av1_iface_common.h
diff --git a/third_party/aom/av1/common/alloccommon.c b/media/libaom/src/av1/common/alloccommon.c
similarity index 100%
rename from third_party/aom/av1/common/alloccommon.c
rename to media/libaom/src/av1/common/alloccommon.c
diff --git a/third_party/aom/av1/common/alloccommon.h b/media/libaom/src/av1/common/alloccommon.h
similarity index 100%
rename from third_party/aom/av1/common/alloccommon.h
rename to media/libaom/src/av1/common/alloccommon.h
diff --git a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.c b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/av1_inv_txfm_neon.c
rename to media/libaom/src/av1/common/arm/av1_inv_txfm_neon.c
diff --git a/third_party/aom/av1/common/arm/av1_inv_txfm_neon.h b/media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/av1_inv_txfm_neon.h
rename to media/libaom/src/av1/common/arm/av1_inv_txfm_neon.h
diff --git a/third_party/aom/av1/common/arm/av1_txfm_neon.c b/media/libaom/src/av1/common/arm/av1_txfm_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/av1_txfm_neon.c
rename to media/libaom/src/av1/common/arm/av1_txfm_neon.c
diff --git a/third_party/aom/av1/common/arm/blend_a64_hmask_neon.c b/media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/blend_a64_hmask_neon.c
rename to media/libaom/src/av1/common/arm/blend_a64_hmask_neon.c
diff --git a/third_party/aom/av1/common/arm/blend_a64_vmask_neon.c b/media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/blend_a64_vmask_neon.c
rename to media/libaom/src/av1/common/arm/blend_a64_vmask_neon.c
diff --git a/third_party/aom/av1/common/arm/cfl_neon.c b/media/libaom/src/av1/common/arm/cfl_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/cfl_neon.c
rename to media/libaom/src/av1/common/arm/cfl_neon.c
diff --git a/third_party/aom/av1/common/arm/convolve_neon.c b/media/libaom/src/av1/common/arm/convolve_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/convolve_neon.c
rename to media/libaom/src/av1/common/arm/convolve_neon.c
diff --git a/third_party/aom/av1/common/arm/convolve_neon.h b/media/libaom/src/av1/common/arm/convolve_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/convolve_neon.h
rename to media/libaom/src/av1/common/arm/convolve_neon.h
diff --git a/third_party/aom/av1/common/arm/jnt_convolve_neon.c b/media/libaom/src/av1/common/arm/jnt_convolve_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/jnt_convolve_neon.c
rename to media/libaom/src/av1/common/arm/jnt_convolve_neon.c
diff --git a/third_party/aom/av1/common/arm/mem_neon.h b/media/libaom/src/av1/common/arm/mem_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/mem_neon.h
rename to media/libaom/src/av1/common/arm/mem_neon.h
diff --git a/third_party/aom/av1/common/arm/reconinter_neon.c b/media/libaom/src/av1/common/arm/reconinter_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/reconinter_neon.c
rename to media/libaom/src/av1/common/arm/reconinter_neon.c
diff --git a/third_party/aom/av1/common/arm/selfguided_neon.c b/media/libaom/src/av1/common/arm/selfguided_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/selfguided_neon.c
rename to media/libaom/src/av1/common/arm/selfguided_neon.c
diff --git a/third_party/aom/av1/common/arm/transpose_neon.h b/media/libaom/src/av1/common/arm/transpose_neon.h
similarity index 100%
rename from third_party/aom/av1/common/arm/transpose_neon.h
rename to media/libaom/src/av1/common/arm/transpose_neon.h
diff --git a/third_party/aom/av1/common/arm/warp_plane_neon.c b/media/libaom/src/av1/common/arm/warp_plane_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/warp_plane_neon.c
rename to media/libaom/src/av1/common/arm/warp_plane_neon.c
diff --git a/third_party/aom/av1/common/arm/wiener_convolve_neon.c b/media/libaom/src/av1/common/arm/wiener_convolve_neon.c
similarity index 100%
rename from third_party/aom/av1/common/arm/wiener_convolve_neon.c
rename to media/libaom/src/av1/common/arm/wiener_convolve_neon.c
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d.c b/media/libaom/src/av1/common/av1_inv_txfm1d.c
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm1d.c
rename to media/libaom/src/av1/common/av1_inv_txfm1d.c
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d.h b/media/libaom/src/av1/common/av1_inv_txfm1d.h
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm1d.h
rename to media/libaom/src/av1/common/av1_inv_txfm1d.h
diff --git a/third_party/aom/av1/common/av1_inv_txfm1d_cfg.h b/media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm1d_cfg.h
rename to media/libaom/src/av1/common/av1_inv_txfm1d_cfg.h
diff --git a/third_party/aom/av1/common/av1_inv_txfm2d.c b/media/libaom/src/av1/common/av1_inv_txfm2d.c
similarity index 100%
rename from third_party/aom/av1/common/av1_inv_txfm2d.c
rename to media/libaom/src/av1/common/av1_inv_txfm2d.c
diff --git a/third_party/aom/av1/common/av1_loopfilter.c b/media/libaom/src/av1/common/av1_loopfilter.c
similarity index 100%
rename from third_party/aom/av1/common/av1_loopfilter.c
rename to media/libaom/src/av1/common/av1_loopfilter.c
diff --git a/third_party/aom/av1/common/av1_loopfilter.h b/media/libaom/src/av1/common/av1_loopfilter.h
similarity index 100%
rename from third_party/aom/av1/common/av1_loopfilter.h
rename to media/libaom/src/av1/common/av1_loopfilter.h
diff --git a/third_party/aom/av1/common/av1_rtcd.c b/media/libaom/src/av1/common/av1_rtcd.c
similarity index 100%
rename from third_party/aom/av1/common/av1_rtcd.c
rename to media/libaom/src/av1/common/av1_rtcd.c
diff --git a/third_party/aom/av1/common/av1_rtcd_defs.pl b/media/libaom/src/av1/common/av1_rtcd_defs.pl
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/av1/common/av1_rtcd_defs.pl
rename to media/libaom/src/av1/common/av1_rtcd_defs.pl
diff --git a/third_party/aom/av1/common/av1_txfm.c b/media/libaom/src/av1/common/av1_txfm.c
similarity index 100%
rename from third_party/aom/av1/common/av1_txfm.c
rename to media/libaom/src/av1/common/av1_txfm.c
diff --git a/third_party/aom/av1/common/av1_txfm.h b/media/libaom/src/av1/common/av1_txfm.h
similarity index 100%
rename from third_party/aom/av1/common/av1_txfm.h
rename to media/libaom/src/av1/common/av1_txfm.h
diff --git a/third_party/aom/av1/common/blockd.c b/media/libaom/src/av1/common/blockd.c
similarity index 100%
rename from third_party/aom/av1/common/blockd.c
rename to media/libaom/src/av1/common/blockd.c
diff --git a/third_party/aom/av1/common/blockd.h b/media/libaom/src/av1/common/blockd.h
similarity index 100%
rename from third_party/aom/av1/common/blockd.h
rename to media/libaom/src/av1/common/blockd.h
diff --git a/third_party/aom/av1/common/cdef.c b/media/libaom/src/av1/common/cdef.c
similarity index 100%
rename from third_party/aom/av1/common/cdef.c
rename to media/libaom/src/av1/common/cdef.c
diff --git a/third_party/aom/av1/common/cdef.h b/media/libaom/src/av1/common/cdef.h
similarity index 100%
rename from third_party/aom/av1/common/cdef.h
rename to media/libaom/src/av1/common/cdef.h
diff --git a/third_party/aom/av1/common/cdef_block.c b/media/libaom/src/av1/common/cdef_block.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block.c
rename to media/libaom/src/av1/common/cdef_block.c
diff --git a/third_party/aom/av1/common/cdef_block.h b/media/libaom/src/av1/common/cdef_block.h
similarity index 100%
rename from third_party/aom/av1/common/cdef_block.h
rename to media/libaom/src/av1/common/cdef_block.h
diff --git a/third_party/aom/av1/common/cdef_block_avx2.c b/media/libaom/src/av1/common/cdef_block_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_avx2.c
rename to media/libaom/src/av1/common/cdef_block_avx2.c
diff --git a/third_party/aom/av1/common/cdef_block_neon.c b/media/libaom/src/av1/common/cdef_block_neon.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_neon.c
rename to media/libaom/src/av1/common/cdef_block_neon.c
diff --git a/third_party/aom/av1/common/cdef_block_simd.h b/media/libaom/src/av1/common/cdef_block_simd.h
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_simd.h
rename to media/libaom/src/av1/common/cdef_block_simd.h
diff --git a/third_party/aom/av1/common/cdef_block_sse2.c b/media/libaom/src/av1/common/cdef_block_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_sse2.c
rename to media/libaom/src/av1/common/cdef_block_sse2.c
diff --git a/third_party/aom/av1/common/cdef_block_sse4.c b/media/libaom/src/av1/common/cdef_block_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_sse4.c
rename to media/libaom/src/av1/common/cdef_block_sse4.c
diff --git a/third_party/aom/av1/common/cdef_block_ssse3.c b/media/libaom/src/av1/common/cdef_block_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/cdef_block_ssse3.c
rename to media/libaom/src/av1/common/cdef_block_ssse3.c
diff --git a/third_party/aom/av1/common/cfl.c b/media/libaom/src/av1/common/cfl.c
similarity index 100%
rename from third_party/aom/av1/common/cfl.c
rename to media/libaom/src/av1/common/cfl.c
diff --git a/third_party/aom/av1/common/cfl.h b/media/libaom/src/av1/common/cfl.h
similarity index 100%
rename from third_party/aom/av1/common/cfl.h
rename to media/libaom/src/av1/common/cfl.h
diff --git a/third_party/aom/av1/common/common.h b/media/libaom/src/av1/common/common.h
similarity index 100%
rename from third_party/aom/av1/common/common.h
rename to media/libaom/src/av1/common/common.h
diff --git a/third_party/aom/av1/common/common_data.h b/media/libaom/src/av1/common/common_data.h
similarity index 100%
rename from third_party/aom/av1/common/common_data.h
rename to media/libaom/src/av1/common/common_data.h
diff --git a/third_party/aom/av1/common/convolve.c b/media/libaom/src/av1/common/convolve.c
similarity index 100%
rename from third_party/aom/av1/common/convolve.c
rename to media/libaom/src/av1/common/convolve.c
diff --git a/third_party/aom/av1/common/convolve.h b/media/libaom/src/av1/common/convolve.h
similarity index 100%
rename from third_party/aom/av1/common/convolve.h
rename to media/libaom/src/av1/common/convolve.h
diff --git a/third_party/aom/av1/common/debugmodes.c b/media/libaom/src/av1/common/debugmodes.c
similarity index 100%
rename from third_party/aom/av1/common/debugmodes.c
rename to media/libaom/src/av1/common/debugmodes.c
diff --git a/third_party/aom/av1/common/entropy.c b/media/libaom/src/av1/common/entropy.c
similarity index 100%
rename from third_party/aom/av1/common/entropy.c
rename to media/libaom/src/av1/common/entropy.c
diff --git a/third_party/aom/av1/common/entropy.h b/media/libaom/src/av1/common/entropy.h
similarity index 100%
rename from third_party/aom/av1/common/entropy.h
rename to media/libaom/src/av1/common/entropy.h
diff --git a/third_party/aom/av1/common/entropymode.c b/media/libaom/src/av1/common/entropymode.c
similarity index 100%
rename from third_party/aom/av1/common/entropymode.c
rename to media/libaom/src/av1/common/entropymode.c
diff --git a/third_party/aom/av1/common/entropymode.h b/media/libaom/src/av1/common/entropymode.h
similarity index 100%
rename from third_party/aom/av1/common/entropymode.h
rename to media/libaom/src/av1/common/entropymode.h
diff --git a/third_party/aom/av1/common/entropymv.c b/media/libaom/src/av1/common/entropymv.c
similarity index 100%
rename from third_party/aom/av1/common/entropymv.c
rename to media/libaom/src/av1/common/entropymv.c
diff --git a/third_party/aom/av1/common/entropymv.h b/media/libaom/src/av1/common/entropymv.h
similarity index 100%
rename from third_party/aom/av1/common/entropymv.h
rename to media/libaom/src/av1/common/entropymv.h
diff --git a/third_party/aom/av1/common/enums.h b/media/libaom/src/av1/common/enums.h
similarity index 100%
rename from third_party/aom/av1/common/enums.h
rename to media/libaom/src/av1/common/enums.h
diff --git a/third_party/aom/av1/common/filter.h b/media/libaom/src/av1/common/filter.h
similarity index 100%
rename from third_party/aom/av1/common/filter.h
rename to media/libaom/src/av1/common/filter.h
diff --git a/third_party/aom/av1/common/frame_buffers.c b/media/libaom/src/av1/common/frame_buffers.c
similarity index 100%
rename from third_party/aom/av1/common/frame_buffers.c
rename to media/libaom/src/av1/common/frame_buffers.c
diff --git a/third_party/aom/av1/common/frame_buffers.h b/media/libaom/src/av1/common/frame_buffers.h
similarity index 100%
rename from third_party/aom/av1/common/frame_buffers.h
rename to media/libaom/src/av1/common/frame_buffers.h
diff --git a/third_party/aom/av1/common/idct.c b/media/libaom/src/av1/common/idct.c
similarity index 100%
rename from third_party/aom/av1/common/idct.c
rename to media/libaom/src/av1/common/idct.c
diff --git a/third_party/aom/av1/common/idct.h b/media/libaom/src/av1/common/idct.h
similarity index 100%
rename from third_party/aom/av1/common/idct.h
rename to media/libaom/src/av1/common/idct.h
diff --git a/third_party/aom/av1/common/loopfiltermask.c b/media/libaom/src/av1/common/loopfiltermask.c
similarity index 100%
rename from third_party/aom/av1/common/loopfiltermask.c
rename to media/libaom/src/av1/common/loopfiltermask.c
diff --git a/third_party/aom/av1/common/mv.h b/media/libaom/src/av1/common/mv.h
similarity index 100%
rename from third_party/aom/av1/common/mv.h
rename to media/libaom/src/av1/common/mv.h
diff --git a/third_party/aom/av1/common/mvref_common.c b/media/libaom/src/av1/common/mvref_common.c
similarity index 100%
rename from third_party/aom/av1/common/mvref_common.c
rename to media/libaom/src/av1/common/mvref_common.c
diff --git a/third_party/aom/av1/common/mvref_common.h b/media/libaom/src/av1/common/mvref_common.h
similarity index 100%
rename from third_party/aom/av1/common/mvref_common.h
rename to media/libaom/src/av1/common/mvref_common.h
diff --git a/third_party/aom/av1/common/obmc.h b/media/libaom/src/av1/common/obmc.h
similarity index 100%
rename from third_party/aom/av1/common/obmc.h
rename to media/libaom/src/av1/common/obmc.h
diff --git a/third_party/aom/av1/common/obu_util.c b/media/libaom/src/av1/common/obu_util.c
similarity index 100%
rename from third_party/aom/av1/common/obu_util.c
rename to media/libaom/src/av1/common/obu_util.c
diff --git a/third_party/aom/av1/common/obu_util.h b/media/libaom/src/av1/common/obu_util.h
similarity index 100%
rename from third_party/aom/av1/common/obu_util.h
rename to media/libaom/src/av1/common/obu_util.h
diff --git a/third_party/aom/av1/common/odintrin.c b/media/libaom/src/av1/common/odintrin.c
similarity index 100%
rename from third_party/aom/av1/common/odintrin.c
rename to media/libaom/src/av1/common/odintrin.c
diff --git a/third_party/aom/av1/common/odintrin.h b/media/libaom/src/av1/common/odintrin.h
similarity index 100%
rename from third_party/aom/av1/common/odintrin.h
rename to media/libaom/src/av1/common/odintrin.h
diff --git a/third_party/aom/av1/common/onyxc_int.h b/media/libaom/src/av1/common/onyxc_int.h
similarity index 100%
rename from third_party/aom/av1/common/onyxc_int.h
rename to media/libaom/src/av1/common/onyxc_int.h
diff --git a/third_party/aom/av1/common/ppc/cfl_ppc.c b/media/libaom/src/av1/common/ppc/cfl_ppc.c
similarity index 100%
rename from third_party/aom/av1/common/ppc/cfl_ppc.c
rename to media/libaom/src/av1/common/ppc/cfl_ppc.c
diff --git a/third_party/aom/av1/common/pred_common.c b/media/libaom/src/av1/common/pred_common.c
similarity index 100%
rename from third_party/aom/av1/common/pred_common.c
rename to media/libaom/src/av1/common/pred_common.c
diff --git a/third_party/aom/av1/common/pred_common.h b/media/libaom/src/av1/common/pred_common.h
similarity index 100%
rename from third_party/aom/av1/common/pred_common.h
rename to media/libaom/src/av1/common/pred_common.h
diff --git a/third_party/aom/av1/common/quant_common.c b/media/libaom/src/av1/common/quant_common.c
similarity index 100%
rename from third_party/aom/av1/common/quant_common.c
rename to media/libaom/src/av1/common/quant_common.c
diff --git a/third_party/aom/av1/common/quant_common.h b/media/libaom/src/av1/common/quant_common.h
similarity index 100%
rename from third_party/aom/av1/common/quant_common.h
rename to media/libaom/src/av1/common/quant_common.h
diff --git a/third_party/aom/av1/common/reconinter.c b/media/libaom/src/av1/common/reconinter.c
similarity index 100%
rename from third_party/aom/av1/common/reconinter.c
rename to media/libaom/src/av1/common/reconinter.c
diff --git a/third_party/aom/av1/common/reconinter.h b/media/libaom/src/av1/common/reconinter.h
similarity index 100%
rename from third_party/aom/av1/common/reconinter.h
rename to media/libaom/src/av1/common/reconinter.h
diff --git a/third_party/aom/av1/common/reconintra.c b/media/libaom/src/av1/common/reconintra.c
similarity index 100%
rename from third_party/aom/av1/common/reconintra.c
rename to media/libaom/src/av1/common/reconintra.c
diff --git a/third_party/aom/av1/common/reconintra.h b/media/libaom/src/av1/common/reconintra.h
similarity index 100%
rename from third_party/aom/av1/common/reconintra.h
rename to media/libaom/src/av1/common/reconintra.h
diff --git a/third_party/aom/av1/common/resize.c b/media/libaom/src/av1/common/resize.c
similarity index 100%
rename from third_party/aom/av1/common/resize.c
rename to media/libaom/src/av1/common/resize.c
diff --git a/third_party/aom/av1/common/resize.h b/media/libaom/src/av1/common/resize.h
similarity index 100%
rename from third_party/aom/av1/common/resize.h
rename to media/libaom/src/av1/common/resize.h
diff --git a/third_party/aom/av1/common/restoration.c b/media/libaom/src/av1/common/restoration.c
similarity index 100%
rename from third_party/aom/av1/common/restoration.c
rename to media/libaom/src/av1/common/restoration.c
diff --git a/third_party/aom/av1/common/restoration.h b/media/libaom/src/av1/common/restoration.h
similarity index 100%
rename from third_party/aom/av1/common/restoration.h
rename to media/libaom/src/av1/common/restoration.h
diff --git a/third_party/aom/av1/common/scale.c b/media/libaom/src/av1/common/scale.c
similarity index 100%
rename from third_party/aom/av1/common/scale.c
rename to media/libaom/src/av1/common/scale.c
diff --git a/third_party/aom/av1/common/scale.h b/media/libaom/src/av1/common/scale.h
similarity index 100%
rename from third_party/aom/av1/common/scale.h
rename to media/libaom/src/av1/common/scale.h
diff --git a/third_party/aom/av1/common/scan.c b/media/libaom/src/av1/common/scan.c
similarity index 100%
rename from third_party/aom/av1/common/scan.c
rename to media/libaom/src/av1/common/scan.c
diff --git a/third_party/aom/av1/common/scan.h b/media/libaom/src/av1/common/scan.h
similarity index 100%
rename from third_party/aom/av1/common/scan.h
rename to media/libaom/src/av1/common/scan.h
diff --git a/third_party/aom/av1/common/seg_common.c b/media/libaom/src/av1/common/seg_common.c
similarity index 100%
rename from third_party/aom/av1/common/seg_common.c
rename to media/libaom/src/av1/common/seg_common.c
diff --git a/third_party/aom/av1/common/seg_common.h b/media/libaom/src/av1/common/seg_common.h
similarity index 100%
rename from third_party/aom/av1/common/seg_common.h
rename to media/libaom/src/av1/common/seg_common.h
diff --git a/third_party/aom/av1/common/thread_common.c b/media/libaom/src/av1/common/thread_common.c
similarity index 100%
rename from third_party/aom/av1/common/thread_common.c
rename to media/libaom/src/av1/common/thread_common.c
diff --git a/third_party/aom/av1/common/thread_common.h b/media/libaom/src/av1/common/thread_common.h
similarity index 100%
rename from third_party/aom/av1/common/thread_common.h
rename to media/libaom/src/av1/common/thread_common.h
diff --git a/third_party/aom/av1/common/tile_common.c b/media/libaom/src/av1/common/tile_common.c
similarity index 100%
rename from third_party/aom/av1/common/tile_common.c
rename to media/libaom/src/av1/common/tile_common.c
diff --git a/third_party/aom/av1/common/tile_common.h b/media/libaom/src/av1/common/tile_common.h
similarity index 100%
rename from third_party/aom/av1/common/tile_common.h
rename to media/libaom/src/av1/common/tile_common.h
diff --git a/third_party/aom/av1/common/timing.c b/media/libaom/src/av1/common/timing.c
similarity index 100%
rename from third_party/aom/av1/common/timing.c
rename to media/libaom/src/av1/common/timing.c
diff --git a/third_party/aom/av1/common/timing.h b/media/libaom/src/av1/common/timing.h
similarity index 100%
rename from third_party/aom/av1/common/timing.h
rename to media/libaom/src/av1/common/timing.h
diff --git a/third_party/aom/av1/common/token_cdfs.h b/media/libaom/src/av1/common/token_cdfs.h
similarity index 100%
rename from third_party/aom/av1/common/token_cdfs.h
rename to media/libaom/src/av1/common/token_cdfs.h
diff --git a/third_party/aom/av1/common/txb_common.c b/media/libaom/src/av1/common/txb_common.c
similarity index 100%
rename from third_party/aom/av1/common/txb_common.c
rename to media/libaom/src/av1/common/txb_common.c
diff --git a/third_party/aom/av1/common/txb_common.h b/media/libaom/src/av1/common/txb_common.h
similarity index 100%
rename from third_party/aom/av1/common/txb_common.h
rename to media/libaom/src/av1/common/txb_common.h
diff --git a/third_party/aom/av1/common/warped_motion.c b/media/libaom/src/av1/common/warped_motion.c
similarity index 100%
rename from third_party/aom/av1/common/warped_motion.c
rename to media/libaom/src/av1/common/warped_motion.c
diff --git a/third_party/aom/av1/common/warped_motion.h b/media/libaom/src/av1/common/warped_motion.h
similarity index 100%
rename from third_party/aom/av1/common/warped_motion.h
rename to media/libaom/src/av1/common/warped_motion.h
diff --git a/third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c b/media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_convolve_horiz_rs_sse4.c
rename to media/libaom/src/av1/common/x86/av1_convolve_horiz_rs_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c b/media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_convolve_scale_sse4.c
rename to media/libaom/src/av1/common/x86/av1_convolve_scale_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_avx2.c
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h b/media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_avx2.h
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_avx2.h
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.c
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.c
diff --git a/third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h b/media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_inv_txfm_ssse3.h
rename to media/libaom/src/av1/common/x86/av1_inv_txfm_ssse3.h
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse2.h b/media/libaom/src/av1/common/x86/av1_txfm_sse2.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_txfm_sse2.h
rename to media/libaom/src/av1/common/x86/av1_txfm_sse2.h
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse4.c b/media/libaom/src/av1/common/x86/av1_txfm_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_txfm_sse4.c
rename to media/libaom/src/av1/common/x86/av1_txfm_sse4.c
diff --git a/third_party/aom/av1/common/x86/av1_txfm_sse4.h b/media/libaom/src/av1/common/x86/av1_txfm_sse4.h
similarity index 100%
rename from third_party/aom/av1/common/x86/av1_txfm_sse4.h
rename to media/libaom/src/av1/common/x86/av1_txfm_sse4.h
diff --git a/third_party/aom/av1/common/x86/cfl_avx2.c b/media/libaom/src/av1/common/x86/cfl_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_avx2.c
rename to media/libaom/src/av1/common/x86/cfl_avx2.c
diff --git a/third_party/aom/av1/common/x86/cfl_simd.h b/media/libaom/src/av1/common/x86/cfl_simd.h
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_simd.h
rename to media/libaom/src/av1/common/x86/cfl_simd.h
diff --git a/third_party/aom/av1/common/x86/cfl_sse2.c b/media/libaom/src/av1/common/x86/cfl_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_sse2.c
rename to media/libaom/src/av1/common/x86/cfl_sse2.c
diff --git a/third_party/aom/av1/common/x86/cfl_ssse3.c b/media/libaom/src/av1/common/x86/cfl_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/cfl_ssse3.c
rename to media/libaom/src/av1/common/x86/cfl_ssse3.c
diff --git a/third_party/aom/av1/common/x86/convolve_2d_avx2.c b/media/libaom/src/av1/common/x86/convolve_2d_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_2d_avx2.c
rename to media/libaom/src/av1/common/x86/convolve_2d_avx2.c
diff --git a/third_party/aom/av1/common/x86/convolve_2d_sse2.c b/media/libaom/src/av1/common/x86/convolve_2d_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_2d_sse2.c
rename to media/libaom/src/av1/common/x86/convolve_2d_sse2.c
diff --git a/third_party/aom/av1/common/x86/convolve_avx2.c b/media/libaom/src/av1/common/x86/convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_avx2.c
rename to media/libaom/src/av1/common/x86/convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/convolve_sse2.c b/media/libaom/src/av1/common/x86/convolve_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/convolve_sse2.c
rename to media/libaom/src/av1/common/x86/convolve_sse2.c
diff --git a/third_party/aom/av1/common/x86/filterintra_sse4.c b/media/libaom/src/av1/common/x86/filterintra_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/filterintra_sse4.c
rename to media/libaom/src/av1/common/x86/filterintra_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_sse2.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_sse2.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c b/media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_convolve_2d_ssse3.c
rename to media/libaom/src/av1/common/x86/highbd_convolve_2d_ssse3.c
diff --git a/third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c b/media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_inv_txfm_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_inv_txfm_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c b/media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_inv_txfm_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_inv_txfm_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_jnt_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_jnt_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c b/media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_jnt_convolve_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_jnt_convolve_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h b/media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_txfm_utility_sse4.h
rename to media/libaom/src/av1/common/x86/highbd_txfm_utility_sse4.h
diff --git a/third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c b/media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_warp_plane_sse4.c
rename to media/libaom/src/av1/common/x86/highbd_warp_plane_sse4.c
diff --git a/third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_wiener_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/highbd_wiener_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c b/media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/highbd_wiener_convolve_ssse3.c
rename to media/libaom/src/av1/common/x86/highbd_wiener_convolve_ssse3.c
diff --git a/third_party/aom/av1/common/x86/intra_edge_sse4.c b/media/libaom/src/av1/common/x86/intra_edge_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/intra_edge_sse4.c
rename to media/libaom/src/av1/common/x86/intra_edge_sse4.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_avx2.c b/media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/jnt_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/jnt_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_sse2.c b/media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/jnt_convolve_sse2.c
rename to media/libaom/src/av1/common/x86/jnt_convolve_sse2.c
diff --git a/third_party/aom/av1/common/x86/jnt_convolve_ssse3.c b/media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/jnt_convolve_ssse3.c
rename to media/libaom/src/av1/common/x86/jnt_convolve_ssse3.c
diff --git a/third_party/aom/av1/common/x86/reconinter_avx2.c b/media/libaom/src/av1/common/x86/reconinter_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/reconinter_avx2.c
rename to media/libaom/src/av1/common/x86/reconinter_avx2.c
diff --git a/third_party/aom/av1/common/x86/reconinter_sse4.c b/media/libaom/src/av1/common/x86/reconinter_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/reconinter_sse4.c
rename to media/libaom/src/av1/common/x86/reconinter_sse4.c
diff --git a/third_party/aom/av1/common/x86/reconinter_ssse3.c b/media/libaom/src/av1/common/x86/reconinter_ssse3.c
similarity index 100%
rename from third_party/aom/av1/common/x86/reconinter_ssse3.c
rename to media/libaom/src/av1/common/x86/reconinter_ssse3.c
diff --git a/third_party/aom/av1/common/x86/selfguided_avx2.c b/media/libaom/src/av1/common/x86/selfguided_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/selfguided_avx2.c
rename to media/libaom/src/av1/common/x86/selfguided_avx2.c
diff --git a/third_party/aom/av1/common/x86/selfguided_sse4.c b/media/libaom/src/av1/common/x86/selfguided_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/selfguided_sse4.c
rename to media/libaom/src/av1/common/x86/selfguided_sse4.c
diff --git a/third_party/aom/av1/common/x86/warp_plane_avx2.c b/media/libaom/src/av1/common/x86/warp_plane_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/warp_plane_avx2.c
rename to media/libaom/src/av1/common/x86/warp_plane_avx2.c
diff --git a/third_party/aom/av1/common/x86/warp_plane_sse2.c b/media/libaom/src/av1/common/x86/warp_plane_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/warp_plane_sse2.c
rename to media/libaom/src/av1/common/x86/warp_plane_sse2.c
diff --git a/third_party/aom/av1/common/x86/warp_plane_sse4.c b/media/libaom/src/av1/common/x86/warp_plane_sse4.c
similarity index 100%
rename from third_party/aom/av1/common/x86/warp_plane_sse4.c
rename to media/libaom/src/av1/common/x86/warp_plane_sse4.c
diff --git a/third_party/aom/av1/common/x86/wiener_convolve_avx2.c b/media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/wiener_convolve_avx2.c
rename to media/libaom/src/av1/common/x86/wiener_convolve_avx2.c
diff --git a/third_party/aom/av1/common/x86/wiener_convolve_sse2.c b/media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
similarity index 100%
rename from third_party/aom/av1/common/x86/wiener_convolve_sse2.c
rename to media/libaom/src/av1/common/x86/wiener_convolve_sse2.c
diff --git a/third_party/aom/av1/decoder/accounting.c b/media/libaom/src/av1/decoder/accounting.c
similarity index 100%
rename from third_party/aom/av1/decoder/accounting.c
rename to media/libaom/src/av1/decoder/accounting.c
diff --git a/third_party/aom/av1/decoder/accounting.h b/media/libaom/src/av1/decoder/accounting.h
similarity index 100%
rename from third_party/aom/av1/decoder/accounting.h
rename to media/libaom/src/av1/decoder/accounting.h
diff --git a/third_party/aom/av1/decoder/decodeframe.c b/media/libaom/src/av1/decoder/decodeframe.c
similarity index 100%
rename from third_party/aom/av1/decoder/decodeframe.c
rename to media/libaom/src/av1/decoder/decodeframe.c
diff --git a/third_party/aom/av1/decoder/decodeframe.h b/media/libaom/src/av1/decoder/decodeframe.h
similarity index 100%
rename from third_party/aom/av1/decoder/decodeframe.h
rename to media/libaom/src/av1/decoder/decodeframe.h
diff --git a/third_party/aom/av1/decoder/decodemv.c b/media/libaom/src/av1/decoder/decodemv.c
similarity index 100%
rename from third_party/aom/av1/decoder/decodemv.c
rename to media/libaom/src/av1/decoder/decodemv.c
diff --git a/third_party/aom/av1/decoder/decodemv.h b/media/libaom/src/av1/decoder/decodemv.h
similarity index 100%
rename from third_party/aom/av1/decoder/decodemv.h
rename to media/libaom/src/av1/decoder/decodemv.h
diff --git a/third_party/aom/av1/decoder/decoder.c b/media/libaom/src/av1/decoder/decoder.c
similarity index 100%
rename from third_party/aom/av1/decoder/decoder.c
rename to media/libaom/src/av1/decoder/decoder.c
diff --git a/third_party/aom/av1/decoder/decoder.h b/media/libaom/src/av1/decoder/decoder.h
similarity index 100%
rename from third_party/aom/av1/decoder/decoder.h
rename to media/libaom/src/av1/decoder/decoder.h
diff --git a/third_party/aom/av1/decoder/decodetxb.c b/media/libaom/src/av1/decoder/decodetxb.c
similarity index 100%
rename from third_party/aom/av1/decoder/decodetxb.c
rename to media/libaom/src/av1/decoder/decodetxb.c
diff --git a/third_party/aom/av1/decoder/decodetxb.h b/media/libaom/src/av1/decoder/decodetxb.h
similarity index 100%
rename from third_party/aom/av1/decoder/decodetxb.h
rename to media/libaom/src/av1/decoder/decodetxb.h
diff --git a/third_party/aom/av1/decoder/detokenize.c b/media/libaom/src/av1/decoder/detokenize.c
similarity index 100%
rename from third_party/aom/av1/decoder/detokenize.c
rename to media/libaom/src/av1/decoder/detokenize.c
diff --git a/third_party/aom/av1/decoder/detokenize.h b/media/libaom/src/av1/decoder/detokenize.h
similarity index 100%
rename from third_party/aom/av1/decoder/detokenize.h
rename to media/libaom/src/av1/decoder/detokenize.h
diff --git a/third_party/aom/av1/decoder/dthread.h b/media/libaom/src/av1/decoder/dthread.h
similarity index 100%
rename from third_party/aom/av1/decoder/dthread.h
rename to media/libaom/src/av1/decoder/dthread.h
diff --git a/third_party/aom/av1/decoder/inspection.c b/media/libaom/src/av1/decoder/inspection.c
similarity index 100%
rename from third_party/aom/av1/decoder/inspection.c
rename to media/libaom/src/av1/decoder/inspection.c
diff --git a/third_party/aom/av1/decoder/inspection.h b/media/libaom/src/av1/decoder/inspection.h
similarity index 100%
rename from third_party/aom/av1/decoder/inspection.h
rename to media/libaom/src/av1/decoder/inspection.h
diff --git a/third_party/aom/av1/decoder/obu.c b/media/libaom/src/av1/decoder/obu.c
similarity index 100%
rename from third_party/aom/av1/decoder/obu.c
rename to media/libaom/src/av1/decoder/obu.c
diff --git a/third_party/aom/av1/decoder/obu.h b/media/libaom/src/av1/decoder/obu.h
similarity index 100%
rename from third_party/aom/av1/decoder/obu.h
rename to media/libaom/src/av1/decoder/obu.h
diff --git a/third_party/aom/av1/encoder/aq_complexity.c b/media/libaom/src/av1/encoder/aq_complexity.c
similarity index 100%
rename from third_party/aom/av1/encoder/aq_complexity.c
rename to media/libaom/src/av1/encoder/aq_complexity.c
diff --git a/third_party/aom/av1/encoder/aq_complexity.h b/media/libaom/src/av1/encoder/aq_complexity.h
similarity index 100%
rename from third_party/aom/av1/encoder/aq_complexity.h
rename to media/libaom/src/av1/encoder/aq_complexity.h
diff --git a/third_party/aom/av1/encoder/aq_cyclicrefresh.c b/media/libaom/src/av1/encoder/aq_cyclicrefresh.c
similarity index 100%
rename from third_party/aom/av1/encoder/aq_cyclicrefresh.c
rename to media/libaom/src/av1/encoder/aq_cyclicrefresh.c
diff --git a/third_party/aom/av1/encoder/aq_cyclicrefresh.h b/media/libaom/src/av1/encoder/aq_cyclicrefresh.h
similarity index 100%
rename from third_party/aom/av1/encoder/aq_cyclicrefresh.h
rename to media/libaom/src/av1/encoder/aq_cyclicrefresh.h
diff --git a/third_party/aom/av1/encoder/aq_variance.c b/media/libaom/src/av1/encoder/aq_variance.c
similarity index 100%
rename from third_party/aom/av1/encoder/aq_variance.c
rename to media/libaom/src/av1/encoder/aq_variance.c
diff --git a/third_party/aom/av1/encoder/aq_variance.h b/media/libaom/src/av1/encoder/aq_variance.h
similarity index 100%
rename from third_party/aom/av1/encoder/aq_variance.h
rename to media/libaom/src/av1/encoder/aq_variance.h
diff --git a/third_party/aom/av1/encoder/arm/neon/av1_error_neon.c b/media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c
similarity index 100%
rename from third_party/aom/av1/encoder/arm/neon/av1_error_neon.c
rename to media/libaom/src/av1/encoder/arm/neon/av1_error_neon.c
diff --git a/third_party/aom/av1/encoder/arm/neon/quantize_neon.c b/media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
similarity index 100%
rename from third_party/aom/av1/encoder/arm/neon/quantize_neon.c
rename to media/libaom/src/av1/encoder/arm/neon/quantize_neon.c
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d.c b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm1d.c
rename to media/libaom/src/av1/encoder/av1_fwd_txfm1d.c
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d.h b/media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm1d.h
rename to media/libaom/src/av1/encoder/av1_fwd_txfm1d.h
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h b/media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm1d_cfg.h
rename to media/libaom/src/av1/encoder/av1_fwd_txfm1d_cfg.h
diff --git a/third_party/aom/av1/encoder/av1_fwd_txfm2d.c b/media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_fwd_txfm2d.c
rename to media/libaom/src/av1/encoder/av1_fwd_txfm2d.c
diff --git a/third_party/aom/av1/encoder/av1_multi_thread.c b/media/libaom/src/av1/encoder/av1_multi_thread.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_multi_thread.c
rename to media/libaom/src/av1/encoder/av1_multi_thread.c
diff --git a/third_party/aom/av1/encoder/av1_multi_thread.h b/media/libaom/src/av1/encoder/av1_multi_thread.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_multi_thread.h
rename to media/libaom/src/av1/encoder/av1_multi_thread.h
diff --git a/third_party/aom/av1/encoder/av1_quantize.c b/media/libaom/src/av1/encoder/av1_quantize.c
similarity index 100%
rename from third_party/aom/av1/encoder/av1_quantize.c
rename to media/libaom/src/av1/encoder/av1_quantize.c
diff --git a/third_party/aom/av1/encoder/av1_quantize.h b/media/libaom/src/av1/encoder/av1_quantize.h
similarity index 100%
rename from third_party/aom/av1/encoder/av1_quantize.h
rename to media/libaom/src/av1/encoder/av1_quantize.h
diff --git a/third_party/aom/av1/encoder/bitstream.c b/media/libaom/src/av1/encoder/bitstream.c
similarity index 100%
rename from third_party/aom/av1/encoder/bitstream.c
rename to media/libaom/src/av1/encoder/bitstream.c
diff --git a/third_party/aom/av1/encoder/bitstream.h b/media/libaom/src/av1/encoder/bitstream.h
similarity index 100%
rename from third_party/aom/av1/encoder/bitstream.h
rename to media/libaom/src/av1/encoder/bitstream.h
diff --git a/third_party/aom/av1/encoder/block.h b/media/libaom/src/av1/encoder/block.h
similarity index 100%
rename from third_party/aom/av1/encoder/block.h
rename to media/libaom/src/av1/encoder/block.h
diff --git a/third_party/aom/av1/encoder/blockiness.c b/media/libaom/src/av1/encoder/blockiness.c
similarity index 100%
rename from third_party/aom/av1/encoder/blockiness.c
rename to media/libaom/src/av1/encoder/blockiness.c
diff --git a/third_party/aom/av1/encoder/cnn.c b/media/libaom/src/av1/encoder/cnn.c
similarity index 100%
rename from third_party/aom/av1/encoder/cnn.c
rename to media/libaom/src/av1/encoder/cnn.c
diff --git a/third_party/aom/av1/encoder/cnn.h b/media/libaom/src/av1/encoder/cnn.h
similarity index 100%
rename from third_party/aom/av1/encoder/cnn.h
rename to media/libaom/src/av1/encoder/cnn.h
diff --git a/third_party/aom/av1/encoder/context_tree.c b/media/libaom/src/av1/encoder/context_tree.c
similarity index 100%
rename from third_party/aom/av1/encoder/context_tree.c
rename to media/libaom/src/av1/encoder/context_tree.c
diff --git a/third_party/aom/av1/encoder/context_tree.h b/media/libaom/src/av1/encoder/context_tree.h
similarity index 100%
rename from third_party/aom/av1/encoder/context_tree.h
rename to media/libaom/src/av1/encoder/context_tree.h
diff --git a/third_party/aom/av1/encoder/corner_detect.c b/media/libaom/src/av1/encoder/corner_detect.c
similarity index 100%
rename from third_party/aom/av1/encoder/corner_detect.c
rename to media/libaom/src/av1/encoder/corner_detect.c
diff --git a/third_party/aom/av1/encoder/corner_detect.h b/media/libaom/src/av1/encoder/corner_detect.h
similarity index 100%
rename from third_party/aom/av1/encoder/corner_detect.h
rename to media/libaom/src/av1/encoder/corner_detect.h
diff --git a/third_party/aom/av1/encoder/corner_match.c b/media/libaom/src/av1/encoder/corner_match.c
similarity index 100%
rename from third_party/aom/av1/encoder/corner_match.c
rename to media/libaom/src/av1/encoder/corner_match.c
diff --git a/third_party/aom/av1/encoder/corner_match.h b/media/libaom/src/av1/encoder/corner_match.h
similarity index 100%
rename from third_party/aom/av1/encoder/corner_match.h
rename to media/libaom/src/av1/encoder/corner_match.h
diff --git a/third_party/aom/av1/encoder/cost.c b/media/libaom/src/av1/encoder/cost.c
similarity index 100%
rename from third_party/aom/av1/encoder/cost.c
rename to media/libaom/src/av1/encoder/cost.c
diff --git a/third_party/aom/av1/encoder/cost.h b/media/libaom/src/av1/encoder/cost.h
similarity index 100%
rename from third_party/aom/av1/encoder/cost.h
rename to media/libaom/src/av1/encoder/cost.h
diff --git a/third_party/aom/av1/encoder/dwt.c b/media/libaom/src/av1/encoder/dwt.c
similarity index 100%
rename from third_party/aom/av1/encoder/dwt.c
rename to media/libaom/src/av1/encoder/dwt.c
diff --git a/third_party/aom/av1/encoder/dwt.h b/media/libaom/src/av1/encoder/dwt.h
similarity index 100%
rename from third_party/aom/av1/encoder/dwt.h
rename to media/libaom/src/av1/encoder/dwt.h
diff --git a/third_party/aom/av1/encoder/enc_enums.h b/media/libaom/src/av1/encoder/enc_enums.h
similarity index 100%
rename from third_party/aom/av1/encoder/enc_enums.h
rename to media/libaom/src/av1/encoder/enc_enums.h
diff --git a/third_party/aom/av1/encoder/encode_strategy.c b/media/libaom/src/av1/encoder/encode_strategy.c
similarity index 100%
rename from third_party/aom/av1/encoder/encode_strategy.c
rename to media/libaom/src/av1/encoder/encode_strategy.c
diff --git a/third_party/aom/av1/encoder/encode_strategy.h b/media/libaom/src/av1/encoder/encode_strategy.h
similarity index 100%
rename from third_party/aom/av1/encoder/encode_strategy.h
rename to media/libaom/src/av1/encoder/encode_strategy.h
diff --git a/third_party/aom/av1/encoder/encodeframe.c b/media/libaom/src/av1/encoder/encodeframe.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodeframe.c
rename to media/libaom/src/av1/encoder/encodeframe.c
diff --git a/third_party/aom/av1/encoder/encodeframe.h b/media/libaom/src/av1/encoder/encodeframe.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodeframe.h
rename to media/libaom/src/av1/encoder/encodeframe.h
diff --git a/third_party/aom/av1/encoder/encodemb.c b/media/libaom/src/av1/encoder/encodemb.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodemb.c
rename to media/libaom/src/av1/encoder/encodemb.c
diff --git a/third_party/aom/av1/encoder/encodemb.h b/media/libaom/src/av1/encoder/encodemb.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodemb.h
rename to media/libaom/src/av1/encoder/encodemb.h
diff --git a/third_party/aom/av1/encoder/encodemv.c b/media/libaom/src/av1/encoder/encodemv.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodemv.c
rename to media/libaom/src/av1/encoder/encodemv.c
diff --git a/third_party/aom/av1/encoder/encodemv.h b/media/libaom/src/av1/encoder/encodemv.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodemv.h
rename to media/libaom/src/av1/encoder/encodemv.h
diff --git a/third_party/aom/av1/encoder/encoder.c b/media/libaom/src/av1/encoder/encoder.c
similarity index 100%
rename from third_party/aom/av1/encoder/encoder.c
rename to media/libaom/src/av1/encoder/encoder.c
diff --git a/third_party/aom/av1/encoder/encoder.h b/media/libaom/src/av1/encoder/encoder.h
similarity index 100%
rename from third_party/aom/av1/encoder/encoder.h
rename to media/libaom/src/av1/encoder/encoder.h
diff --git a/third_party/aom/av1/encoder/encodetxb.c b/media/libaom/src/av1/encoder/encodetxb.c
similarity index 100%
rename from third_party/aom/av1/encoder/encodetxb.c
rename to media/libaom/src/av1/encoder/encodetxb.c
diff --git a/third_party/aom/av1/encoder/encodetxb.h b/media/libaom/src/av1/encoder/encodetxb.h
similarity index 100%
rename from third_party/aom/av1/encoder/encodetxb.h
rename to media/libaom/src/av1/encoder/encodetxb.h
diff --git a/third_party/aom/av1/encoder/ethread.c b/media/libaom/src/av1/encoder/ethread.c
similarity index 100%
rename from third_party/aom/av1/encoder/ethread.c
rename to media/libaom/src/av1/encoder/ethread.c
diff --git a/third_party/aom/av1/encoder/ethread.h b/media/libaom/src/av1/encoder/ethread.h
similarity index 100%
rename from third_party/aom/av1/encoder/ethread.h
rename to media/libaom/src/av1/encoder/ethread.h
diff --git a/third_party/aom/av1/encoder/extend.c b/media/libaom/src/av1/encoder/extend.c
similarity index 100%
rename from third_party/aom/av1/encoder/extend.c
rename to media/libaom/src/av1/encoder/extend.c
diff --git a/third_party/aom/av1/encoder/extend.h b/media/libaom/src/av1/encoder/extend.h
similarity index 100%
rename from third_party/aom/av1/encoder/extend.h
rename to media/libaom/src/av1/encoder/extend.h
diff --git a/third_party/aom/av1/encoder/firstpass.c b/media/libaom/src/av1/encoder/firstpass.c
similarity index 100%
rename from third_party/aom/av1/encoder/firstpass.c
rename to media/libaom/src/av1/encoder/firstpass.c
diff --git a/third_party/aom/av1/encoder/firstpass.h b/media/libaom/src/av1/encoder/firstpass.h
similarity index 100%
rename from third_party/aom/av1/encoder/firstpass.h
rename to media/libaom/src/av1/encoder/firstpass.h
diff --git a/third_party/aom/av1/encoder/global_motion.c b/media/libaom/src/av1/encoder/global_motion.c
similarity index 100%
rename from third_party/aom/av1/encoder/global_motion.c
rename to media/libaom/src/av1/encoder/global_motion.c
diff --git a/third_party/aom/av1/encoder/global_motion.h b/media/libaom/src/av1/encoder/global_motion.h
similarity index 100%
rename from third_party/aom/av1/encoder/global_motion.h
rename to media/libaom/src/av1/encoder/global_motion.h
diff --git a/third_party/aom/av1/encoder/gop_structure.c b/media/libaom/src/av1/encoder/gop_structure.c
similarity index 100%
rename from third_party/aom/av1/encoder/gop_structure.c
rename to media/libaom/src/av1/encoder/gop_structure.c
diff --git a/third_party/aom/av1/encoder/gop_structure.h b/media/libaom/src/av1/encoder/gop_structure.h
similarity index 100%
rename from third_party/aom/av1/encoder/gop_structure.h
rename to media/libaom/src/av1/encoder/gop_structure.h
diff --git a/third_party/aom/av1/encoder/grain_test_vectors.h b/media/libaom/src/av1/encoder/grain_test_vectors.h
similarity index 100%
rename from third_party/aom/av1/encoder/grain_test_vectors.h
rename to media/libaom/src/av1/encoder/grain_test_vectors.h
diff --git a/third_party/aom/av1/encoder/hash.c b/media/libaom/src/av1/encoder/hash.c
similarity index 100%
rename from third_party/aom/av1/encoder/hash.c
rename to media/libaom/src/av1/encoder/hash.c
diff --git a/third_party/aom/av1/encoder/hash.h b/media/libaom/src/av1/encoder/hash.h
similarity index 100%
rename from third_party/aom/av1/encoder/hash.h
rename to media/libaom/src/av1/encoder/hash.h
diff --git a/third_party/aom/av1/encoder/hash_motion.c b/media/libaom/src/av1/encoder/hash_motion.c
similarity index 100%
rename from third_party/aom/av1/encoder/hash_motion.c
rename to media/libaom/src/av1/encoder/hash_motion.c
diff --git a/third_party/aom/av1/encoder/hash_motion.h b/media/libaom/src/av1/encoder/hash_motion.h
similarity index 100%
rename from third_party/aom/av1/encoder/hash_motion.h
rename to media/libaom/src/av1/encoder/hash_motion.h
diff --git a/third_party/aom/av1/encoder/hybrid_fwd_txfm.c b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
similarity index 100%
rename from third_party/aom/av1/encoder/hybrid_fwd_txfm.c
rename to media/libaom/src/av1/encoder/hybrid_fwd_txfm.c
diff --git a/third_party/aom/av1/encoder/hybrid_fwd_txfm.h b/media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
similarity index 100%
rename from third_party/aom/av1/encoder/hybrid_fwd_txfm.h
rename to media/libaom/src/av1/encoder/hybrid_fwd_txfm.h
diff --git a/third_party/aom/av1/encoder/k_means_template.h b/media/libaom/src/av1/encoder/k_means_template.h
similarity index 100%
rename from third_party/aom/av1/encoder/k_means_template.h
rename to media/libaom/src/av1/encoder/k_means_template.h
diff --git a/third_party/aom/av1/encoder/level.c b/media/libaom/src/av1/encoder/level.c
similarity index 100%
rename from third_party/aom/av1/encoder/level.c
rename to media/libaom/src/av1/encoder/level.c
diff --git a/third_party/aom/av1/encoder/level.h b/media/libaom/src/av1/encoder/level.h
similarity index 100%
rename from third_party/aom/av1/encoder/level.h
rename to media/libaom/src/av1/encoder/level.h
diff --git a/third_party/aom/av1/encoder/lookahead.c b/media/libaom/src/av1/encoder/lookahead.c
similarity index 100%
rename from third_party/aom/av1/encoder/lookahead.c
rename to media/libaom/src/av1/encoder/lookahead.c
diff --git a/third_party/aom/av1/encoder/lookahead.h b/media/libaom/src/av1/encoder/lookahead.h
similarity index 100%
rename from third_party/aom/av1/encoder/lookahead.h
rename to media/libaom/src/av1/encoder/lookahead.h
diff --git a/third_party/aom/av1/encoder/mathutils.h b/media/libaom/src/av1/encoder/mathutils.h
similarity index 100%
rename from third_party/aom/av1/encoder/mathutils.h
rename to media/libaom/src/av1/encoder/mathutils.h
diff --git a/third_party/aom/av1/encoder/mbgraph.c b/media/libaom/src/av1/encoder/mbgraph.c
similarity index 100%
rename from third_party/aom/av1/encoder/mbgraph.c
rename to media/libaom/src/av1/encoder/mbgraph.c
diff --git a/third_party/aom/av1/encoder/mbgraph.h b/media/libaom/src/av1/encoder/mbgraph.h
similarity index 100%
rename from third_party/aom/av1/encoder/mbgraph.h
rename to media/libaom/src/av1/encoder/mbgraph.h
diff --git a/third_party/aom/av1/encoder/mcomp.c b/media/libaom/src/av1/encoder/mcomp.c
similarity index 100%
rename from third_party/aom/av1/encoder/mcomp.c
rename to media/libaom/src/av1/encoder/mcomp.c
diff --git a/third_party/aom/av1/encoder/mcomp.h b/media/libaom/src/av1/encoder/mcomp.h
similarity index 100%
rename from third_party/aom/av1/encoder/mcomp.h
rename to media/libaom/src/av1/encoder/mcomp.h
diff --git a/third_party/aom/av1/encoder/mips/msa/error_msa.c b/media/libaom/src/av1/encoder/mips/msa/error_msa.c
similarity index 100%
rename from third_party/aom/av1/encoder/mips/msa/error_msa.c
rename to media/libaom/src/av1/encoder/mips/msa/error_msa.c
diff --git a/third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c b/media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
similarity index 100%
rename from third_party/aom/av1/encoder/mips/msa/fdct4x4_msa.c
rename to media/libaom/src/av1/encoder/mips/msa/fdct4x4_msa.c
diff --git a/third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c b/media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
similarity index 100%
rename from third_party/aom/av1/encoder/mips/msa/temporal_filter_msa.c
rename to media/libaom/src/av1/encoder/mips/msa/temporal_filter_msa.c
diff --git a/third_party/aom/av1/encoder/ml.c b/media/libaom/src/av1/encoder/ml.c
similarity index 100%
rename from third_party/aom/av1/encoder/ml.c
rename to media/libaom/src/av1/encoder/ml.c
diff --git a/third_party/aom/av1/encoder/ml.h b/media/libaom/src/av1/encoder/ml.h
similarity index 100%
rename from third_party/aom/av1/encoder/ml.h
rename to media/libaom/src/av1/encoder/ml.h
diff --git a/third_party/aom/av1/encoder/mode_prune_model_weights.h b/media/libaom/src/av1/encoder/mode_prune_model_weights.h
similarity index 100%
rename from third_party/aom/av1/encoder/mode_prune_model_weights.h
rename to media/libaom/src/av1/encoder/mode_prune_model_weights.h
diff --git a/third_party/aom/av1/encoder/nonrd_pickmode.c b/media/libaom/src/av1/encoder/nonrd_pickmode.c
similarity index 100%
rename from third_party/aom/av1/encoder/nonrd_pickmode.c
rename to media/libaom/src/av1/encoder/nonrd_pickmode.c
diff --git a/third_party/aom/av1/encoder/palette.c b/media/libaom/src/av1/encoder/palette.c
similarity index 100%
rename from third_party/aom/av1/encoder/palette.c
rename to media/libaom/src/av1/encoder/palette.c
diff --git a/third_party/aom/av1/encoder/palette.h b/media/libaom/src/av1/encoder/palette.h
similarity index 100%
rename from third_party/aom/av1/encoder/palette.h
rename to media/libaom/src/av1/encoder/palette.h
diff --git a/third_party/aom/av1/encoder/partition_cnn_weights.h b/media/libaom/src/av1/encoder/partition_cnn_weights.h
similarity index 100%
rename from third_party/aom/av1/encoder/partition_cnn_weights.h
rename to media/libaom/src/av1/encoder/partition_cnn_weights.h
diff --git a/third_party/aom/av1/encoder/partition_model_weights.h b/media/libaom/src/av1/encoder/partition_model_weights.h
similarity index 100%
rename from third_party/aom/av1/encoder/partition_model_weights.h
rename to media/libaom/src/av1/encoder/partition_model_weights.h
diff --git a/third_party/aom/av1/encoder/partition_strategy.c b/media/libaom/src/av1/encoder/partition_strategy.c
similarity index 100%
rename from third_party/aom/av1/encoder/partition_strategy.c
rename to media/libaom/src/av1/encoder/partition_strategy.c
diff --git a/third_party/aom/av1/encoder/partition_strategy.h b/media/libaom/src/av1/encoder/partition_strategy.h
similarity index 100%
rename from third_party/aom/av1/encoder/partition_strategy.h
rename to media/libaom/src/av1/encoder/partition_strategy.h
diff --git a/third_party/aom/av1/encoder/pass2_strategy.c b/media/libaom/src/av1/encoder/pass2_strategy.c
similarity index 100%
rename from third_party/aom/av1/encoder/pass2_strategy.c
rename to media/libaom/src/av1/encoder/pass2_strategy.c
diff --git a/third_party/aom/av1/encoder/pass2_strategy.h b/media/libaom/src/av1/encoder/pass2_strategy.h
similarity index 100%
rename from third_party/aom/av1/encoder/pass2_strategy.h
rename to media/libaom/src/av1/encoder/pass2_strategy.h
diff --git a/third_party/aom/av1/encoder/pickcdef.c b/media/libaom/src/av1/encoder/pickcdef.c
similarity index 100%
rename from third_party/aom/av1/encoder/pickcdef.c
rename to media/libaom/src/av1/encoder/pickcdef.c
diff --git a/third_party/aom/av1/encoder/picklpf.c b/media/libaom/src/av1/encoder/picklpf.c
similarity index 100%
rename from third_party/aom/av1/encoder/picklpf.c
rename to media/libaom/src/av1/encoder/picklpf.c
diff --git a/third_party/aom/av1/encoder/picklpf.h b/media/libaom/src/av1/encoder/picklpf.h
similarity index 100%
rename from third_party/aom/av1/encoder/picklpf.h
rename to media/libaom/src/av1/encoder/picklpf.h
diff --git a/third_party/aom/av1/encoder/pickrst.c b/media/libaom/src/av1/encoder/pickrst.c
similarity index 100%
rename from third_party/aom/av1/encoder/pickrst.c
rename to media/libaom/src/av1/encoder/pickrst.c
diff --git a/third_party/aom/av1/encoder/pickrst.h b/media/libaom/src/av1/encoder/pickrst.h
similarity index 100%
rename from third_party/aom/av1/encoder/pickrst.h
rename to media/libaom/src/av1/encoder/pickrst.h
diff --git a/third_party/aom/av1/encoder/pustats.h b/media/libaom/src/av1/encoder/pustats.h
similarity index 100%
rename from third_party/aom/av1/encoder/pustats.h
rename to media/libaom/src/av1/encoder/pustats.h
diff --git a/third_party/aom/av1/encoder/random.h b/media/libaom/src/av1/encoder/random.h
similarity index 100%
rename from third_party/aom/av1/encoder/random.h
rename to media/libaom/src/av1/encoder/random.h
diff --git a/third_party/aom/av1/encoder/ransac.c b/media/libaom/src/av1/encoder/ransac.c
similarity index 100%
rename from third_party/aom/av1/encoder/ransac.c
rename to media/libaom/src/av1/encoder/ransac.c
diff --git a/third_party/aom/av1/encoder/ransac.h b/media/libaom/src/av1/encoder/ransac.h
similarity index 100%
rename from third_party/aom/av1/encoder/ransac.h
rename to media/libaom/src/av1/encoder/ransac.h
diff --git a/third_party/aom/av1/encoder/rate_distortion_model_params.h b/media/libaom/src/av1/encoder/rate_distortion_model_params.h
similarity index 100%
rename from third_party/aom/av1/encoder/rate_distortion_model_params.h
rename to media/libaom/src/av1/encoder/rate_distortion_model_params.h
diff --git a/third_party/aom/av1/encoder/ratectrl.c b/media/libaom/src/av1/encoder/ratectrl.c
similarity index 100%
rename from third_party/aom/av1/encoder/ratectrl.c
rename to media/libaom/src/av1/encoder/ratectrl.c
diff --git a/third_party/aom/av1/encoder/ratectrl.h b/media/libaom/src/av1/encoder/ratectrl.h
similarity index 100%
rename from third_party/aom/av1/encoder/ratectrl.h
rename to media/libaom/src/av1/encoder/ratectrl.h
diff --git a/third_party/aom/av1/encoder/rd.c b/media/libaom/src/av1/encoder/rd.c
similarity index 100%
rename from third_party/aom/av1/encoder/rd.c
rename to media/libaom/src/av1/encoder/rd.c
diff --git a/third_party/aom/av1/encoder/rd.h b/media/libaom/src/av1/encoder/rd.h
similarity index 100%
rename from third_party/aom/av1/encoder/rd.h
rename to media/libaom/src/av1/encoder/rd.h
diff --git a/third_party/aom/av1/encoder/rdopt.c b/media/libaom/src/av1/encoder/rdopt.c
similarity index 100%
rename from third_party/aom/av1/encoder/rdopt.c
rename to media/libaom/src/av1/encoder/rdopt.c
diff --git a/third_party/aom/av1/encoder/rdopt.h b/media/libaom/src/av1/encoder/rdopt.h
similarity index 100%
rename from third_party/aom/av1/encoder/rdopt.h
rename to media/libaom/src/av1/encoder/rdopt.h
diff --git a/third_party/aom/av1/encoder/reconinter_enc.c b/media/libaom/src/av1/encoder/reconinter_enc.c
similarity index 100%
rename from third_party/aom/av1/encoder/reconinter_enc.c
rename to media/libaom/src/av1/encoder/reconinter_enc.c
diff --git a/third_party/aom/av1/encoder/reconinter_enc.h b/media/libaom/src/av1/encoder/reconinter_enc.h
similarity index 100%
rename from third_party/aom/av1/encoder/reconinter_enc.h
rename to media/libaom/src/av1/encoder/reconinter_enc.h
diff --git a/third_party/aom/av1/encoder/segmentation.c b/media/libaom/src/av1/encoder/segmentation.c
similarity index 100%
rename from third_party/aom/av1/encoder/segmentation.c
rename to media/libaom/src/av1/encoder/segmentation.c
diff --git a/third_party/aom/av1/encoder/segmentation.h b/media/libaom/src/av1/encoder/segmentation.h
similarity index 100%
rename from third_party/aom/av1/encoder/segmentation.h
rename to media/libaom/src/av1/encoder/segmentation.h
diff --git a/third_party/aom/av1/encoder/speed_features.c b/media/libaom/src/av1/encoder/speed_features.c
similarity index 100%
rename from third_party/aom/av1/encoder/speed_features.c
rename to media/libaom/src/av1/encoder/speed_features.c
diff --git a/third_party/aom/av1/encoder/speed_features.h b/media/libaom/src/av1/encoder/speed_features.h
similarity index 100%
rename from third_party/aom/av1/encoder/speed_features.h
rename to media/libaom/src/av1/encoder/speed_features.h
diff --git a/third_party/aom/av1/encoder/svc_layercontext.c b/media/libaom/src/av1/encoder/svc_layercontext.c
similarity index 100%
rename from third_party/aom/av1/encoder/svc_layercontext.c
rename to media/libaom/src/av1/encoder/svc_layercontext.c
diff --git a/third_party/aom/av1/encoder/svc_layercontext.h b/media/libaom/src/av1/encoder/svc_layercontext.h
similarity index 100%
rename from third_party/aom/av1/encoder/svc_layercontext.h
rename to media/libaom/src/av1/encoder/svc_layercontext.h
diff --git a/third_party/aom/av1/encoder/temporal_filter.c b/media/libaom/src/av1/encoder/temporal_filter.c
similarity index 100%
rename from third_party/aom/av1/encoder/temporal_filter.c
rename to media/libaom/src/av1/encoder/temporal_filter.c
diff --git a/third_party/aom/av1/encoder/temporal_filter.h b/media/libaom/src/av1/encoder/temporal_filter.h
similarity index 100%
rename from third_party/aom/av1/encoder/temporal_filter.h
rename to media/libaom/src/av1/encoder/temporal_filter.h
diff --git a/third_party/aom/av1/encoder/tokenize.c b/media/libaom/src/av1/encoder/tokenize.c
similarity index 100%
rename from third_party/aom/av1/encoder/tokenize.c
rename to media/libaom/src/av1/encoder/tokenize.c
diff --git a/third_party/aom/av1/encoder/tokenize.h b/media/libaom/src/av1/encoder/tokenize.h
similarity index 100%
rename from third_party/aom/av1/encoder/tokenize.h
rename to media/libaom/src/av1/encoder/tokenize.h
diff --git a/third_party/aom/av1/encoder/tpl_model.c b/media/libaom/src/av1/encoder/tpl_model.c
similarity index 100%
rename from third_party/aom/av1/encoder/tpl_model.c
rename to media/libaom/src/av1/encoder/tpl_model.c
diff --git a/third_party/aom/av1/encoder/tpl_model.h b/media/libaom/src/av1/encoder/tpl_model.h
similarity index 100%
rename from third_party/aom/av1/encoder/tpl_model.h
rename to media/libaom/src/av1/encoder/tpl_model.h
diff --git a/third_party/aom/av1/encoder/tx_prune_model_weights.h b/media/libaom/src/av1/encoder/tx_prune_model_weights.h
similarity index 100%
rename from third_party/aom/av1/encoder/tx_prune_model_weights.h
rename to media/libaom/src/av1/encoder/tx_prune_model_weights.h
diff --git a/third_party/aom/av1/encoder/use_flat_gop_model_params.h b/media/libaom/src/av1/encoder/use_flat_gop_model_params.h
similarity index 100%
rename from third_party/aom/av1/encoder/use_flat_gop_model_params.h
rename to media/libaom/src/av1/encoder/use_flat_gop_model_params.h
diff --git a/third_party/aom/av1/encoder/var_based_part.c b/media/libaom/src/av1/encoder/var_based_part.c
similarity index 100%
rename from third_party/aom/av1/encoder/var_based_part.c
rename to media/libaom/src/av1/encoder/var_based_part.c
diff --git a/third_party/aom/av1/encoder/var_based_part.h b/media/libaom/src/av1/encoder/var_based_part.h
similarity index 100%
rename from third_party/aom/av1/encoder/var_based_part.h
rename to media/libaom/src/av1/encoder/var_based_part.h
diff --git a/third_party/aom/av1/encoder/wedge_utils.c b/media/libaom/src/av1/encoder/wedge_utils.c
similarity index 100%
rename from third_party/aom/av1/encoder/wedge_utils.c
rename to media/libaom/src/av1/encoder/wedge_utils.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm1d_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm2d_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm_avx2.h
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm_avx2.h
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.c
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h b/media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_fwd_txfm_sse2.h
rename to media/libaom/src/av1/encoder/x86/av1_fwd_txfm_sse2.h
diff --git a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_highbd_quantize_avx2.c
rename to media/libaom/src/av1/encoder/x86/av1_highbd_quantize_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c b/media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_highbd_quantize_sse4.c
rename to media/libaom/src/av1/encoder/x86/av1_highbd_quantize_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_avx2.c b/media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_quantize_avx2.c
rename to media/libaom/src/av1/encoder/x86/av1_quantize_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_sse2.c b/media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_quantize_sse2.c
rename to media/libaom/src/av1/encoder/x86/av1_quantize_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm b/media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
rename to media/libaom/src/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
diff --git a/third_party/aom/av1/encoder/x86/av1_ssim_opt_x86_64.asm b/media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_ssim_opt_x86_64.asm
rename to media/libaom/src/av1/encoder/x86/av1_ssim_opt_x86_64.asm
diff --git a/third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h b/media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/av1_txfm1d_sse4.h
rename to media/libaom/src/av1/encoder/x86/av1_txfm1d_sse4.h
diff --git a/third_party/aom/av1/encoder/x86/corner_match_avx2.c b/media/libaom/src/av1/encoder/x86/corner_match_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/corner_match_avx2.c
rename to media/libaom/src/av1/encoder/x86/corner_match_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/corner_match_sse4.c b/media/libaom/src/av1/encoder/x86/corner_match_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/corner_match_sse4.c
rename to media/libaom/src/av1/encoder/x86/corner_match_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/dct_sse2.asm b/media/libaom/src/av1/encoder/x86/dct_sse2.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/dct_sse2.asm
rename to media/libaom/src/av1/encoder/x86/dct_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_avx2.c b/media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/encodetxb_avx2.c
rename to media/libaom/src/av1/encoder/x86/encodetxb_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_sse2.c b/media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/encodetxb_sse2.c
rename to media/libaom/src/av1/encoder/x86/encodetxb_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/encodetxb_sse4.c b/media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/encodetxb_sse4.c
rename to media/libaom/src/av1/encoder/x86/encodetxb_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/error_intrin_avx2.c b/media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/error_intrin_avx2.c
rename to media/libaom/src/av1/encoder/x86/error_intrin_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/error_sse2.asm b/media/libaom/src/av1/encoder/x86/error_sse2.asm
similarity index 100%
rename from third_party/aom/av1/encoder/x86/error_sse2.asm
rename to media/libaom/src/av1/encoder/x86/error_sse2.asm
diff --git a/third_party/aom/av1/encoder/x86/hash_sse42.c b/media/libaom/src/av1/encoder/x86/hash_sse42.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/hash_sse42.c
rename to media/libaom/src/av1/encoder/x86/hash_sse42.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_block_error_intrin_avx2.c b/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_block_error_intrin_avx2.c
rename to media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c b/media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_block_error_intrin_sse2.c
rename to media/libaom/src/av1/encoder/x86/highbd_block_error_intrin_sse2.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_fwd_txfm_avx2.c b/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_fwd_txfm_avx2.c
rename to media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c b/media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_fwd_txfm_sse4.c
rename to media/libaom/src/av1/encoder/x86/highbd_fwd_txfm_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/highbd_temporal_filter_sse4.c b/media/libaom/src/av1/encoder/x86/highbd_temporal_filter_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/highbd_temporal_filter_sse4.c
rename to media/libaom/src/av1/encoder/x86/highbd_temporal_filter_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/ml_sse3.c b/media/libaom/src/av1/encoder/x86/ml_sse3.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/ml_sse3.c
rename to media/libaom/src/av1/encoder/x86/ml_sse3.c
diff --git a/third_party/aom/av1/encoder/x86/pickrst_avx2.c b/media/libaom/src/av1/encoder/x86/pickrst_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/pickrst_avx2.c
rename to media/libaom/src/av1/encoder/x86/pickrst_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/pickrst_sse4.c b/media/libaom/src/av1/encoder/x86/pickrst_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/pickrst_sse4.c
rename to media/libaom/src/av1/encoder/x86/pickrst_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/rdopt_avx2.c b/media/libaom/src/av1/encoder/x86/rdopt_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/rdopt_avx2.c
rename to media/libaom/src/av1/encoder/x86/rdopt_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/rdopt_sse4.c b/media/libaom/src/av1/encoder/x86/rdopt_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/rdopt_sse4.c
rename to media/libaom/src/av1/encoder/x86/rdopt_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/temporal_filter_constants.h b/media/libaom/src/av1/encoder/x86/temporal_filter_constants.h
similarity index 100%
rename from third_party/aom/av1/encoder/x86/temporal_filter_constants.h
rename to media/libaom/src/av1/encoder/x86/temporal_filter_constants.h
diff --git a/third_party/aom/av1/encoder/x86/temporal_filter_sse4.c b/media/libaom/src/av1/encoder/x86/temporal_filter_sse4.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/temporal_filter_sse4.c
rename to media/libaom/src/av1/encoder/x86/temporal_filter_sse4.c
diff --git a/third_party/aom/av1/encoder/x86/wedge_utils_avx2.c b/media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/wedge_utils_avx2.c
rename to media/libaom/src/av1/encoder/x86/wedge_utils_avx2.c
diff --git a/third_party/aom/av1/encoder/x86/wedge_utils_sse2.c b/media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
similarity index 100%
rename from third_party/aom/av1/encoder/x86/wedge_utils_sse2.c
rename to media/libaom/src/av1/encoder/x86/wedge_utils_sse2.c
diff --git a/third_party/aom/av1/exports_com b/media/libaom/src/av1/exports_com
similarity index 100%
rename from third_party/aom/av1/exports_com
rename to media/libaom/src/av1/exports_com
diff --git a/third_party/aom/av1/exports_dec b/media/libaom/src/av1/exports_dec
similarity index 100%
rename from third_party/aom/av1/exports_dec
rename to media/libaom/src/av1/exports_dec
diff --git a/third_party/aom/av1/exports_enc b/media/libaom/src/av1/exports_enc
similarity index 100%
rename from third_party/aom/av1/exports_enc
rename to media/libaom/src/av1/exports_enc
diff --git a/third_party/aom/av1/exports_ident b/media/libaom/src/av1/exports_ident
similarity index 100%
rename from third_party/aom/av1/exports_ident
rename to media/libaom/src/av1/exports_ident
diff --git a/third_party/aom/av1/exports_test b/media/libaom/src/av1/exports_test
similarity index 100%
rename from third_party/aom/av1/exports_test
rename to media/libaom/src/av1/exports_test
diff --git a/third_party/aom/build/cmake/aom_config.c.template b/media/libaom/src/build/cmake/aom_config.c.template
similarity index 100%
rename from third_party/aom/build/cmake/aom_config.c.template
rename to media/libaom/src/build/cmake/aom_config.c.template
diff --git a/third_party/aom/build/cmake/aom_config_defaults.cmake b/media/libaom/src/build/cmake/aom_config_defaults.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_config_defaults.cmake
rename to media/libaom/src/build/cmake/aom_config_defaults.cmake
diff --git a/third_party/aom/build/cmake/aom_configure.cmake b/media/libaom/src/build/cmake/aom_configure.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_configure.cmake
rename to media/libaom/src/build/cmake/aom_configure.cmake
diff --git a/third_party/aom/build/cmake/aom_experiment_deps.cmake b/media/libaom/src/build/cmake/aom_experiment_deps.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_experiment_deps.cmake
rename to media/libaom/src/build/cmake/aom_experiment_deps.cmake
diff --git a/third_party/aom/build/cmake/aom_install.cmake b/media/libaom/src/build/cmake/aom_install.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_install.cmake
rename to media/libaom/src/build/cmake/aom_install.cmake
diff --git a/third_party/aom/build/cmake/aom_optimization.cmake b/media/libaom/src/build/cmake/aom_optimization.cmake
similarity index 100%
rename from third_party/aom/build/cmake/aom_optimization.cmake
rename to media/libaom/src/build/cmake/aom_optimization.cmake
diff --git a/third_party/aom/build/cmake/compiler_flags.cmake b/media/libaom/src/build/cmake/compiler_flags.cmake
similarity index 100%
rename from third_party/aom/build/cmake/compiler_flags.cmake
rename to media/libaom/src/build/cmake/compiler_flags.cmake
diff --git a/third_party/aom/build/cmake/compiler_tests.cmake b/media/libaom/src/build/cmake/compiler_tests.cmake
similarity index 100%
rename from third_party/aom/build/cmake/compiler_tests.cmake
rename to media/libaom/src/build/cmake/compiler_tests.cmake
diff --git a/third_party/aom/build/cmake/cpu.cmake b/media/libaom/src/build/cmake/cpu.cmake
similarity index 100%
rename from third_party/aom/build/cmake/cpu.cmake
rename to media/libaom/src/build/cmake/cpu.cmake
diff --git a/third_party/aom/build/cmake/dist.cmake b/media/libaom/src/build/cmake/dist.cmake
similarity index 100%
rename from third_party/aom/build/cmake/dist.cmake
rename to media/libaom/src/build/cmake/dist.cmake
diff --git a/third_party/aom/build/cmake/exports.cmake b/media/libaom/src/build/cmake/exports.cmake
similarity index 100%
rename from third_party/aom/build/cmake/exports.cmake
rename to media/libaom/src/build/cmake/exports.cmake
diff --git a/third_party/aom/build/cmake/exports_sources.cmake b/media/libaom/src/build/cmake/exports_sources.cmake
similarity index 100%
rename from third_party/aom/build/cmake/exports_sources.cmake
rename to media/libaom/src/build/cmake/exports_sources.cmake
diff --git a/third_party/aom/build/cmake/generate_aom_config_templates.cmake b/media/libaom/src/build/cmake/generate_aom_config_templates.cmake
similarity index 100%
rename from third_party/aom/build/cmake/generate_aom_config_templates.cmake
rename to media/libaom/src/build/cmake/generate_aom_config_templates.cmake
diff --git a/third_party/aom/build/cmake/generate_exports.cmake b/media/libaom/src/build/cmake/generate_exports.cmake
similarity index 100%
rename from third_party/aom/build/cmake/generate_exports.cmake
rename to media/libaom/src/build/cmake/generate_exports.cmake
diff --git a/third_party/aom/build/cmake/ios-Info.plist b/media/libaom/src/build/cmake/ios-Info.plist
similarity index 100%
rename from third_party/aom/build/cmake/ios-Info.plist
rename to media/libaom/src/build/cmake/ios-Info.plist
diff --git a/third_party/aom/build/cmake/iosbuild.sh b/media/libaom/src/build/cmake/iosbuild.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/build/cmake/iosbuild.sh
rename to media/libaom/src/build/cmake/iosbuild.sh
diff --git a/third_party/aom/build/cmake/msvc_runtime.cmake b/media/libaom/src/build/cmake/msvc_runtime.cmake
similarity index 100%
rename from third_party/aom/build/cmake/msvc_runtime.cmake
rename to media/libaom/src/build/cmake/msvc_runtime.cmake
diff --git a/third_party/aom/build/cmake/pkg_config.cmake b/media/libaom/src/build/cmake/pkg_config.cmake
similarity index 100%
rename from third_party/aom/build/cmake/pkg_config.cmake
rename to media/libaom/src/build/cmake/pkg_config.cmake
diff --git a/third_party/aom/build/cmake/rtcd.pl b/media/libaom/src/build/cmake/rtcd.pl
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/build/cmake/rtcd.pl
rename to media/libaom/src/build/cmake/rtcd.pl
diff --git a/third_party/aom/build/cmake/sanitizers.cmake b/media/libaom/src/build/cmake/sanitizers.cmake
similarity index 100%
rename from third_party/aom/build/cmake/sanitizers.cmake
rename to media/libaom/src/build/cmake/sanitizers.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake b/media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm-ios-common.cmake
rename to media/libaom/src/build/cmake/toolchains/arm-ios-common.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-android-clang.cmake b/media/libaom/src/build/cmake/toolchains/arm64-android-clang.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-android-clang.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-android-clang.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-ios.cmake b/media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-ios.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/arm64-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/arm64-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake b/media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7-ios.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake b/media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/armv7s-ios.cmake
rename to media/libaom/src/build/cmake/toolchains/armv7s-ios.cmake
diff --git a/third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake b/media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/ios-simulator-common.cmake
rename to media/libaom/src/build/cmake/toolchains/ios-simulator-common.cmake
diff --git a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/mips32-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/mips64-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake b/media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/ppc-linux-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/ppc-linux-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake b/media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-ios-simulator.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-linux.cmake b/media/libaom/src/build/cmake/toolchains/x86-linux.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-linux.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-linux.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-macos.cmake b/media/libaom/src/build/cmake/toolchains/x86-macos.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-macos.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-macos.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/x86-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake b/media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86_64-ios-simulator.cmake
rename to media/libaom/src/build/cmake/toolchains/x86_64-ios-simulator.cmake
diff --git a/third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake b/media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
similarity index 100%
rename from third_party/aom/build/cmake/toolchains/x86_64-mingw-gcc.cmake
rename to media/libaom/src/build/cmake/toolchains/x86_64-mingw-gcc.cmake
diff --git a/third_party/aom/build/cmake/util.cmake b/media/libaom/src/build/cmake/util.cmake
similarity index 100%
rename from third_party/aom/build/cmake/util.cmake
rename to media/libaom/src/build/cmake/util.cmake
diff --git a/third_party/aom/build/cmake/version.cmake b/media/libaom/src/build/cmake/version.cmake
similarity index 100%
rename from third_party/aom/build/cmake/version.cmake
rename to media/libaom/src/build/cmake/version.cmake
diff --git a/third_party/aom/build/cmake/version.pl b/media/libaom/src/build/cmake/version.pl
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/build/cmake/version.pl
rename to media/libaom/src/build/cmake/version.pl
diff --git a/third_party/aom/codereview.settings b/media/libaom/src/codereview.settings
similarity index 100%
rename from third_party/aom/codereview.settings
rename to media/libaom/src/codereview.settings
diff --git a/third_party/aom/common/args.c b/media/libaom/src/common/args.c
similarity index 100%
rename from third_party/aom/common/args.c
rename to media/libaom/src/common/args.c
diff --git a/third_party/aom/common/args.h b/media/libaom/src/common/args.h
similarity index 100%
rename from third_party/aom/common/args.h
rename to media/libaom/src/common/args.h
diff --git a/third_party/aom/common/av1_config.c b/media/libaom/src/common/av1_config.c
similarity index 100%
rename from third_party/aom/common/av1_config.c
rename to media/libaom/src/common/av1_config.c
diff --git a/third_party/aom/common/av1_config.h b/media/libaom/src/common/av1_config.h
similarity index 100%
rename from third_party/aom/common/av1_config.h
rename to media/libaom/src/common/av1_config.h
diff --git a/third_party/aom/common/ivfdec.c b/media/libaom/src/common/ivfdec.c
similarity index 100%
rename from third_party/aom/common/ivfdec.c
rename to media/libaom/src/common/ivfdec.c
diff --git a/third_party/aom/common/ivfdec.h b/media/libaom/src/common/ivfdec.h
similarity index 100%
rename from third_party/aom/common/ivfdec.h
rename to media/libaom/src/common/ivfdec.h
diff --git a/third_party/aom/common/ivfenc.c b/media/libaom/src/common/ivfenc.c
similarity index 100%
rename from third_party/aom/common/ivfenc.c
rename to media/libaom/src/common/ivfenc.c
diff --git a/third_party/aom/common/ivfenc.h b/media/libaom/src/common/ivfenc.h
similarity index 100%
rename from third_party/aom/common/ivfenc.h
rename to media/libaom/src/common/ivfenc.h
diff --git a/third_party/aom/common/md5_utils.c b/media/libaom/src/common/md5_utils.c
similarity index 100%
rename from third_party/aom/common/md5_utils.c
rename to media/libaom/src/common/md5_utils.c
diff --git a/third_party/aom/common/md5_utils.h b/media/libaom/src/common/md5_utils.h
similarity index 100%
rename from third_party/aom/common/md5_utils.h
rename to media/libaom/src/common/md5_utils.h
diff --git a/third_party/aom/common/obudec.c b/media/libaom/src/common/obudec.c
similarity index 100%
rename from third_party/aom/common/obudec.c
rename to media/libaom/src/common/obudec.c
diff --git a/third_party/aom/common/obudec.h b/media/libaom/src/common/obudec.h
similarity index 100%
rename from third_party/aom/common/obudec.h
rename to media/libaom/src/common/obudec.h
diff --git a/third_party/aom/common/rawenc.c b/media/libaom/src/common/rawenc.c
similarity index 100%
rename from third_party/aom/common/rawenc.c
rename to media/libaom/src/common/rawenc.c
diff --git a/third_party/aom/common/rawenc.h b/media/libaom/src/common/rawenc.h
similarity index 100%
rename from third_party/aom/common/rawenc.h
rename to media/libaom/src/common/rawenc.h
diff --git a/third_party/aom/common/tools_common.c b/media/libaom/src/common/tools_common.c
similarity index 100%
rename from third_party/aom/common/tools_common.c
rename to media/libaom/src/common/tools_common.c
diff --git a/third_party/aom/common/tools_common.h b/media/libaom/src/common/tools_common.h
similarity index 100%
rename from third_party/aom/common/tools_common.h
rename to media/libaom/src/common/tools_common.h
diff --git a/third_party/aom/common/video_common.h b/media/libaom/src/common/video_common.h
similarity index 100%
rename from third_party/aom/common/video_common.h
rename to media/libaom/src/common/video_common.h
diff --git a/third_party/aom/common/video_reader.c b/media/libaom/src/common/video_reader.c
similarity index 100%
rename from third_party/aom/common/video_reader.c
rename to media/libaom/src/common/video_reader.c
diff --git a/third_party/aom/common/video_reader.h b/media/libaom/src/common/video_reader.h
similarity index 100%
rename from third_party/aom/common/video_reader.h
rename to media/libaom/src/common/video_reader.h
diff --git a/third_party/aom/common/video_writer.c b/media/libaom/src/common/video_writer.c
similarity index 100%
rename from third_party/aom/common/video_writer.c
rename to media/libaom/src/common/video_writer.c
diff --git a/third_party/aom/common/video_writer.h b/media/libaom/src/common/video_writer.h
similarity index 100%
rename from third_party/aom/common/video_writer.h
rename to media/libaom/src/common/video_writer.h
diff --git a/third_party/aom/common/warnings.c b/media/libaom/src/common/warnings.c
similarity index 100%
rename from third_party/aom/common/warnings.c
rename to media/libaom/src/common/warnings.c
diff --git a/third_party/aom/common/warnings.h b/media/libaom/src/common/warnings.h
similarity index 100%
rename from third_party/aom/common/warnings.h
rename to media/libaom/src/common/warnings.h
diff --git a/third_party/aom/common/webmdec.cc b/media/libaom/src/common/webmdec.cc
similarity index 100%
rename from third_party/aom/common/webmdec.cc
rename to media/libaom/src/common/webmdec.cc
diff --git a/third_party/aom/common/webmdec.h b/media/libaom/src/common/webmdec.h
similarity index 100%
rename from third_party/aom/common/webmdec.h
rename to media/libaom/src/common/webmdec.h
diff --git a/third_party/aom/common/webmenc.cc b/media/libaom/src/common/webmenc.cc
similarity index 100%
rename from third_party/aom/common/webmenc.cc
rename to media/libaom/src/common/webmenc.cc
diff --git a/third_party/aom/common/webmenc.h b/media/libaom/src/common/webmenc.h
similarity index 100%
rename from third_party/aom/common/webmenc.h
rename to media/libaom/src/common/webmenc.h
diff --git a/third_party/aom/common/y4menc.c b/media/libaom/src/common/y4menc.c
similarity index 100%
rename from third_party/aom/common/y4menc.c
rename to media/libaom/src/common/y4menc.c
diff --git a/third_party/aom/common/y4menc.h b/media/libaom/src/common/y4menc.h
similarity index 100%
rename from third_party/aom/common/y4menc.h
rename to media/libaom/src/common/y4menc.h
diff --git a/third_party/aom/common/y4minput.c b/media/libaom/src/common/y4minput.c
similarity index 100%
rename from third_party/aom/common/y4minput.c
rename to media/libaom/src/common/y4minput.c
diff --git a/third_party/aom/common/y4minput.h b/media/libaom/src/common/y4minput.h
similarity index 100%
rename from third_party/aom/common/y4minput.h
rename to media/libaom/src/common/y4minput.h
diff --git a/third_party/aom/docs.cmake b/media/libaom/src/docs.cmake
similarity index 100%
rename from third_party/aom/docs.cmake
rename to media/libaom/src/docs.cmake
diff --git a/third_party/aom/examples/analyzer.cc b/media/libaom/src/examples/analyzer.cc
similarity index 100%
rename from third_party/aom/examples/analyzer.cc
rename to media/libaom/src/examples/analyzer.cc
diff --git a/third_party/aom/examples/aom_cx_set_ref.c b/media/libaom/src/examples/aom_cx_set_ref.c
similarity index 100%
rename from third_party/aom/examples/aom_cx_set_ref.c
rename to media/libaom/src/examples/aom_cx_set_ref.c
diff --git a/third_party/aom/examples/av1_dec_fuzzer.cc b/media/libaom/src/examples/av1_dec_fuzzer.cc
similarity index 100%
rename from third_party/aom/examples/av1_dec_fuzzer.cc
rename to media/libaom/src/examples/av1_dec_fuzzer.cc
diff --git a/third_party/aom/examples/build_av1_dec_fuzzer.sh b/media/libaom/src/examples/build_av1_dec_fuzzer.sh
similarity index 100%
rename from third_party/aom/examples/build_av1_dec_fuzzer.sh
rename to media/libaom/src/examples/build_av1_dec_fuzzer.sh
diff --git a/third_party/aom/examples/decode_to_md5.c b/media/libaom/src/examples/decode_to_md5.c
similarity index 100%
rename from third_party/aom/examples/decode_to_md5.c
rename to media/libaom/src/examples/decode_to_md5.c
diff --git a/third_party/aom/examples/decode_with_drops.c b/media/libaom/src/examples/decode_with_drops.c
similarity index 100%
rename from third_party/aom/examples/decode_with_drops.c
rename to media/libaom/src/examples/decode_with_drops.c
diff --git a/third_party/aom/examples/encoder_util.c b/media/libaom/src/examples/encoder_util.c
similarity index 100%
rename from third_party/aom/examples/encoder_util.c
rename to media/libaom/src/examples/encoder_util.c
diff --git a/third_party/aom/examples/encoder_util.h b/media/libaom/src/examples/encoder_util.h
similarity index 100%
rename from third_party/aom/examples/encoder_util.h
rename to media/libaom/src/examples/encoder_util.h
diff --git a/third_party/aom/examples/inspect.c b/media/libaom/src/examples/inspect.c
similarity index 100%
rename from third_party/aom/examples/inspect.c
rename to media/libaom/src/examples/inspect.c
diff --git a/third_party/aom/examples/lightfield_bitstream_parsing.c b/media/libaom/src/examples/lightfield_bitstream_parsing.c
similarity index 100%
rename from third_party/aom/examples/lightfield_bitstream_parsing.c
rename to media/libaom/src/examples/lightfield_bitstream_parsing.c
diff --git a/third_party/aom/examples/lightfield_decoder.c b/media/libaom/src/examples/lightfield_decoder.c
similarity index 100%
rename from third_party/aom/examples/lightfield_decoder.c
rename to media/libaom/src/examples/lightfield_decoder.c
diff --git a/third_party/aom/examples/lightfield_encoder.c b/media/libaom/src/examples/lightfield_encoder.c
similarity index 100%
rename from third_party/aom/examples/lightfield_encoder.c
rename to media/libaom/src/examples/lightfield_encoder.c
diff --git a/third_party/aom/examples/lightfield_tile_list_decoder.c b/media/libaom/src/examples/lightfield_tile_list_decoder.c
similarity index 100%
rename from third_party/aom/examples/lightfield_tile_list_decoder.c
rename to media/libaom/src/examples/lightfield_tile_list_decoder.c
diff --git a/third_party/aom/examples/lossless_encoder.c b/media/libaom/src/examples/lossless_encoder.c
similarity index 100%
rename from third_party/aom/examples/lossless_encoder.c
rename to media/libaom/src/examples/lossless_encoder.c
diff --git a/third_party/aom/examples/noise_model.c b/media/libaom/src/examples/noise_model.c
similarity index 100%
rename from third_party/aom/examples/noise_model.c
rename to media/libaom/src/examples/noise_model.c
diff --git a/third_party/aom/examples/resize_util.c b/media/libaom/src/examples/resize_util.c
similarity index 100%
rename from third_party/aom/examples/resize_util.c
rename to media/libaom/src/examples/resize_util.c
diff --git a/third_party/aom/examples/scalable_decoder.c b/media/libaom/src/examples/scalable_decoder.c
similarity index 100%
rename from third_party/aom/examples/scalable_decoder.c
rename to media/libaom/src/examples/scalable_decoder.c
diff --git a/third_party/aom/examples/scalable_encoder.c b/media/libaom/src/examples/scalable_encoder.c
similarity index 100%
rename from third_party/aom/examples/scalable_encoder.c
rename to media/libaom/src/examples/scalable_encoder.c
diff --git a/third_party/aom/examples/set_maps.c b/media/libaom/src/examples/set_maps.c
similarity index 100%
rename from third_party/aom/examples/set_maps.c
rename to media/libaom/src/examples/set_maps.c
diff --git a/third_party/aom/examples/simple_decoder.c b/media/libaom/src/examples/simple_decoder.c
similarity index 100%
rename from third_party/aom/examples/simple_decoder.c
rename to media/libaom/src/examples/simple_decoder.c
diff --git a/third_party/aom/examples/simple_encoder.c b/media/libaom/src/examples/simple_encoder.c
similarity index 100%
rename from third_party/aom/examples/simple_encoder.c
rename to media/libaom/src/examples/simple_encoder.c
diff --git a/third_party/aom/examples/svc_encoder_rtc.c b/media/libaom/src/examples/svc_encoder_rtc.c
similarity index 100%
rename from third_party/aom/examples/svc_encoder_rtc.c
rename to media/libaom/src/examples/svc_encoder_rtc.c
diff --git a/third_party/aom/examples/twopass_encoder.c b/media/libaom/src/examples/twopass_encoder.c
similarity index 100%
rename from third_party/aom/examples/twopass_encoder.c
rename to media/libaom/src/examples/twopass_encoder.c
diff --git a/third_party/aom/keywords.dox b/media/libaom/src/keywords.dox
similarity index 100%
rename from third_party/aom/keywords.dox
rename to media/libaom/src/keywords.dox
diff --git a/third_party/aom/libs.doxy_template b/media/libaom/src/libs.doxy_template
similarity index 100%
rename from third_party/aom/libs.doxy_template
rename to media/libaom/src/libs.doxy_template
diff --git a/third_party/aom/mainpage.dox b/media/libaom/src/mainpage.dox
similarity index 100%
rename from third_party/aom/mainpage.dox
rename to media/libaom/src/mainpage.dox
diff --git a/third_party/aom/stats/aomstats.c b/media/libaom/src/stats/aomstats.c
similarity index 100%
rename from third_party/aom/stats/aomstats.c
rename to media/libaom/src/stats/aomstats.c
diff --git a/third_party/aom/stats/aomstats.h b/media/libaom/src/stats/aomstats.h
similarity index 100%
rename from third_party/aom/stats/aomstats.h
rename to media/libaom/src/stats/aomstats.h
diff --git a/third_party/aom/stats/rate_hist.c b/media/libaom/src/stats/rate_hist.c
similarity index 100%
rename from third_party/aom/stats/rate_hist.c
rename to media/libaom/src/stats/rate_hist.c
diff --git a/third_party/aom/stats/rate_hist.h b/media/libaom/src/stats/rate_hist.h
similarity index 100%
rename from third_party/aom/stats/rate_hist.h
rename to media/libaom/src/stats/rate_hist.h
diff --git a/third_party/aom/test/accounting_test.cc b/media/libaom/src/test/accounting_test.cc
similarity index 100%
rename from third_party/aom/test/accounting_test.cc
rename to media/libaom/src/test/accounting_test.cc
diff --git a/third_party/aom/test/acm_random.h b/media/libaom/src/test/acm_random.h
similarity index 100%
rename from third_party/aom/test/acm_random.h
rename to media/libaom/src/test/acm_random.h
diff --git a/third_party/aom/test/active_map_test.cc b/media/libaom/src/test/active_map_test.cc
similarity index 100%
rename from third_party/aom/test/active_map_test.cc
rename to media/libaom/src/test/active_map_test.cc
diff --git a/third_party/aom/test/altref_test.cc b/media/libaom/src/test/altref_test.cc
similarity index 100%
rename from third_party/aom/test/altref_test.cc
rename to media/libaom/src/test/altref_test.cc
diff --git a/third_party/aom/test/aom_integer_test.cc b/media/libaom/src/test/aom_integer_test.cc
similarity index 100%
rename from third_party/aom/test/aom_integer_test.cc
rename to media/libaom/src/test/aom_integer_test.cc
diff --git a/third_party/aom/test/aomcx_set_ref.sh b/media/libaom/src/test/aomcx_set_ref.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/aomcx_set_ref.sh
rename to media/libaom/src/test/aomcx_set_ref.sh
diff --git a/third_party/aom/test/aomdec.sh b/media/libaom/src/test/aomdec.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/aomdec.sh
rename to media/libaom/src/test/aomdec.sh
diff --git a/third_party/aom/test/aomenc.sh b/media/libaom/src/test/aomenc.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/aomenc.sh
rename to media/libaom/src/test/aomenc.sh
diff --git a/third_party/aom/test/aq_segment_test.cc b/media/libaom/src/test/aq_segment_test.cc
similarity index 100%
rename from third_party/aom/test/aq_segment_test.cc
rename to media/libaom/src/test/aq_segment_test.cc
diff --git a/third_party/aom/test/arf_freq_test.cc b/media/libaom/src/test/arf_freq_test.cc
similarity index 100%
rename from third_party/aom/test/arf_freq_test.cc
rename to media/libaom/src/test/arf_freq_test.cc
diff --git a/third_party/aom/test/av1_config_test.cc b/media/libaom/src/test/av1_config_test.cc
similarity index 100%
rename from third_party/aom/test/av1_config_test.cc
rename to media/libaom/src/test/av1_config_test.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test.cc b/media/libaom/src/test/av1_convolve_2d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_convolve_2d_test.cc
rename to media/libaom/src/test/av1_convolve_2d_test.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.cc b/media/libaom/src/test/av1_convolve_2d_test_util.cc
similarity index 100%
rename from third_party/aom/test/av1_convolve_2d_test_util.cc
rename to media/libaom/src/test/av1_convolve_2d_test_util.cc
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.h b/media/libaom/src/test/av1_convolve_2d_test_util.h
similarity index 100%
rename from third_party/aom/test/av1_convolve_2d_test_util.h
rename to media/libaom/src/test/av1_convolve_2d_test_util.h
diff --git a/third_party/aom/test/av1_convolve_scale_test.cc b/media/libaom/src/test/av1_convolve_scale_test.cc
similarity index 100%
rename from third_party/aom/test/av1_convolve_scale_test.cc
rename to media/libaom/src/test/av1_convolve_scale_test.cc
diff --git a/third_party/aom/test/av1_encoder_parms_get_to_decoder.cc b/media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
similarity index 100%
rename from third_party/aom/test/av1_encoder_parms_get_to_decoder.cc
rename to media/libaom/src/test/av1_encoder_parms_get_to_decoder.cc
diff --git a/third_party/aom/test/av1_ext_tile_test.cc b/media/libaom/src/test/av1_ext_tile_test.cc
similarity index 100%
rename from third_party/aom/test/av1_ext_tile_test.cc
rename to media/libaom/src/test/av1_ext_tile_test.cc
diff --git a/third_party/aom/test/av1_fwd_txfm1d_test.cc b/media/libaom/src/test/av1_fwd_txfm1d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_fwd_txfm1d_test.cc
rename to media/libaom/src/test/av1_fwd_txfm1d_test.cc
diff --git a/third_party/aom/test/av1_fwd_txfm2d_test.cc b/media/libaom/src/test/av1_fwd_txfm2d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_fwd_txfm2d_test.cc
rename to media/libaom/src/test/av1_fwd_txfm2d_test.cc
diff --git a/third_party/aom/test/av1_highbd_iht_test.cc b/media/libaom/src/test/av1_highbd_iht_test.cc
similarity index 100%
rename from third_party/aom/test/av1_highbd_iht_test.cc
rename to media/libaom/src/test/av1_highbd_iht_test.cc
diff --git a/third_party/aom/test/av1_horz_only_frame_superres_test.cc b/media/libaom/src/test/av1_horz_only_frame_superres_test.cc
similarity index 100%
rename from third_party/aom/test/av1_horz_only_frame_superres_test.cc
rename to media/libaom/src/test/av1_horz_only_frame_superres_test.cc
diff --git a/third_party/aom/test/av1_inv_txfm1d_test.cc b/media/libaom/src/test/av1_inv_txfm1d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_inv_txfm1d_test.cc
rename to media/libaom/src/test/av1_inv_txfm1d_test.cc
diff --git a/third_party/aom/test/av1_inv_txfm2d_test.cc b/media/libaom/src/test/av1_inv_txfm2d_test.cc
similarity index 100%
rename from third_party/aom/test/av1_inv_txfm2d_test.cc
rename to media/libaom/src/test/av1_inv_txfm2d_test.cc
diff --git a/third_party/aom/test/av1_nn_predict_test.cc b/media/libaom/src/test/av1_nn_predict_test.cc
similarity index 100%
rename from third_party/aom/test/av1_nn_predict_test.cc
rename to media/libaom/src/test/av1_nn_predict_test.cc
diff --git a/third_party/aom/test/av1_quantize_test.cc b/media/libaom/src/test/av1_quantize_test.cc
similarity index 100%
rename from third_party/aom/test/av1_quantize_test.cc
rename to media/libaom/src/test/av1_quantize_test.cc
diff --git a/third_party/aom/test/av1_round_shift_array_test.cc b/media/libaom/src/test/av1_round_shift_array_test.cc
similarity index 100%
rename from third_party/aom/test/av1_round_shift_array_test.cc
rename to media/libaom/src/test/av1_round_shift_array_test.cc
diff --git a/third_party/aom/test/av1_txfm_test.cc b/media/libaom/src/test/av1_txfm_test.cc
similarity index 100%
rename from third_party/aom/test/av1_txfm_test.cc
rename to media/libaom/src/test/av1_txfm_test.cc
diff --git a/third_party/aom/test/av1_txfm_test.h b/media/libaom/src/test/av1_txfm_test.h
similarity index 100%
rename from third_party/aom/test/av1_txfm_test.h
rename to media/libaom/src/test/av1_txfm_test.h
diff --git a/third_party/aom/test/av1_wedge_utils_test.cc b/media/libaom/src/test/av1_wedge_utils_test.cc
similarity index 100%
rename from third_party/aom/test/av1_wedge_utils_test.cc
rename to media/libaom/src/test/av1_wedge_utils_test.cc
diff --git a/third_party/aom/test/avg_test.cc b/media/libaom/src/test/avg_test.cc
similarity index 100%
rename from third_party/aom/test/avg_test.cc
rename to media/libaom/src/test/avg_test.cc
diff --git a/third_party/aom/test/best_encode.sh b/media/libaom/src/test/best_encode.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/best_encode.sh
rename to media/libaom/src/test/best_encode.sh
diff --git a/third_party/aom/test/binary_codes_test.cc b/media/libaom/src/test/binary_codes_test.cc
similarity index 100%
rename from third_party/aom/test/binary_codes_test.cc
rename to media/libaom/src/test/binary_codes_test.cc
diff --git a/third_party/aom/test/blend_a64_mask_1d_test.cc b/media/libaom/src/test/blend_a64_mask_1d_test.cc
similarity index 100%
rename from third_party/aom/test/blend_a64_mask_1d_test.cc
rename to media/libaom/src/test/blend_a64_mask_1d_test.cc
diff --git a/third_party/aom/test/blend_a64_mask_test.cc b/media/libaom/src/test/blend_a64_mask_test.cc
similarity index 100%
rename from third_party/aom/test/blend_a64_mask_test.cc
rename to media/libaom/src/test/blend_a64_mask_test.cc
diff --git a/third_party/aom/test/blockd_test.cc b/media/libaom/src/test/blockd_test.cc
similarity index 100%
rename from third_party/aom/test/blockd_test.cc
rename to media/libaom/src/test/blockd_test.cc
diff --git a/third_party/aom/test/boolcoder_test.cc b/media/libaom/src/test/boolcoder_test.cc
similarity index 100%
rename from third_party/aom/test/boolcoder_test.cc
rename to media/libaom/src/test/boolcoder_test.cc
diff --git a/third_party/aom/test/borders_test.cc b/media/libaom/src/test/borders_test.cc
similarity index 100%
rename from third_party/aom/test/borders_test.cc
rename to media/libaom/src/test/borders_test.cc
diff --git a/third_party/aom/test/cdef_test.cc b/media/libaom/src/test/cdef_test.cc
similarity index 100%
rename from third_party/aom/test/cdef_test.cc
rename to media/libaom/src/test/cdef_test.cc
diff --git a/third_party/aom/test/cfl_test.cc b/media/libaom/src/test/cfl_test.cc
similarity index 100%
rename from third_party/aom/test/cfl_test.cc
rename to media/libaom/src/test/cfl_test.cc
diff --git a/third_party/aom/test/clear_system_state.h b/media/libaom/src/test/clear_system_state.h
similarity index 100%
rename from third_party/aom/test/clear_system_state.h
rename to media/libaom/src/test/clear_system_state.h
diff --git a/third_party/aom/test/cnn_test.cc b/media/libaom/src/test/cnn_test.cc
similarity index 100%
rename from third_party/aom/test/cnn_test.cc
rename to media/libaom/src/test/cnn_test.cc
diff --git a/third_party/aom/test/codec_factory.h b/media/libaom/src/test/codec_factory.h
similarity index 100%
rename from third_party/aom/test/codec_factory.h
rename to media/libaom/src/test/codec_factory.h
diff --git a/third_party/aom/test/coding_path_sync.cc b/media/libaom/src/test/coding_path_sync.cc
similarity index 100%
rename from third_party/aom/test/coding_path_sync.cc
rename to media/libaom/src/test/coding_path_sync.cc
diff --git a/third_party/aom/test/comp_avg_pred_test.cc b/media/libaom/src/test/comp_avg_pred_test.cc
similarity index 100%
rename from third_party/aom/test/comp_avg_pred_test.cc
rename to media/libaom/src/test/comp_avg_pred_test.cc
diff --git a/third_party/aom/test/comp_avg_pred_test.h b/media/libaom/src/test/comp_avg_pred_test.h
similarity index 100%
rename from third_party/aom/test/comp_avg_pred_test.h
rename to media/libaom/src/test/comp_avg_pred_test.h
diff --git a/third_party/aom/test/comp_mask_variance_test.cc b/media/libaom/src/test/comp_mask_variance_test.cc
similarity index 100%
rename from third_party/aom/test/comp_mask_variance_test.cc
rename to media/libaom/src/test/comp_mask_variance_test.cc
diff --git a/third_party/aom/test/convolve_round_test.cc b/media/libaom/src/test/convolve_round_test.cc
similarity index 100%
rename from third_party/aom/test/convolve_round_test.cc
rename to media/libaom/src/test/convolve_round_test.cc
diff --git a/third_party/aom/test/convolve_test.cc b/media/libaom/src/test/convolve_test.cc
similarity index 100%
rename from third_party/aom/test/convolve_test.cc
rename to media/libaom/src/test/convolve_test.cc
diff --git a/third_party/aom/test/corner_match_test.cc b/media/libaom/src/test/corner_match_test.cc
similarity index 100%
rename from third_party/aom/test/corner_match_test.cc
rename to media/libaom/src/test/corner_match_test.cc
diff --git a/third_party/aom/test/cpu_speed_test.cc b/media/libaom/src/test/cpu_speed_test.cc
similarity index 100%
rename from third_party/aom/test/cpu_speed_test.cc
rename to media/libaom/src/test/cpu_speed_test.cc
diff --git a/third_party/aom/test/datarate_test.cc b/media/libaom/src/test/datarate_test.cc
similarity index 100%
rename from third_party/aom/test/datarate_test.cc
rename to media/libaom/src/test/datarate_test.cc
diff --git a/third_party/aom/test/datarate_test.h b/media/libaom/src/test/datarate_test.h
similarity index 100%
rename from third_party/aom/test/datarate_test.h
rename to media/libaom/src/test/datarate_test.h
diff --git a/third_party/aom/test/decode_api_test.cc b/media/libaom/src/test/decode_api_test.cc
similarity index 100%
rename from third_party/aom/test/decode_api_test.cc
rename to media/libaom/src/test/decode_api_test.cc
diff --git a/third_party/aom/test/decode_multithreaded_test.cc b/media/libaom/src/test/decode_multithreaded_test.cc
similarity index 100%
rename from third_party/aom/test/decode_multithreaded_test.cc
rename to media/libaom/src/test/decode_multithreaded_test.cc
diff --git a/third_party/aom/test/decode_perf_test.cc b/media/libaom/src/test/decode_perf_test.cc
similarity index 100%
rename from third_party/aom/test/decode_perf_test.cc
rename to media/libaom/src/test/decode_perf_test.cc
diff --git a/third_party/aom/test/decode_test_driver.cc b/media/libaom/src/test/decode_test_driver.cc
similarity index 100%
rename from third_party/aom/test/decode_test_driver.cc
rename to media/libaom/src/test/decode_test_driver.cc
diff --git a/third_party/aom/test/decode_test_driver.h b/media/libaom/src/test/decode_test_driver.h
similarity index 100%
rename from third_party/aom/test/decode_test_driver.h
rename to media/libaom/src/test/decode_test_driver.h
diff --git a/third_party/aom/test/decode_to_md5.sh b/media/libaom/src/test/decode_to_md5.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/decode_to_md5.sh
rename to media/libaom/src/test/decode_to_md5.sh
diff --git a/third_party/aom/test/decode_with_drops.sh b/media/libaom/src/test/decode_with_drops.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/decode_with_drops.sh
rename to media/libaom/src/test/decode_with_drops.sh
diff --git a/third_party/aom/test/divu_small_test.cc b/media/libaom/src/test/divu_small_test.cc
similarity index 100%
rename from third_party/aom/test/divu_small_test.cc
rename to media/libaom/src/test/divu_small_test.cc
diff --git a/third_party/aom/test/dr_prediction_test.cc b/media/libaom/src/test/dr_prediction_test.cc
similarity index 100%
rename from third_party/aom/test/dr_prediction_test.cc
rename to media/libaom/src/test/dr_prediction_test.cc
diff --git a/third_party/aom/test/dump_obu.sh b/media/libaom/src/test/dump_obu.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/dump_obu.sh
rename to media/libaom/src/test/dump_obu.sh
diff --git a/third_party/aom/test/ec_test.cc b/media/libaom/src/test/ec_test.cc
similarity index 100%
rename from third_party/aom/test/ec_test.cc
rename to media/libaom/src/test/ec_test.cc
diff --git a/third_party/aom/test/edge_detect_test.cc b/media/libaom/src/test/edge_detect_test.cc
similarity index 100%
rename from third_party/aom/test/edge_detect_test.cc
rename to media/libaom/src/test/edge_detect_test.cc
diff --git a/third_party/aom/test/encode_api_test.cc b/media/libaom/src/test/encode_api_test.cc
similarity index 100%
rename from third_party/aom/test/encode_api_test.cc
rename to media/libaom/src/test/encode_api_test.cc
diff --git a/third_party/aom/test/encode_perf_test.cc b/media/libaom/src/test/encode_perf_test.cc
similarity index 100%
rename from third_party/aom/test/encode_perf_test.cc
rename to media/libaom/src/test/encode_perf_test.cc
diff --git a/third_party/aom/test/encode_test_driver.cc b/media/libaom/src/test/encode_test_driver.cc
similarity index 100%
rename from third_party/aom/test/encode_test_driver.cc
rename to media/libaom/src/test/encode_test_driver.cc
diff --git a/third_party/aom/test/encode_test_driver.h b/media/libaom/src/test/encode_test_driver.h
similarity index 100%
rename from third_party/aom/test/encode_test_driver.h
rename to media/libaom/src/test/encode_test_driver.h
diff --git a/third_party/aom/test/encodetxb_test.cc b/media/libaom/src/test/encodetxb_test.cc
similarity index 100%
rename from third_party/aom/test/encodetxb_test.cc
rename to media/libaom/src/test/encodetxb_test.cc
diff --git a/third_party/aom/test/end_to_end_test.cc b/media/libaom/src/test/end_to_end_test.cc
similarity index 100%
rename from third_party/aom/test/end_to_end_test.cc
rename to media/libaom/src/test/end_to_end_test.cc
diff --git a/third_party/aom/test/error_block_test.cc b/media/libaom/src/test/error_block_test.cc
similarity index 100%
rename from third_party/aom/test/error_block_test.cc
rename to media/libaom/src/test/error_block_test.cc
diff --git a/third_party/aom/test/error_resilience_test.cc b/media/libaom/src/test/error_resilience_test.cc
similarity index 100%
rename from third_party/aom/test/error_resilience_test.cc
rename to media/libaom/src/test/error_resilience_test.cc
diff --git a/third_party/aom/test/ethread_test.cc b/media/libaom/src/test/ethread_test.cc
similarity index 100%
rename from third_party/aom/test/ethread_test.cc
rename to media/libaom/src/test/ethread_test.cc
diff --git a/third_party/aom/test/examples.sh b/media/libaom/src/test/examples.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/examples.sh
rename to media/libaom/src/test/examples.sh
diff --git a/third_party/aom/test/external_frame_buffer_test.cc b/media/libaom/src/test/external_frame_buffer_test.cc
similarity index 100%
rename from third_party/aom/test/external_frame_buffer_test.cc
rename to media/libaom/src/test/external_frame_buffer_test.cc
diff --git a/third_party/aom/test/fft_test.cc b/media/libaom/src/test/fft_test.cc
similarity index 100%
rename from third_party/aom/test/fft_test.cc
rename to media/libaom/src/test/fft_test.cc
diff --git a/third_party/aom/test/film_grain_table_test.cc b/media/libaom/src/test/film_grain_table_test.cc
similarity index 100%
rename from third_party/aom/test/film_grain_table_test.cc
rename to media/libaom/src/test/film_grain_table_test.cc
diff --git a/third_party/aom/test/filterintra_test.cc b/media/libaom/src/test/filterintra_test.cc
similarity index 100%
rename from third_party/aom/test/filterintra_test.cc
rename to media/libaom/src/test/filterintra_test.cc
diff --git a/third_party/aom/test/frame_error_test.cc b/media/libaom/src/test/frame_error_test.cc
similarity index 100%
rename from third_party/aom/test/frame_error_test.cc
rename to media/libaom/src/test/frame_error_test.cc
diff --git a/third_party/aom/test/frame_size_tests.cc b/media/libaom/src/test/frame_size_tests.cc
similarity index 100%
rename from third_party/aom/test/frame_size_tests.cc
rename to media/libaom/src/test/frame_size_tests.cc
diff --git a/third_party/aom/test/function_equivalence_test.h b/media/libaom/src/test/function_equivalence_test.h
similarity index 100%
rename from third_party/aom/test/function_equivalence_test.h
rename to media/libaom/src/test/function_equivalence_test.h
diff --git a/third_party/aom/test/fwd_kf_test.cc b/media/libaom/src/test/fwd_kf_test.cc
similarity index 100%
rename from third_party/aom/test/fwd_kf_test.cc
rename to media/libaom/src/test/fwd_kf_test.cc
diff --git a/third_party/aom/test/fwht4x4_test.cc b/media/libaom/src/test/fwht4x4_test.cc
similarity index 100%
rename from third_party/aom/test/fwht4x4_test.cc
rename to media/libaom/src/test/fwht4x4_test.cc
diff --git a/third_party/aom/test/gf_max_pyr_height_test.cc b/media/libaom/src/test/gf_max_pyr_height_test.cc
similarity index 100%
rename from third_party/aom/test/gf_max_pyr_height_test.cc
rename to media/libaom/src/test/gf_max_pyr_height_test.cc
diff --git a/third_party/aom/test/gviz_api.py b/media/libaom/src/test/gviz_api.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/gviz_api.py
rename to media/libaom/src/test/gviz_api.py
diff --git a/third_party/aom/test/hadamard_test.cc b/media/libaom/src/test/hadamard_test.cc
similarity index 100%
rename from third_party/aom/test/hadamard_test.cc
rename to media/libaom/src/test/hadamard_test.cc
diff --git a/third_party/aom/test/hash_test.cc b/media/libaom/src/test/hash_test.cc
similarity index 100%
rename from third_party/aom/test/hash_test.cc
rename to media/libaom/src/test/hash_test.cc
diff --git a/third_party/aom/test/hbd_metrics_test.cc b/media/libaom/src/test/hbd_metrics_test.cc
similarity index 100%
rename from third_party/aom/test/hbd_metrics_test.cc
rename to media/libaom/src/test/hbd_metrics_test.cc
diff --git a/third_party/aom/test/hiprec_convolve_test.cc b/media/libaom/src/test/hiprec_convolve_test.cc
similarity index 100%
rename from third_party/aom/test/hiprec_convolve_test.cc
rename to media/libaom/src/test/hiprec_convolve_test.cc
diff --git a/third_party/aom/test/hiprec_convolve_test_util.cc b/media/libaom/src/test/hiprec_convolve_test_util.cc
similarity index 100%
rename from third_party/aom/test/hiprec_convolve_test_util.cc
rename to media/libaom/src/test/hiprec_convolve_test_util.cc
diff --git a/third_party/aom/test/hiprec_convolve_test_util.h b/media/libaom/src/test/hiprec_convolve_test_util.h
similarity index 100%
rename from third_party/aom/test/hiprec_convolve_test_util.h
rename to media/libaom/src/test/hiprec_convolve_test_util.h
diff --git a/third_party/aom/test/horver_correlation_test.cc b/media/libaom/src/test/horver_correlation_test.cc
similarity index 100%
rename from third_party/aom/test/horver_correlation_test.cc
rename to media/libaom/src/test/horver_correlation_test.cc
diff --git a/third_party/aom/test/horz_superres_test.cc b/media/libaom/src/test/horz_superres_test.cc
similarity index 100%
rename from third_party/aom/test/horz_superres_test.cc
rename to media/libaom/src/test/horz_superres_test.cc
diff --git a/third_party/aom/test/i420_video_source.h b/media/libaom/src/test/i420_video_source.h
similarity index 100%
rename from third_party/aom/test/i420_video_source.h
rename to media/libaom/src/test/i420_video_source.h
diff --git a/third_party/aom/test/intra_edge_test.cc b/media/libaom/src/test/intra_edge_test.cc
similarity index 100%
rename from third_party/aom/test/intra_edge_test.cc
rename to media/libaom/src/test/intra_edge_test.cc
diff --git a/third_party/aom/test/intrabc_test.cc b/media/libaom/src/test/intrabc_test.cc
similarity index 100%
rename from third_party/aom/test/intrabc_test.cc
rename to media/libaom/src/test/intrabc_test.cc
diff --git a/third_party/aom/test/intrapred_test.cc b/media/libaom/src/test/intrapred_test.cc
similarity index 100%
rename from third_party/aom/test/intrapred_test.cc
rename to media/libaom/src/test/intrapred_test.cc
diff --git a/third_party/aom/test/invalid_file_test.cc b/media/libaom/src/test/invalid_file_test.cc
similarity index 100%
rename from third_party/aom/test/invalid_file_test.cc
rename to media/libaom/src/test/invalid_file_test.cc
diff --git a/third_party/aom/test/ivf_video_source.h b/media/libaom/src/test/ivf_video_source.h
similarity index 100%
rename from third_party/aom/test/ivf_video_source.h
rename to media/libaom/src/test/ivf_video_source.h
diff --git a/third_party/aom/test/level_test.cc b/media/libaom/src/test/level_test.cc
similarity index 100%
rename from third_party/aom/test/level_test.cc
rename to media/libaom/src/test/level_test.cc
diff --git a/third_party/aom/test/lightfield_test.sh b/media/libaom/src/test/lightfield_test.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/lightfield_test.sh
rename to media/libaom/src/test/lightfield_test.sh
diff --git a/third_party/aom/test/log2_test.cc b/media/libaom/src/test/log2_test.cc
similarity index 100%
rename from third_party/aom/test/log2_test.cc
rename to media/libaom/src/test/log2_test.cc
diff --git a/third_party/aom/test/lossless_test.cc b/media/libaom/src/test/lossless_test.cc
similarity index 100%
rename from third_party/aom/test/lossless_test.cc
rename to media/libaom/src/test/lossless_test.cc
diff --git a/third_party/aom/test/lpf_test.cc b/media/libaom/src/test/lpf_test.cc
similarity index 100%
rename from third_party/aom/test/lpf_test.cc
rename to media/libaom/src/test/lpf_test.cc
diff --git a/third_party/aom/test/masked_sad_test.cc b/media/libaom/src/test/masked_sad_test.cc
similarity index 100%
rename from third_party/aom/test/masked_sad_test.cc
rename to media/libaom/src/test/masked_sad_test.cc
diff --git a/third_party/aom/test/masked_variance_test.cc b/media/libaom/src/test/masked_variance_test.cc
similarity index 100%
rename from third_party/aom/test/masked_variance_test.cc
rename to media/libaom/src/test/masked_variance_test.cc
diff --git a/third_party/aom/test/md5_helper.h b/media/libaom/src/test/md5_helper.h
similarity index 100%
rename from third_party/aom/test/md5_helper.h
rename to media/libaom/src/test/md5_helper.h
diff --git a/third_party/aom/test/metadata_memory_handling_test.cc b/media/libaom/src/test/metadata_memory_handling_test.cc
similarity index 100%
rename from third_party/aom/test/metadata_memory_handling_test.cc
rename to media/libaom/src/test/metadata_memory_handling_test.cc
diff --git a/third_party/aom/test/metrics_template.html b/media/libaom/src/test/metrics_template.html
similarity index 100%
rename from third_party/aom/test/metrics_template.html
rename to media/libaom/src/test/metrics_template.html
diff --git a/third_party/aom/test/monochrome_test.cc b/media/libaom/src/test/monochrome_test.cc
similarity index 100%
rename from third_party/aom/test/monochrome_test.cc
rename to media/libaom/src/test/monochrome_test.cc
diff --git a/third_party/aom/test/motion_vector_test.cc b/media/libaom/src/test/motion_vector_test.cc
similarity index 100%
rename from third_party/aom/test/motion_vector_test.cc
rename to media/libaom/src/test/motion_vector_test.cc
diff --git a/third_party/aom/test/noise_model_test.cc b/media/libaom/src/test/noise_model_test.cc
similarity index 100%
rename from third_party/aom/test/noise_model_test.cc
rename to media/libaom/src/test/noise_model_test.cc
diff --git a/third_party/aom/test/obmc_sad_test.cc b/media/libaom/src/test/obmc_sad_test.cc
similarity index 100%
rename from third_party/aom/test/obmc_sad_test.cc
rename to media/libaom/src/test/obmc_sad_test.cc
diff --git a/third_party/aom/test/obmc_variance_test.cc b/media/libaom/src/test/obmc_variance_test.cc
similarity index 100%
rename from third_party/aom/test/obmc_variance_test.cc
rename to media/libaom/src/test/obmc_variance_test.cc
diff --git a/third_party/aom/test/onyxc_int_test.cc b/media/libaom/src/test/onyxc_int_test.cc
similarity index 100%
rename from third_party/aom/test/onyxc_int_test.cc
rename to media/libaom/src/test/onyxc_int_test.cc
diff --git a/third_party/aom/test/pickrst_test.cc b/media/libaom/src/test/pickrst_test.cc
similarity index 100%
rename from third_party/aom/test/pickrst_test.cc
rename to media/libaom/src/test/pickrst_test.cc
diff --git a/third_party/aom/test/qm_test.cc b/media/libaom/src/test/qm_test.cc
similarity index 100%
rename from third_party/aom/test/qm_test.cc
rename to media/libaom/src/test/qm_test.cc
diff --git a/third_party/aom/test/quantize_func_test.cc b/media/libaom/src/test/quantize_func_test.cc
similarity index 100%
rename from third_party/aom/test/quantize_func_test.cc
rename to media/libaom/src/test/quantize_func_test.cc
diff --git a/third_party/aom/test/reconinter_test.cc b/media/libaom/src/test/reconinter_test.cc
similarity index 100%
rename from third_party/aom/test/reconinter_test.cc
rename to media/libaom/src/test/reconinter_test.cc
diff --git a/third_party/aom/test/register_state_check.h b/media/libaom/src/test/register_state_check.h
similarity index 100%
rename from third_party/aom/test/register_state_check.h
rename to media/libaom/src/test/register_state_check.h
diff --git a/third_party/aom/test/resize_test.cc b/media/libaom/src/test/resize_test.cc
similarity index 100%
rename from third_party/aom/test/resize_test.cc
rename to media/libaom/src/test/resize_test.cc
diff --git a/third_party/aom/test/rt_end_to_end_test.cc b/media/libaom/src/test/rt_end_to_end_test.cc
similarity index 100%
rename from third_party/aom/test/rt_end_to_end_test.cc
rename to media/libaom/src/test/rt_end_to_end_test.cc
diff --git a/third_party/aom/test/run_encodes.sh b/media/libaom/src/test/run_encodes.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/run_encodes.sh
rename to media/libaom/src/test/run_encodes.sh
diff --git a/third_party/aom/test/sad_test.cc b/media/libaom/src/test/sad_test.cc
similarity index 100%
rename from third_party/aom/test/sad_test.cc
rename to media/libaom/src/test/sad_test.cc
diff --git a/third_party/aom/test/scalability_test.cc b/media/libaom/src/test/scalability_test.cc
similarity index 100%
rename from third_party/aom/test/scalability_test.cc
rename to media/libaom/src/test/scalability_test.cc
diff --git a/third_party/aom/test/scan_test.cc b/media/libaom/src/test/scan_test.cc
similarity index 100%
rename from third_party/aom/test/scan_test.cc
rename to media/libaom/src/test/scan_test.cc
diff --git a/third_party/aom/test/segment_binarization_sync.cc b/media/libaom/src/test/segment_binarization_sync.cc
similarity index 100%
rename from third_party/aom/test/segment_binarization_sync.cc
rename to media/libaom/src/test/segment_binarization_sync.cc
diff --git a/third_party/aom/test/selfguided_filter_test.cc b/media/libaom/src/test/selfguided_filter_test.cc
similarity index 100%
rename from third_party/aom/test/selfguided_filter_test.cc
rename to media/libaom/src/test/selfguided_filter_test.cc
diff --git a/third_party/aom/test/set_maps.sh b/media/libaom/src/test/set_maps.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/set_maps.sh
rename to media/libaom/src/test/set_maps.sh
diff --git a/third_party/aom/test/simd_avx2_test.cc b/media/libaom/src/test/simd_avx2_test.cc
similarity index 100%
rename from third_party/aom/test/simd_avx2_test.cc
rename to media/libaom/src/test/simd_avx2_test.cc
diff --git a/third_party/aom/test/simd_cmp_avx2.cc b/media/libaom/src/test/simd_cmp_avx2.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_avx2.cc
rename to media/libaom/src/test/simd_cmp_avx2.cc
diff --git a/third_party/aom/test/simd_cmp_impl.h b/media/libaom/src/test/simd_cmp_impl.h
similarity index 100%
rename from third_party/aom/test/simd_cmp_impl.h
rename to media/libaom/src/test/simd_cmp_impl.h
diff --git a/third_party/aom/test/simd_cmp_neon.cc b/media/libaom/src/test/simd_cmp_neon.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_neon.cc
rename to media/libaom/src/test/simd_cmp_neon.cc
diff --git a/third_party/aom/test/simd_cmp_sse2.cc b/media/libaom/src/test/simd_cmp_sse2.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_sse2.cc
rename to media/libaom/src/test/simd_cmp_sse2.cc
diff --git a/third_party/aom/test/simd_cmp_sse4.cc b/media/libaom/src/test/simd_cmp_sse4.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_sse4.cc
rename to media/libaom/src/test/simd_cmp_sse4.cc
diff --git a/third_party/aom/test/simd_cmp_ssse3.cc b/media/libaom/src/test/simd_cmp_ssse3.cc
similarity index 100%
rename from third_party/aom/test/simd_cmp_ssse3.cc
rename to media/libaom/src/test/simd_cmp_ssse3.cc
diff --git a/third_party/aom/test/simd_impl.h b/media/libaom/src/test/simd_impl.h
similarity index 100%
rename from third_party/aom/test/simd_impl.h
rename to media/libaom/src/test/simd_impl.h
diff --git a/third_party/aom/test/simd_neon_test.cc b/media/libaom/src/test/simd_neon_test.cc
similarity index 100%
rename from third_party/aom/test/simd_neon_test.cc
rename to media/libaom/src/test/simd_neon_test.cc
diff --git a/third_party/aom/test/simd_sse2_test.cc b/media/libaom/src/test/simd_sse2_test.cc
similarity index 100%
rename from third_party/aom/test/simd_sse2_test.cc
rename to media/libaom/src/test/simd_sse2_test.cc
diff --git a/third_party/aom/test/simd_sse4_test.cc b/media/libaom/src/test/simd_sse4_test.cc
similarity index 100%
rename from third_party/aom/test/simd_sse4_test.cc
rename to media/libaom/src/test/simd_sse4_test.cc
diff --git a/third_party/aom/test/simd_ssse3_test.cc b/media/libaom/src/test/simd_ssse3_test.cc
similarity index 100%
rename from third_party/aom/test/simd_ssse3_test.cc
rename to media/libaom/src/test/simd_ssse3_test.cc
diff --git a/third_party/aom/test/simple_decoder.sh b/media/libaom/src/test/simple_decoder.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/simple_decoder.sh
rename to media/libaom/src/test/simple_decoder.sh
diff --git a/third_party/aom/test/simple_encoder.sh b/media/libaom/src/test/simple_encoder.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/simple_encoder.sh
rename to media/libaom/src/test/simple_encoder.sh
diff --git a/third_party/aom/test/subtract_test.cc b/media/libaom/src/test/subtract_test.cc
similarity index 100%
rename from third_party/aom/test/subtract_test.cc
rename to media/libaom/src/test/subtract_test.cc
diff --git a/third_party/aom/test/sum_squares_test.cc b/media/libaom/src/test/sum_squares_test.cc
similarity index 100%
rename from third_party/aom/test/sum_squares_test.cc
rename to media/libaom/src/test/sum_squares_test.cc
diff --git a/third_party/aom/test/superframe_test.cc b/media/libaom/src/test/superframe_test.cc
similarity index 100%
rename from third_party/aom/test/superframe_test.cc
rename to media/libaom/src/test/superframe_test.cc
diff --git a/third_party/aom/test/svc_datarate_test.cc b/media/libaom/src/test/svc_datarate_test.cc
similarity index 100%
rename from third_party/aom/test/svc_datarate_test.cc
rename to media/libaom/src/test/svc_datarate_test.cc
diff --git a/third_party/aom/test/test-data.sha1 b/media/libaom/src/test/test-data.sha1
similarity index 100%
rename from third_party/aom/test/test-data.sha1
rename to media/libaom/src/test/test-data.sha1
diff --git a/third_party/aom/test/test.cmake b/media/libaom/src/test/test.cmake
similarity index 100%
rename from third_party/aom/test/test.cmake
rename to media/libaom/src/test/test.cmake
diff --git a/third_party/aom/test/test_data_download_worker.cmake b/media/libaom/src/test/test_data_download_worker.cmake
similarity index 100%
rename from third_party/aom/test/test_data_download_worker.cmake
rename to media/libaom/src/test/test_data_download_worker.cmake
diff --git a/third_party/aom/test/test_data_util.cmake b/media/libaom/src/test/test_data_util.cmake
similarity index 100%
rename from third_party/aom/test/test_data_util.cmake
rename to media/libaom/src/test/test_data_util.cmake
diff --git a/third_party/aom/test/test_intra_pred_speed.cc b/media/libaom/src/test/test_intra_pred_speed.cc
similarity index 100%
rename from third_party/aom/test/test_intra_pred_speed.cc
rename to media/libaom/src/test/test_intra_pred_speed.cc
diff --git a/third_party/aom/test/test_libaom.cc b/media/libaom/src/test/test_libaom.cc
similarity index 100%
rename from third_party/aom/test/test_libaom.cc
rename to media/libaom/src/test/test_libaom.cc
diff --git a/third_party/aom/test/test_runner.cmake b/media/libaom/src/test/test_runner.cmake
similarity index 100%
rename from third_party/aom/test/test_runner.cmake
rename to media/libaom/src/test/test_runner.cmake
diff --git a/third_party/aom/test/test_vector_test.cc b/media/libaom/src/test/test_vector_test.cc
similarity index 100%
rename from third_party/aom/test/test_vector_test.cc
rename to media/libaom/src/test/test_vector_test.cc
diff --git a/third_party/aom/test/test_vectors.cc b/media/libaom/src/test/test_vectors.cc
similarity index 100%
rename from third_party/aom/test/test_vectors.cc
rename to media/libaom/src/test/test_vectors.cc
diff --git a/third_party/aom/test/test_vectors.h b/media/libaom/src/test/test_vectors.h
similarity index 100%
rename from third_party/aom/test/test_vectors.h
rename to media/libaom/src/test/test_vectors.h
diff --git a/third_party/aom/test/tile_independence_test.cc b/media/libaom/src/test/tile_independence_test.cc
similarity index 100%
rename from third_party/aom/test/tile_independence_test.cc
rename to media/libaom/src/test/tile_independence_test.cc
diff --git a/third_party/aom/test/time_stamp_test.cc b/media/libaom/src/test/time_stamp_test.cc
similarity index 100%
rename from third_party/aom/test/time_stamp_test.cc
rename to media/libaom/src/test/time_stamp_test.cc
diff --git a/third_party/aom/test/tools_common.sh b/media/libaom/src/test/tools_common.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/tools_common.sh
rename to media/libaom/src/test/tools_common.sh
diff --git a/third_party/aom/test/transform_test_base.h b/media/libaom/src/test/transform_test_base.h
similarity index 100%
rename from third_party/aom/test/transform_test_base.h
rename to media/libaom/src/test/transform_test_base.h
diff --git a/third_party/aom/test/twopass_encoder.sh b/media/libaom/src/test/twopass_encoder.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/twopass_encoder.sh
rename to media/libaom/src/test/twopass_encoder.sh
diff --git a/third_party/aom/test/util.h b/media/libaom/src/test/util.h
similarity index 100%
rename from third_party/aom/test/util.h
rename to media/libaom/src/test/util.h
diff --git a/third_party/aom/test/variance_test.cc b/media/libaom/src/test/variance_test.cc
similarity index 100%
rename from third_party/aom/test/variance_test.cc
rename to media/libaom/src/test/variance_test.cc
diff --git a/third_party/aom/test/video_source.h b/media/libaom/src/test/video_source.h
similarity index 100%
rename from third_party/aom/test/video_source.h
rename to media/libaom/src/test/video_source.h
diff --git a/third_party/aom/test/visual_metrics.py b/media/libaom/src/test/visual_metrics.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/test/visual_metrics.py
rename to media/libaom/src/test/visual_metrics.py
diff --git a/third_party/aom/test/warp_filter_test.cc b/media/libaom/src/test/warp_filter_test.cc
similarity index 100%
rename from third_party/aom/test/warp_filter_test.cc
rename to media/libaom/src/test/warp_filter_test.cc
diff --git a/third_party/aom/test/warp_filter_test_util.cc b/media/libaom/src/test/warp_filter_test_util.cc
similarity index 100%
rename from third_party/aom/test/warp_filter_test_util.cc
rename to media/libaom/src/test/warp_filter_test_util.cc
diff --git a/third_party/aom/test/warp_filter_test_util.h b/media/libaom/src/test/warp_filter_test_util.h
similarity index 100%
rename from third_party/aom/test/warp_filter_test_util.h
rename to media/libaom/src/test/warp_filter_test_util.h
diff --git a/third_party/aom/test/webm_video_source.h b/media/libaom/src/test/webm_video_source.h
similarity index 100%
rename from third_party/aom/test/webm_video_source.h
rename to media/libaom/src/test/webm_video_source.h
diff --git a/third_party/aom/test/wiener_test.cc b/media/libaom/src/test/wiener_test.cc
similarity index 100%
rename from third_party/aom/test/wiener_test.cc
rename to media/libaom/src/test/wiener_test.cc
diff --git a/third_party/aom/test/y4m_test.cc b/media/libaom/src/test/y4m_test.cc
similarity index 100%
rename from third_party/aom/test/y4m_test.cc
rename to media/libaom/src/test/y4m_test.cc
diff --git a/third_party/aom/test/y4m_video_source.h b/media/libaom/src/test/y4m_video_source.h
similarity index 100%
rename from third_party/aom/test/y4m_video_source.h
rename to media/libaom/src/test/y4m_video_source.h
diff --git a/third_party/aom/test/yuv_temporal_filter_test.cc b/media/libaom/src/test/yuv_temporal_filter_test.cc
similarity index 100%
rename from third_party/aom/test/yuv_temporal_filter_test.cc
rename to media/libaom/src/test/yuv_temporal_filter_test.cc
diff --git a/third_party/aom/test/yuv_video_source.h b/media/libaom/src/test/yuv_video_source.h
similarity index 100%
rename from third_party/aom/test/yuv_video_source.h
rename to media/libaom/src/test/yuv_video_source.h
diff --git a/third_party/aom/third_party/fastfeat/LICENSE b/media/libaom/src/third_party/fastfeat/LICENSE
similarity index 100%
rename from third_party/aom/third_party/fastfeat/LICENSE
rename to media/libaom/src/third_party/fastfeat/LICENSE
diff --git a/third_party/aom/third_party/fastfeat/README.libaom b/media/libaom/src/third_party/fastfeat/README.libaom
similarity index 100%
rename from third_party/aom/third_party/fastfeat/README.libaom
rename to media/libaom/src/third_party/fastfeat/README.libaom
diff --git a/third_party/aom/third_party/fastfeat/fast.c b/media/libaom/src/third_party/fastfeat/fast.c
similarity index 100%
rename from third_party/aom/third_party/fastfeat/fast.c
rename to media/libaom/src/third_party/fastfeat/fast.c
diff --git a/third_party/aom/third_party/fastfeat/fast.h b/media/libaom/src/third_party/fastfeat/fast.h
similarity index 100%
rename from third_party/aom/third_party/fastfeat/fast.h
rename to media/libaom/src/third_party/fastfeat/fast.h
diff --git a/third_party/aom/third_party/fastfeat/fast_9.c b/media/libaom/src/third_party/fastfeat/fast_9.c
similarity index 100%
rename from third_party/aom/third_party/fastfeat/fast_9.c
rename to media/libaom/src/third_party/fastfeat/fast_9.c
diff --git a/third_party/aom/third_party/fastfeat/nonmax.c b/media/libaom/src/third_party/fastfeat/nonmax.c
similarity index 100%
rename from third_party/aom/third_party/fastfeat/nonmax.c
rename to media/libaom/src/third_party/fastfeat/nonmax.c
diff --git a/third_party/aom/third_party/googletest/README.libaom b/media/libaom/src/third_party/googletest/README.libaom
similarity index 100%
rename from third_party/aom/third_party/googletest/README.libaom
rename to media/libaom/src/third_party/googletest/README.libaom
diff --git a/third_party/aom/third_party/googletest/src/googletest/CHANGES b/media/libaom/src/third_party/googletest/src/googletest/CHANGES
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/CHANGES
rename to media/libaom/src/third_party/googletest/src/googletest/CHANGES
diff --git a/third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt b/media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/CMakeLists.txt
rename to media/libaom/src/third_party/googletest/src/googletest/CMakeLists.txt
diff --git a/third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS b/media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/CONTRIBUTORS
rename to media/libaom/src/third_party/googletest/src/googletest/CONTRIBUTORS
diff --git a/third_party/aom/third_party/googletest/src/googletest/LICENSE b/media/libaom/src/third_party/googletest/src/googletest/LICENSE
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/LICENSE
rename to media/libaom/src/third_party/googletest/src/googletest/LICENSE
diff --git a/third_party/aom/third_party/googletest/src/googletest/README.md b/media/libaom/src/third_party/googletest/src/googletest/README.md
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/README.md
rename to media/libaom/src/third_party/googletest/src/googletest/README.md
diff --git a/third_party/aom/third_party/googletest/src/googletest/cmake/Config.cmake.in b/media/libaom/src/third_party/googletest/src/googletest/cmake/Config.cmake.in
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/cmake/Config.cmake.in
rename to media/libaom/src/third_party/googletest/src/googletest/cmake/Config.cmake.in
diff --git a/third_party/aom/third_party/googletest/src/googletest/cmake/gtest.pc.in b/media/libaom/src/third_party/googletest/src/googletest/cmake/gtest.pc.in
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/cmake/gtest.pc.in
rename to media/libaom/src/third_party/googletest/src/googletest/cmake/gtest.pc.in
diff --git a/third_party/aom/third_party/googletest/src/googletest/cmake/gtest_main.pc.in b/media/libaom/src/third_party/googletest/src/googletest/cmake/gtest_main.pc.in
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/cmake/gtest_main.pc.in
rename to media/libaom/src/third_party/googletest/src/googletest/cmake/gtest_main.pc.in
diff --git a/third_party/aom/third_party/googletest/src/googletest/cmake/internal_utils.cmake b/media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/cmake/internal_utils.cmake
rename to media/libaom/src/third_party/googletest/src/googletest/cmake/internal_utils.cmake
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-death-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-message.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-message.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-message.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-param-test.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-printers.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-printers.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-spi.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-spi.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-test-part.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest-typed-test.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_pred_impl.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_prod.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/gtest_prod.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/README.md
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/custom/gtest.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-internal.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-string.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump b/media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
rename to media/libaom/src/third_party/googletest/src/googletest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-all.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-all.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-all.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-death-test.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-death-test.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-death-test.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-filepath.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-filepath.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-filepath.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-internal-inl.h b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-internal-inl.h
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-internal-inl.h
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-port.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-port.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-port.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-printers.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-printers.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-printers.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-test-part.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-test-part.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-test-part.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest-typed-test.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest-typed-test.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest-typed-test.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest.cc
diff --git a/third_party/aom/third_party/googletest/src/googletest/src/gtest_main.cc b/media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
similarity index 100%
rename from third_party/aom/third_party/googletest/src/googletest/src/gtest_main.cc
rename to media/libaom/src/third_party/googletest/src/googletest/src/gtest_main.cc
diff --git a/third_party/aom/third_party/libwebm/AUTHORS.TXT b/media/libaom/src/third_party/libwebm/AUTHORS.TXT
similarity index 100%
rename from third_party/aom/third_party/libwebm/AUTHORS.TXT
rename to media/libaom/src/third_party/libwebm/AUTHORS.TXT
diff --git a/third_party/aom/third_party/libwebm/Android.mk b/media/libaom/src/third_party/libwebm/Android.mk
similarity index 100%
rename from third_party/aom/third_party/libwebm/Android.mk
rename to media/libaom/src/third_party/libwebm/Android.mk
diff --git a/third_party/aom/third_party/libwebm/LICENSE.TXT b/media/libaom/src/third_party/libwebm/LICENSE.TXT
similarity index 100%
rename from third_party/aom/third_party/libwebm/LICENSE.TXT
rename to media/libaom/src/third_party/libwebm/LICENSE.TXT
diff --git a/third_party/aom/third_party/libwebm/PATENTS.TXT b/media/libaom/src/third_party/libwebm/PATENTS.TXT
similarity index 100%
rename from third_party/aom/third_party/libwebm/PATENTS.TXT
rename to media/libaom/src/third_party/libwebm/PATENTS.TXT
diff --git a/third_party/aom/third_party/libwebm/README.libaom b/media/libaom/src/third_party/libwebm/README.libaom
similarity index 100%
rename from third_party/aom/third_party/libwebm/README.libaom
rename to media/libaom/src/third_party/libwebm/README.libaom
diff --git a/third_party/aom/third_party/libwebm/common/file_util.cc b/media/libaom/src/third_party/libwebm/common/file_util.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/file_util.cc
rename to media/libaom/src/third_party/libwebm/common/file_util.cc
diff --git a/third_party/aom/third_party/libwebm/common/file_util.h b/media/libaom/src/third_party/libwebm/common/file_util.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/file_util.h
rename to media/libaom/src/third_party/libwebm/common/file_util.h
diff --git a/third_party/aom/third_party/libwebm/common/hdr_util.cc b/media/libaom/src/third_party/libwebm/common/hdr_util.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/hdr_util.cc
rename to media/libaom/src/third_party/libwebm/common/hdr_util.cc
diff --git a/third_party/aom/third_party/libwebm/common/hdr_util.h b/media/libaom/src/third_party/libwebm/common/hdr_util.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/hdr_util.h
rename to media/libaom/src/third_party/libwebm/common/hdr_util.h
diff --git a/third_party/aom/third_party/libwebm/common/webmids.h b/media/libaom/src/third_party/libwebm/common/webmids.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/common/webmids.h
rename to media/libaom/src/third_party/libwebm/common/webmids.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.cc
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxer.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxer.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxertypes.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.cc
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.cc
diff --git a/third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h b/media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvmuxer/mkvwriter.h
rename to media/libaom/src/third_party/libwebm/mkvmuxer/mkvwriter.h
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvparser.cc
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvparser.cc
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvparser.h b/media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvparser.h
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvparser.h
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvreader.cc
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvreader.cc
diff --git a/third_party/aom/third_party/libwebm/mkvparser/mkvreader.h b/media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
similarity index 100%
rename from third_party/aom/third_party/libwebm/mkvparser/mkvreader.h
rename to media/libaom/src/third_party/libwebm/mkvparser/mkvreader.h
diff --git a/third_party/aom/third_party/libyuv/README.libaom b/media/libaom/src/third_party/libyuv/README.libaom
similarity index 100%
rename from third_party/aom/third_party/libyuv/README.libaom
rename to media/libaom/src/third_party/libyuv/README.libaom
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/basic_types.h b/media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/basic_types.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/basic_types.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/compare.h b/media/libaom/src/third_party/libyuv/include/libyuv/compare.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/compare.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/compare.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_from.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert_from.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert_from.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/convert_from_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/convert_from_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/convert_from_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h b/media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/cpu_id.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/cpu_id.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h b/media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/mjpeg_decoder.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/mjpeg_decoder.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h b/media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/planar_functions.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/planar_functions.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/rotate.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/rotate.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/rotate_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/rotate_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h b/media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/rotate_row.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/rotate_row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/row.h b/media/libaom/src/third_party/libyuv/include/libyuv/row.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/row.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/scale.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/scale.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/scale_argb.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/scale_argb.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/scale_row.h b/media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/scale_row.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/scale_row.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/version.h b/media/libaom/src/third_party/libyuv/include/libyuv/version.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/version.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/version.h
diff --git a/third_party/aom/third_party/libyuv/include/libyuv/video_common.h b/media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
similarity index 100%
rename from third_party/aom/third_party/libyuv/include/libyuv/video_common.h
rename to media/libaom/src/third_party/libyuv/include/libyuv/video_common.h
diff --git a/third_party/aom/third_party/libyuv/source/compare.cc b/media/libaom/src/third_party/libyuv/source/compare.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare.cc
rename to media/libaom/src/third_party/libyuv/source/compare.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_common.cc b/media/libaom/src/third_party/libyuv/source/compare_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_common.cc
rename to media/libaom/src/third_party/libyuv/source/compare_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_gcc.cc b/media/libaom/src/third_party/libyuv/source/compare_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/compare_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_neon.cc b/media/libaom/src/third_party/libyuv/source/compare_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_neon.cc
rename to media/libaom/src/third_party/libyuv/source/compare_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_neon64.cc b/media/libaom/src/third_party/libyuv/source/compare_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/compare_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/compare_win.cc b/media/libaom/src/third_party/libyuv/source/compare_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/compare_win.cc
rename to media/libaom/src/third_party/libyuv/source/compare_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert.cc b/media/libaom/src/third_party/libyuv/source/convert.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert.cc
rename to media/libaom/src/third_party/libyuv/source/convert.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_argb.cc
rename to media/libaom/src/third_party/libyuv/source/convert_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_from.cc b/media/libaom/src/third_party/libyuv/source/convert_from.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_from.cc
rename to media/libaom/src/third_party/libyuv/source/convert_from.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_from_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_from_argb.cc
rename to media/libaom/src/third_party/libyuv/source/convert_from_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_jpeg.cc b/media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_jpeg.cc
rename to media/libaom/src/third_party/libyuv/source/convert_jpeg.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_to_argb.cc b/media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_to_argb.cc
rename to media/libaom/src/third_party/libyuv/source/convert_to_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/convert_to_i420.cc b/media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/convert_to_i420.cc
rename to media/libaom/src/third_party/libyuv/source/convert_to_i420.cc
diff --git a/third_party/aom/third_party/libyuv/source/cpu_id.cc b/media/libaom/src/third_party/libyuv/source/cpu_id.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/cpu_id.cc
rename to media/libaom/src/third_party/libyuv/source/cpu_id.cc
diff --git a/third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc b/media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/mjpeg_decoder.cc
rename to media/libaom/src/third_party/libyuv/source/mjpeg_decoder.cc
diff --git a/third_party/aom/third_party/libyuv/source/mjpeg_validate.cc b/media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/mjpeg_validate.cc
rename to media/libaom/src/third_party/libyuv/source/mjpeg_validate.cc
diff --git a/third_party/aom/third_party/libyuv/source/planar_functions.cc b/media/libaom/src/third_party/libyuv/source/planar_functions.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/planar_functions.cc
rename to media/libaom/src/third_party/libyuv/source/planar_functions.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate.cc b/media/libaom/src/third_party/libyuv/source/rotate.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate.cc
rename to media/libaom/src/third_party/libyuv/source/rotate.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_any.cc b/media/libaom/src/third_party/libyuv/source/rotate_any.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_any.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_argb.cc b/media/libaom/src/third_party/libyuv/source/rotate_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_argb.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_common.cc b/media/libaom/src/third_party/libyuv/source/rotate_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_common.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_gcc.cc b/media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_mips.cc b/media/libaom/src/third_party/libyuv/source/rotate_mips.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_mips.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_neon.cc b/media/libaom/src/third_party/libyuv/source/rotate_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_neon.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_neon64.cc b/media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/rotate_win.cc b/media/libaom/src/third_party/libyuv/source/rotate_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/rotate_win.cc
rename to media/libaom/src/third_party/libyuv/source/rotate_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_any.cc b/media/libaom/src/third_party/libyuv/source/row_any.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_any.cc
rename to media/libaom/src/third_party/libyuv/source/row_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_common.cc b/media/libaom/src/third_party/libyuv/source/row_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_common.cc
rename to media/libaom/src/third_party/libyuv/source/row_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_gcc.cc b/media/libaom/src/third_party/libyuv/source/row_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/row_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_mips.cc b/media/libaom/src/third_party/libyuv/source/row_mips.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_mips.cc
rename to media/libaom/src/third_party/libyuv/source/row_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_neon.cc b/media/libaom/src/third_party/libyuv/source/row_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_neon.cc
rename to media/libaom/src/third_party/libyuv/source/row_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_neon64.cc b/media/libaom/src/third_party/libyuv/source/row_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/row_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_win.cc b/media/libaom/src/third_party/libyuv/source/row_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_win.cc
rename to media/libaom/src/third_party/libyuv/source/row_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/row_x86.asm b/media/libaom/src/third_party/libyuv/source/row_x86.asm
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/row_x86.asm
rename to media/libaom/src/third_party/libyuv/source/row_x86.asm
diff --git a/third_party/aom/third_party/libyuv/source/scale.cc b/media/libaom/src/third_party/libyuv/source/scale.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale.cc
rename to media/libaom/src/third_party/libyuv/source/scale.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_any.cc b/media/libaom/src/third_party/libyuv/source/scale_any.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_any.cc
rename to media/libaom/src/third_party/libyuv/source/scale_any.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_argb.cc b/media/libaom/src/third_party/libyuv/source/scale_argb.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_argb.cc
rename to media/libaom/src/third_party/libyuv/source/scale_argb.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_common.cc b/media/libaom/src/third_party/libyuv/source/scale_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_common.cc
rename to media/libaom/src/third_party/libyuv/source/scale_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_gcc.cc b/media/libaom/src/third_party/libyuv/source/scale_gcc.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_gcc.cc
rename to media/libaom/src/third_party/libyuv/source/scale_gcc.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_mips.cc b/media/libaom/src/third_party/libyuv/source/scale_mips.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_mips.cc
rename to media/libaom/src/third_party/libyuv/source/scale_mips.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_neon.cc b/media/libaom/src/third_party/libyuv/source/scale_neon.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_neon.cc
rename to media/libaom/src/third_party/libyuv/source/scale_neon.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_neon64.cc b/media/libaom/src/third_party/libyuv/source/scale_neon64.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_neon64.cc
rename to media/libaom/src/third_party/libyuv/source/scale_neon64.cc
diff --git a/third_party/aom/third_party/libyuv/source/scale_win.cc b/media/libaom/src/third_party/libyuv/source/scale_win.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/scale_win.cc
rename to media/libaom/src/third_party/libyuv/source/scale_win.cc
diff --git a/third_party/aom/third_party/libyuv/source/video_common.cc b/media/libaom/src/third_party/libyuv/source/video_common.cc
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/video_common.cc
rename to media/libaom/src/third_party/libyuv/source/video_common.cc
diff --git a/third_party/aom/third_party/libyuv/source/x86inc.asm b/media/libaom/src/third_party/libyuv/source/x86inc.asm
similarity index 100%
rename from third_party/aom/third_party/libyuv/source/x86inc.asm
rename to media/libaom/src/third_party/libyuv/source/x86inc.asm
diff --git a/third_party/aom/third_party/vector/LICENSE b/media/libaom/src/third_party/vector/LICENSE
similarity index 100%
rename from third_party/aom/third_party/vector/LICENSE
rename to media/libaom/src/third_party/vector/LICENSE
diff --git a/third_party/aom/third_party/vector/README.libaom b/media/libaom/src/third_party/vector/README.libaom
similarity index 100%
rename from third_party/aom/third_party/vector/README.libaom
rename to media/libaom/src/third_party/vector/README.libaom
diff --git a/third_party/aom/third_party/vector/vector.c b/media/libaom/src/third_party/vector/vector.c
similarity index 100%
rename from third_party/aom/third_party/vector/vector.c
rename to media/libaom/src/third_party/vector/vector.c
diff --git a/third_party/aom/third_party/vector/vector.h b/media/libaom/src/third_party/vector/vector.h
similarity index 100%
rename from third_party/aom/third_party/vector/vector.h
rename to media/libaom/src/third_party/vector/vector.h
diff --git a/third_party/aom/third_party/x86inc/LICENSE b/media/libaom/src/third_party/x86inc/LICENSE
similarity index 100%
rename from third_party/aom/third_party/x86inc/LICENSE
rename to media/libaom/src/third_party/x86inc/LICENSE
diff --git a/third_party/aom/third_party/x86inc/README.libaom b/media/libaom/src/third_party/x86inc/README.libaom
similarity index 100%
rename from third_party/aom/third_party/x86inc/README.libaom
rename to media/libaom/src/third_party/x86inc/README.libaom
diff --git a/third_party/aom/third_party/x86inc/x86inc.asm b/media/libaom/src/third_party/x86inc/x86inc.asm
similarity index 100%
rename from third_party/aom/third_party/x86inc/x86inc.asm
rename to media/libaom/src/third_party/x86inc/x86inc.asm
diff --git a/third_party/aom/tools/aggregate_entropy_stats.py b/media/libaom/src/tools/aggregate_entropy_stats.py
similarity index 100%
rename from third_party/aom/tools/aggregate_entropy_stats.py
rename to media/libaom/src/tools/aggregate_entropy_stats.py
diff --git a/third_party/aom/tools/aom_entropy_optimizer.c b/media/libaom/src/tools/aom_entropy_optimizer.c
similarity index 100%
rename from third_party/aom/tools/aom_entropy_optimizer.c
rename to media/libaom/src/tools/aom_entropy_optimizer.c
diff --git a/third_party/aom/tools/cpplint.py b/media/libaom/src/tools/cpplint.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/tools/cpplint.py
rename to media/libaom/src/tools/cpplint.py
diff --git a/third_party/aom/tools/diff.py b/media/libaom/src/tools/diff.py
similarity index 100%
rename from third_party/aom/tools/diff.py
rename to media/libaom/src/tools/diff.py
diff --git a/third_party/aom/tools/dump_obu.cc b/media/libaom/src/tools/dump_obu.cc
similarity index 100%
rename from third_party/aom/tools/dump_obu.cc
rename to media/libaom/src/tools/dump_obu.cc
diff --git a/third_party/aom/tools/gen_authors.sh b/media/libaom/src/tools/gen_authors.sh
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/tools/gen_authors.sh
rename to media/libaom/src/tools/gen_authors.sh
diff --git a/third_party/aom/tools/gen_constrained_tokenset.py b/media/libaom/src/tools/gen_constrained_tokenset.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/tools/gen_constrained_tokenset.py
rename to media/libaom/src/tools/gen_constrained_tokenset.py
diff --git a/third_party/aom/tools/inspect-cli.js b/media/libaom/src/tools/inspect-cli.js
similarity index 100%
rename from third_party/aom/tools/inspect-cli.js
rename to media/libaom/src/tools/inspect-cli.js
diff --git a/third_party/aom/tools/inspect-post.js b/media/libaom/src/tools/inspect-post.js
similarity index 100%
rename from third_party/aom/tools/inspect-post.js
rename to media/libaom/src/tools/inspect-post.js
diff --git a/third_party/aom/tools/intersect-diffs.py b/media/libaom/src/tools/intersect-diffs.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/tools/intersect-diffs.py
rename to media/libaom/src/tools/intersect-diffs.py
diff --git a/third_party/aom/tools/lint-hunks.py b/media/libaom/src/tools/lint-hunks.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/tools/lint-hunks.py
rename to media/libaom/src/tools/lint-hunks.py
diff --git a/third_party/aom/tools/obu_parser.cc b/media/libaom/src/tools/obu_parser.cc
similarity index 100%
rename from third_party/aom/tools/obu_parser.cc
rename to media/libaom/src/tools/obu_parser.cc
diff --git a/third_party/aom/tools/obu_parser.h b/media/libaom/src/tools/obu_parser.h
similarity index 100%
rename from third_party/aom/tools/obu_parser.h
rename to media/libaom/src/tools/obu_parser.h
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc b/media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
similarity index 100%
rename from third_party/aom/tools/txfm_analyzer/txfm_gen_code.cc
rename to media/libaom/src/tools/txfm_analyzer/txfm_gen_code.cc
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.cc b/media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
similarity index 100%
rename from third_party/aom/tools/txfm_analyzer/txfm_graph.cc
rename to media/libaom/src/tools/txfm_analyzer/txfm_graph.cc
diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.h b/media/libaom/src/tools/txfm_analyzer/txfm_graph.h
similarity index 100%
rename from third_party/aom/tools/txfm_analyzer/txfm_graph.h
rename to media/libaom/src/tools/txfm_analyzer/txfm_graph.h
diff --git a/third_party/aom/tools/wrap-commit-msg.py b/media/libaom/src/tools/wrap-commit-msg.py
old mode 100755
new mode 100644
similarity index 100%
rename from third_party/aom/tools/wrap-commit-msg.py
rename to media/libaom/src/tools/wrap-commit-msg.py
diff --git a/third_party/aom/usage.dox b/media/libaom/src/usage.dox
similarity index 100%
rename from third_party/aom/usage.dox
rename to media/libaom/src/usage.dox
diff --git a/third_party/aom/usage_cx.dox b/media/libaom/src/usage_cx.dox
similarity index 100%
rename from third_party/aom/usage_cx.dox
rename to media/libaom/src/usage_cx.dox
diff --git a/third_party/aom/usage_dx.dox b/media/libaom/src/usage_dx.dox
similarity index 100%
rename from third_party/aom/usage_dx.dox
rename to media/libaom/src/usage_dx.dox
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 32e50712f6..7a29e041ba 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -174,6 +174,8 @@ nsHttpHandler::nsHttpHandler()
     , mLegacyAppName("Mozilla")
     , mLegacyAppVersion("5.0")
     , mProduct("Goanna")
+    , mCompatGeckoEnabled(false)
+    , mAppBuildID("20200101")
     , mCompatFirefoxEnabled(false)
     , mCompatFirefoxVersion("68.9")
     , mUserAgentIsDirty(true)
@@ -291,8 +293,13 @@ nsHttpHandler::Init()
     nsHttpChannelAuthProvider::InitializePrefs();
 
     // rv: should have the Firefox/Gecko compatversion for web compatibility
+    // when in either compatmodes
     mMisc.AssignLiteral("rv:");
-    mMisc += mCompatFirefoxVersion;
+    if (mCompatGeckoEnabled) {
+      mMisc += mCompatFirefoxVersion;
+    } else {
+      mMisc += MOZILLA_UAVERSION;
+    }
 
     mCompatGecko.AssignLiteral("Gecko/20100101");
     mCompatFirefox.AssignLiteral("Firefox/");
@@ -301,6 +308,14 @@ nsHttpHandler::Init()
     nsCOMPtr<nsIXULAppInfo> appInfo =
         do_GetService("@mozilla.org/xre/app-info;1");
 
+    nsCString dynamicBuildID;
+    if (appInfo) {
+      appInfo->GetPlatformBuildID(dynamicBuildID);
+      if (dynamicBuildID.Length() > 8 )
+        dynamicBuildID.Left(dynamicBuildID, 8);
+    }
+    mAppBuildID.Assign(dynamicBuildID);
+
     mAppName.AssignLiteral(MOZ_APP_UA_NAME);
     if (mAppName.Length() == 0 && appInfo) {
         // Try to get the UA name from appInfo, falling back to the name
@@ -310,28 +325,9 @@ nsHttpHandler::Init()
         }
         mAppName.StripChars(R"( ()<>@,;:\"/[]?={})");
     }
-    
-    nsCString dynamicBuildID;
-    if (appInfo) {
-      appInfo->GetPlatformBuildID(dynamicBuildID);
-      if (dynamicBuildID.Length() > 8 )
-        dynamicBuildID.Left(dynamicBuildID, 8);
-    }
 
-    if (mAppVersionIsBuildID) {
-      // Override BuildID
-      mAppVersion.AssignLiteral(MOZ_UA_BUILDID);
-    } else if (appInfo) {
-      appInfo->GetVersion(mAppVersion);
-    } else {
-      // Fall back to platform if appInfo is unavailable
-      mAppVersion.AssignLiteral(MOZILLA_UAVERSION);
-    }
+    BuildAppVersion();    
 
-    // If there's no override set, set it to the dynamic BuildID
-    if (mAppVersion.IsEmpty())
-      mAppVersion.Assign(dynamicBuildID);
-        
     mSessionStartTime = NowInSeconds();
     mHandlerActive = true;
 
@@ -348,10 +344,15 @@ nsHttpHandler::Init()
         do_GetService("@mozilla.org/network/request-context-service;1");
 
     // Goanna slice version
-    mProductSub.AssignLiteral(MOZILLA_UAVERSION);
-    
-    if (mProductSub.IsEmpty())
-        mProductSub.Assign(dynamicBuildID);
+    if (mCompatGeckoEnabled) {
+      mProductSub.AssignLiteral(MOZILLA_UAVERSION);
+    } else {
+      mProductSub.Assign(mAppBuildID);
+    }
+    // In case MOZILLA_UAVERSION is empty for some odd reason...
+    if (mProductSub.IsEmpty()) {
+      mProductSub.Assign(mAppBuildID);
+    }
 
 #if DEBUG
     // dump user agent prefs
@@ -657,6 +658,30 @@ nsHttpHandler::GenerateHostPort(const nsCString& host, int32_t port,
 // nsHttpHandler <private>
 //-----------------------------------------------------------------------------
 
+void
+nsHttpHandler::BuildAppVersion()
+{
+    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
+
+    if (mAppVersionIsBuildID) {
+      // Override with BuildID
+      mAppVersion.Assign(mAppBuildID);
+    } else if (appInfo) {
+      appInfo->GetVersion(mAppVersion);
+    } else {
+      // Fall back to platform if appInfo is unavailable
+      mAppVersion.AssignLiteral(MOZILLA_UAVERSION);
+    }
+
+    // If there's still no version set, set it to a fixed BuildID
+    if (mAppVersion.IsEmpty()) {
+      mAppVersion.AssignLiteral(MOZ_UA_BUILDID);
+    }
+    if (mAppVersion.IsEmpty()) {
+      mAppVersion.AssignLiteral("20200101");
+    }
+}
+
 const nsAFlatCString &
 nsHttpHandler::UserAgent()
 {
@@ -782,21 +807,6 @@ nsHttpHandler::InitUserAgentComponents()
     );
 #endif
 
-
-#ifdef MOZ_MULET
-    {
-        // Add the `Mobile` or `Tablet` or `TV` token when running in the b2g
-        // desktop simulator via preference.
-        nsCString deviceType;
-        nsresult rv = Preferences::GetCString("devtools.useragent.device_type", &deviceType);
-        if (NS_SUCCEEDED(rv)) {
-            mCompatDevice.Assign(deviceType);
-        } else {
-            mCompatDevice.AssignLiteral("Mobile");
-        }
-    }
-#endif // MOZ_MULET
-
 #ifndef MOZ_UA_OS_AGNOSTIC
     // Gather OS/CPU.
 #if defined(XP_WIN)
@@ -924,12 +934,34 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
     if (PREF_CHANGED(UA_PREF("appVersionIsBuildID"))) {
         rv = prefs->GetBoolPref(UA_PREF("appVersionIsBuildID"), &cVar);
         mAppVersionIsBuildID = (NS_SUCCEEDED(rv) && cVar);
+        
+        // Rebuild application version string.
+        BuildAppVersion();
+
         mUserAgentIsDirty = true;
     }
 
     if (PREF_CHANGED(UA_PREF("compatMode.gecko"))) {
         rv = prefs->GetBoolPref(UA_PREF("compatMode.gecko"), &cVar);
         mCompatGeckoEnabled = (NS_SUCCEEDED(rv) && cVar);
+        
+        // Rebuild rv: and Goanna slice version
+        mMisc.AssignLiteral("rv:");
+        if (mCompatGeckoEnabled) {
+          mMisc += mCompatFirefoxVersion;
+        } else {
+          mMisc += MOZILLA_UAVERSION;
+        }
+        
+        if (mCompatGeckoEnabled) {
+          mProductSub.AssignLiteral(MOZILLA_UAVERSION);
+        } else {
+          mProductSub.Assign(mAppBuildID);
+        }
+        // In case MOZILLA_UAVERSION is empty for some odd reason...
+        if (mProductSub.IsEmpty()) {
+          mProductSub.Assign(mAppBuildID);
+        }
         mUserAgentIsDirty = true;
     }
 
@@ -948,7 +980,11 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         
         // rebuild mMisc and compatMode slice
         mMisc.AssignLiteral("rv:");
-        mMisc += mCompatFirefoxVersion;
+        if (mCompatGeckoEnabled) {
+          mMisc += mCompatFirefoxVersion;
+        } else {
+          mMisc += MOZILLA_UAVERSION;
+        }
         mCompatFirefox.AssignLiteral("Firefox/");
         mCompatFirefox += mCompatFirefoxVersion;
         
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 402147577a..4f632e0784 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -391,6 +391,7 @@ private:
     //
     // Useragent/prefs helper methods
     //
+    void     BuildAppVersion();
     void     BuildUserAgent();
     void     InitUserAgentComponents();
     void     PrefsChanged(nsIPrefBranch *prefs, const char *pref);
@@ -500,6 +501,7 @@ private:
     nsCString      mCompatFirefox;
     bool           mCompatFirefoxEnabled;
     nsCString      mCompatFirefoxVersion;
+    nsCString      mAppBuildID;
     nsXPIDLCString mCompatDevice;
     nsCString      mDeviceModelId;
 
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 6e57ab5ae9..bd3fbe921f 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -541,6 +541,25 @@ class Build(MachCommandBase):
                 # as when doing OSX Universal builds)
                 pass
 
+        # Check for un-preprocessed files.. In case something goes wrong it will be noted
+        ppcheck_script = mozpath.join(self.topsrcdir, "build", "ppCheck.py")
+        ppcheck_path = mozpath.join(self.topobjdir, "dist", "bin")
+        if not os.path.exists(ppcheck_script):
+            ppcheck_script = mozpath.join(self.topsrcdir, "mozilla", "build", "ppCheck.py")
+
+        if not os.path.exists(ppcheck_script):
+            ppcheck_script = mozpath.join(self.topsrcdir, "platform", "build", "ppCheck.py")
+        else:
+            ppcheck_script = None
+        
+        if ppcheck_script:
+            ppcheck_cmd = [which.which("python2.7"), ppcheck_script, ppcheck_path]
+            ppcheck_result = subprocess.call(ppcheck_cmd, cwd=self.topsrcdir)
+        
+        if not ppcheck_script or ppcheck_result: 
+            print("\nWARNING: Something has gone wrong with the check for un-preprocessed files. " +
+                  "Please manually verify that files are properly preprocessed.")
+
         return status
 
     @Command('configure', category='build',
diff --git a/services/sync/moz.build b/services/sync/moz.build
index 56421a03ee..3c19a007da 100644
--- a/services/sync/moz.build
+++ b/services/sync/moz.build
@@ -9,11 +9,8 @@ DIRS += ['locales']
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 EXTRA_COMPONENTS += [
-    'Weave.js',
-]
-
-EXTRA_PP_COMPONENTS += [
     'SyncComponents.manifest',
+    'Weave.js',
 ]
 
 EXTRA_JS_MODULES['services-sync'] += [
diff --git a/toolkit/components/mozprotocol/mozProtocolHandler.js b/toolkit/components/mozprotocol/mozProtocolHandler.js
index a92483f6a2..97bfb737e4 100644
--- a/toolkit/components/mozprotocol/mozProtocolHandler.js
+++ b/toolkit/components/mozprotocol/mozProtocolHandler.js
@@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
 
 function mozProtocolHandler() {
   XPCOMUtils.defineLazyPreferenceGetter(this, "urlToLoad", "toolkit.mozprotocol.url",
-                                        "https://www.mozilla.org/protocol");
+                                        "http://thereisonlyxul.org/");
 }
 
 mozProtocolHandler.prototype = {
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build
index 145e2fca4f..79777a981a 100644
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -21,12 +21,9 @@ XPIDL_MODULE = 'loginmgr'
 EXTRA_COMPONENTS += [
     'crypto-SDR.js',
     'nsLoginInfo.js',
-    'nsLoginManagerPrompter.js',
-]
-
-EXTRA_PP_COMPONENTS += [
     'nsLoginManager.js',
-    'passwordmgr.manifest',
+    'nsLoginManagerPrompter.js',
+    'passwordmgr.manifest'
 ]
 
 EXTRA_JS_MODULES += [
diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build
index 920f4afff4..f9f727da0b 100644
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -20,19 +20,17 @@ LOCAL_INCLUDES += ['../build']
 EXTRA_COMPONENTS += [
     'FormHistoryStartup.js',
     'nsFormAutoComplete.js',
+    'nsFormHistory.js',
     'nsInputListAutoComplete.js',
     'satchel.manifest',
 ]
 
-EXTRA_PP_COMPONENTS += ['nsFormHistory.js']
-
 EXTRA_JS_MODULES += [
     'AutoCompletePopup.jsm',
+    'FormHistory.jsm',
     'nsFormAutoCompleteResult.jsm',
 ]
 
-EXTRA_PP_JS_MODULES += ['FormHistory.jsm']
-
 FINAL_LIBRARY = 'xul'
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 54f3a8fc9c..a3764d3bc6 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -30,13 +30,13 @@ toolkit.jar:
 #endif
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
-*  content/global/aboutTelemetry.js
+   content/global/aboutTelemetry.js
    content/global/aboutTelemetry.xhtml
    content/global/aboutTelemetry.css
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
-*  content/global/browser-child.js
+   content/global/browser-child.js
    content/global/browser-content.js
 *  content/global/buildconfig.html
 *  content/global/contentAreaUtils.js
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index edcaea9c0b..8a364df8c2 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -44,6 +44,7 @@ EXTRA_JS_MODULES += [
     'Locale.jsm',
     'Log.jsm',
     'Memory.jsm',
+    'NewTabUtils.jsm',
     'NLP.jsm',
     'ObjectUtils.jsm',
     'PageMenu.jsm',
@@ -85,7 +86,6 @@ EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
 
 EXTRA_PP_JS_MODULES += [
     'addons/WebRequest.jsm',
-    'NewTabUtils.jsm',
     'ResetProfile.jsm',
     'Troubleshoot.jsm',
     'UpdateUtils.jsm',
diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build
index 104e8d734d..0d6edc680c 100644
--- a/toolkit/mozapps/extensions/moz.build
+++ b/toolkit/mozapps/extensions/moz.build
@@ -20,9 +20,6 @@ EXTRA_COMPONENTS += [
     'amContentHandler.js',
     'amInstallTrigger.js',
     'amWebInstallListener.js',
-]
-
-EXTRA_PP_COMPONENTS += [
     'extensions.manifest',
 ]
 
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk
index 3125c04f13..8d7cb4e62d 100644
--- a/toolkit/mozapps/installer/packager-uxp.mk
+++ b/toolkit/mozapps/installer/packager-uxp.mk
@@ -18,10 +18,6 @@ else
 ifeq (WINNT,$(OS_ARCH))
 	cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR)
 else
-	# Other platforms such as Linux need the Package routine to spawn a pre-complete file
-  # Windows does not require this because it is dependent on generating the NSIS
-  # Installer which has its own call to generate the precomplete file
-	cd $(DIST)/$(MOZ_PKG_DIR); $(CREATE_PRECOMPLETE_CMD)
 	cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR)
 endif
 endif
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index dc9324597c..e700b51620 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -55,6 +55,7 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
 		$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
+	@(cd $(DIST)/$(MOZ_PKG_DIR) && $(CREATE_PRECOMPLETE_CMD))
 ifdef MOZ_PACKAGE_JSSHELL
 	# Package JavaScript Shell
 	@echo 'Packaging JavaScript Shell...'
diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in
index 7c55958b62..4788a55752 100644
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -34,8 +34,6 @@ OVERRIDE_DEFAULT_GOAL := full-update
 full-update:: complete-patch
 
 ifeq ($(OS_TARGET), WINNT)
-MOZ_PKG_FORMAT	:= SFX7Z
-UNPACKAGE	= '$(subst $(DIST),$(ABS_DIST),$(INSTALLER_PACKAGE))'
 ifdef AB_CD
 UNPACKAGE	= '$(PACKAGE_BASE_DIR)/$(PACKAGE)'
 endif
@@ -54,11 +52,6 @@ endif
 dir-stage := $(call mkdir_deps,$(STAGE_DIR))
 
 complete-patch:: $(dir-stage)
-ifeq ($(OS_TARGET), WINNT)
-	test -f $(UNPACKAGE)
-	$(RM) -rf '$(PACKAGE_DIR)'
-	cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE)
-endif
 	MAR=$(MAR_BIN) \
 	  $(srcdir)/make_full_update.sh \
 	  '$(DIST)/$(COMPLETE_MAR)' \