refactor: branding

refactor: branding

* add a waterfox moz.configure for UA name and profile
* add liquid glass compatible icon
* use modernized version of logo
* add private browsing icons

browser/app/Makefile.in

@@ -98,6 +98,7 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) $(objdir)/macbuild/Contents/MacOS-
 	rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
 	$(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
 	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
+	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/Assets.car '$(dist_dest)/Contents/Resources/Assets.car'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'
 	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'

browser/app/macbuild/Contents/Info.plist.in

@@ -190,6 +190,8 @@
 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>
 	<key>CFBundleIconFile</key>
 	<string>firefox.icns</string>
+	<key>CFBundleIconName</key>
+	<string>Waterfox</string>
 	<key>CFBundleIdentifier</key>
 	<string>@MOZ_MACBUNDLE_ID@</string>
 	<key>CFBundleInfoDictionaryVersion</key>

browser/installer/package-manifest.in

@@ -40,6 +40,7 @@
 #endif
 @APPNAME@/Contents/Frameworks
 @APPNAME@/Contents/PkgInfo
+@RESPATH@/Assets.car
 @RESPATH@/firefox.icns
 @RESPATH@/document.icns
 @RESPATH@/@LPROJ_ROOT@.lproj/*

browser/moz.configure

@@ -12,7 +12,6 @@ imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)
 imply_option("MOZ_NORMANDY", False)
 imply_option("MOZ_PROFILE_MIGRATOR", True)
 
-
 imply_option("MOZ_APP_VENDOR", "BrowserWorks")
 imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
 # Include the DevTools client, not just the server (which is the default)
@@ -70,3 +69,4 @@ def requires_stub_installer(
 imply_option("MOZ_STUB_INSTALLER", True, when=requires_stub_installer)
 
 include("../toolkit/moz.configure")
+include("../waterfox/moz.configure")

waterfox/browser/branding/branding-common.mozbuild

@@ -13,8 +13,11 @@ def Branding():
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         FINAL_TARGET_FILES['..'] += [
             'firefox.VisualElementsManifest.xml',
+            'private_browsing.VisualElementsManifest.xml',
         ]
         FINAL_TARGET_FILES.VisualElements += [
+            'PrivateBrowsing_150.png',
+            'PrivateBrowsing_70.png',
             'VisualElements_150.png',
             'VisualElements_70.png',
         ]

waterfox/browser/branding/configure.sh

@@ -3,25 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_DISPLAYNAME=Waterfox
-MOZ_APP_NAME=Waterfox
+MOZ_APP_NAME=waterfox
-MOZ_APP_PROFILE=Waterfox
-MOZ_APP_VENDOR="BrowserWorks"
 MOZ_DISTRIBUTION_ID=net.waterfox
 MOZ_INCLUDE_SOURCE_INFO=1
 MOZ_REQUIRE_SIGNING=
 MOZ_TELEMETRY_REPORTING=
-MOZ_APP_UA_NAME="Firefox"
+MOZ_ASYNCIHANDLERCONTROL_IID="fb2703de-e41b-4565-a50b-777f44879c65"
-
+MOZ_HANDLER_CLSID="af069df1-ed1c-4994-9097-8c033d09539c"
-if test "$MOZ_UPDATE_CHANNEL" = "beta"; then
+MOZ_IGECKOBACKCHANNEL_IID="6f2c203c-73b4-4f74-8a79-1e99202815e3"
-  # Official beta builds
+MOZ_IHANDLERCONTROL_IID="713883ba-0f4e-481e-823e-e1cb9a7a283c"
-  MOZ_ASYNCIHANDLERCONTROL_IID="d4d2d920-5d8d-46b0-8169-6c75518fd6e8"
-  MOZ_HANDLER_CLSID="bb83e31f-4bed-47ec-9edb-cd328ce4c65a"
-  MOZ_IGECKOBACKCHANNEL_IID="3248b994-9ae6-4eb6-81c7-f50c95ad9e9d"
-  MOZ_IHANDLERCONTROL_IID="eced8a70-3d19-4d40-b4eb-726231285528"
-else
-  # Official release/esr builds
-  MOZ_ASYNCIHANDLERCONTROL_IID="fb2703de-e41b-4565-a50b-777f44879c65"
-  MOZ_HANDLER_CLSID="af069df1-ed1c-4994-9097-8c033d09539c"
-  MOZ_IGECKOBACKCHANNEL_IID="6f2c203c-73b4-4f74-8a79-1e99202815e3"
-  MOZ_IHANDLERCONTROL_IID="713883ba-0f4e-481e-823e-e1cb9a7a283c"
-fi

waterfox/browser/branding/content/about-wordmark.svg

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+<!-- Generated by Pixelmator Pro 3.3.11 -->
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
+<svg width="341" height="32" viewBox="0 0 341 32" xmlns="http://www.w3.org/2000/svg">
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="341px" height="32px" viewBox="0 0 341 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>about-wordmark</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Page-1">
-        <g id="about-wordmark" fill="#FFFFFF" fill-rule="nonzero">
+        <g id="about-wordmark" fill="#053361" fill-rule="evenodd" >
-            <path d="M205.4176,31 C211.042595,31 213.954524,27.9176166 213.954524,23.4573936 C213.954524,19.224443 211.284072,16.4261503 208.286915,16.1846732 L208.286915,16.0142188 C210.999981,15.3181968 212.818161,12.9460399 212.818161,9.40911865 C212.818161,4.9346839 209.934641,1.90911865 204.650555,1.90911865 L195.204541,1.90911865 L195.204541,31 L205.4176,31 Z M205.26135,15.4176285 L196.980108,15.4176285 L196.980108,3.5568444 L204.650555,3.5568444 C208.769869,3.5568444 211.099413,5.8011604 211.099413,9.4091115 C211.099413,12.7471765 208.968733,15.4176285 205.26135,15.4176285 Z M205.4176,29.3522743 L196.980108,29.3522743 L196.980108,17.0369451 L205.474418,17.0369451 C209.480096,17.0369451 212.235775,19.7926243 212.235775,23.4573936 C212.235775,26.9232993 209.792596,29.3522743 205.4176,29.3522743 Z M222.07954,31 L222.07954,16.6250137 C222.07954,13.1022898 224.707379,10.5596786 228.343739,10.5596786 C228.798284,10.5596786 229.096579,10.6164967 229.323852,10.6449058 L229.323852,8.8977484 C229.053966,8.8835438 228.75567,8.8835438 228.443171,8.8835438 C225.559651,8.8835438 223.130676,10.3608151 222.193177,12.5909266 L222.036927,12.5909266 L222.036927,9.181839 L220.346587,9.181839 L220.346587,31 L222.07954,31 Z M241.411921,31.454545 C246.809643,31.454545 250.730094,26.7102314 250.730094,20.1619422 C250.730094,13.6136529 246.795438,8.8551348 241.411921,8.8551348 C236.014199,8.8551348 232.093748,13.5994484 232.093748,20.1619422 C232.093748,26.7102314 236.014199,31.454545 241.411921,31.454545 Z M241.411921,29.8494329 C236.823857,29.8494329 233.812496,25.5738688 233.812496,20.1619422 C233.812496,14.7784246 236.852266,10.4744514 241.411921,10.4744514 C245.98578,10.4744514 249.011345,14.76422 249.011345,20.1619422 C249.011345,25.5738688 245.999984,29.8494329 241.411921,29.8494329 Z M262.661922,31 L268.230099,12.0085408 L268.414757,12.0085408 L273.982934,31 L275.91475,31 L282.448835,9.181839 L280.630655,9.181839 L275.00566,28.4431843 L274.863615,28.4431843 L269.23862,9.181839 L267.434645,9.181839 L261.795446,28.4573888 L261.639196,28.4573888 L256.014201,9.181839 L254.196021,9.181839 L260.730106,31 L262.661922,31 Z M294.28124,31.454545 C298.826691,31.454545 301.980097,28.9261383 301.980097,25.3039827 C301.980097,22.4914854 300.218735,20.5454645 296.781238,19.6931926 L293.428969,18.8551348 C290.588062,18.1591032 289.224427,16.8096726 289.224427,14.735811 C289.224427,12.1789952 291.468743,10.4318378 294.678967,10.4318378 C297.661919,10.4318378 299.323849,11.9233136 300.119303,14.309675 L301.724415,13.8835391 C300.67328,10.6733148 298.372146,8.8551348 294.678967,8.8551348 C290.502835,8.8551348 287.505679,11.2699052 287.505679,14.7926291 C287.505679,17.6051264 289.281245,19.5795563 292.846583,20.4460328 L296.326693,21.2983047 C298.926122,21.9375086 300.218735,23.3437573 300.218735,25.3608008 C300.218735,28.0028438 297.832373,29.8636374 294.267036,29.8636374 C291.042607,29.8636374 289.039768,28.3579571 288.414769,25.5028462 L286.752839,25.9289821 C287.505679,29.4801151 290.218744,31.454545 294.28124,31.454545 Z M316.482943,31.454545 C320.786916,31.454545 323.428959,28.9403429 324.423276,26.7386404 L322.846573,26.0994365 C322.036915,27.7187531 320.034076,29.8494329 316.482943,29.8494329 C311.525561,29.8494329 308.556814,25.8437549 308.485792,20.4744419 L325.133503,20.4744419 L325.133503,19.3948974 C325.133503,12.9176309 320.957371,8.8551348 316.071012,8.8551348 C310.659085,8.8551348 306.767043,13.6704711 306.767043,20.1903512 C306.767043,26.6960268 310.559653,31.454545 316.482943,31.454545 Z M323.40055,18.8977388 L308.514201,18.8977388 C308.855109,14.1392206 311.937493,10.4744514 316.071012,10.4744514 C320.218735,10.4744514 323.40055,14.1676297 323.40055,18.8977388 Z M332.846586,31 L332.846586,16.6250137 C332.846586,13.1022898 335.474424,10.5596786 339.110784,10.5596786 C339.565329,10.5596786 339.863625,10.6164967 340.090897,10.6449058 L340.090897,8.8977484 C339.821011,8.8835438 339.522716,8.8835438 339.210216,8.8835438 C336.326696,8.8835438 333.897721,10.3608151 332.960222,12.5909266 L332.803972,12.5909266 L332.803972,9.181839 L331.113633,9.181839 L331.113633,31 L332.846586,31 Z" id="Browser"></path>
+            <path id="Browser" stroke="none" d="M 330.766998 10.686001 L 328.990997 10.686001 L 328.990997 30 L 330.841003 30 L 330.841003 19.936001 C 330.841003 15.163 333.394012 12.313999 337.686005 12.313999 C 337.834015 12.313999 337.981995 12.351 338.130005 12.351 L 338.130005 10.538 C 334.503998 10.538 331.950989 12.091999 330.766998 14.903999 Z M 323.256012 20.269001 C 323.256012 14.534 319.334015 10.538 314.042999 10.538 C 308.752014 10.538 304.792999 14.608 304.792999 20.343 C 304.792999 26.078001 308.899994 30.148001 314.746002 30.148001 C 317.669006 30.148001 320.333008 29.075001 322.035004 27.003 L 320.962006 25.782 C 319.481995 27.594999 317.225006 28.483 314.78299 28.483 C 310.15799 28.483 306.790985 25.375 306.605988 20.786999 L 323.218994 20.786999 C 323.218994 20.602001 323.256012 20.417 323.256012 20.269001 Z M 314.042999 12.166 C 318.149994 12.166 321.18399 15.163 321.442993 19.344 L 306.643005 19.344 C 306.938995 15.125999 309.936005 12.166 314.042999 12.166 Z M 294.100006 30.148001 C 299.020996 30.148001 301.721985 28.002001 301.721985 24.857 C 301.721985 17.493999 288.920013 21.601 288.920013 15.792 C 288.920013 13.719999 290.584991 12.166 294.359009 12.166 C 296.431 12.166 298.540009 12.721001 300.167999 13.905001 L 301.019012 12.424999 C 299.502014 11.278 296.838013 10.538 294.395996 10.538 C 289.511993 10.538 287.070007 12.906 287.070007 15.829 C 287.070007 23.414 299.872009 19.27 299.872009 24.894001 C 299.872009 27.077 298.243988 28.52 294.174011 28.52 C 291.325012 28.52 288.697998 27.447001 287.217987 26.188999 L 286.367004 27.669001 C 287.884003 29.075001 290.917999 30.148001 294.100006 30.148001 Z M 276.932007 27.890999 L 270.382996 10.686001 L 268.791992 10.686001 L 262.205994 27.927999 L 255.768005 10.686001 L 253.992004 10.686001 L 261.317993 30 L 263.019989 30 L 269.569 13.239 L 276.080994 30 L 277.820007 30 L 285.145996 10.686001 L 283.444 10.686001 Z M 242.707001 30.148001 C 248.257004 30.148001 252.363998 26.078001 252.363998 20.343 C 252.363998 14.608 248.257004 10.538 242.707001 10.538 C 237.156998 10.538 233.050003 14.608 233.050003 20.343 C 233.050003 26.078001 237.156998 30.148001 242.707001 30.148001 Z M 242.707001 28.483 C 238.266998 28.483 234.936996 25.190001 234.936996 20.343 C 234.936996 15.496 238.266998 12.202999 242.707001 12.202999 C 247.147003 12.202999 250.477005 15.496 250.477005 20.343 C 250.477005 25.190001 247.147003 28.483 242.707001 28.483 Z M 222.875 10.686001 L 221.098999 10.686001 L 221.098999 30 L 222.949005 30 L 222.949005 19.936001 C 222.949005 15.163 225.501999 12.313999 229.794006 12.313999 C 229.942001 12.313999 230.089996 12.351 230.238007 12.351 L 230.238007 10.538 C 226.612 10.538 224.059006 12.091999 222.875 14.903999 Z M 209.259003 16.643 C 211.848999 15.792 213.587997 13.794001 213.587997 10.723 C 213.587997 6.431 210.220993 4.1 204.671005 4.1 L 193.867004 4.1 L 193.867004 30 L 205.410995 30 C 211.774994 30 214.957001 27.521 214.957001 23.154999 C 214.957001 19.566 212.921997 17.346001 209.259003 16.643 Z M 204.597 5.728001 C 209.074005 5.728001 211.664001 7.466999 211.664001 10.871 C 211.664001 14.312 209.074005 16.050999 204.597 16.050999 L 195.753998 16.050999 L 195.753998 5.728001 Z M 195.753998 28.372 L 195.753998 17.679001 L 205.410995 17.679001 C 210.369003 17.679001 213.070007 19.306999 213.070007 23.007 C 213.070007 26.743999 210.369003 28.372 205.410995 28.372 Z"/>
-            <path d="M15.0710084,31 L20.5965713,11.9801318 L20.8238438,11.9801318 L26.3636112,31 L32.3579237,31 L40.6817794,1.90911865 L33.9630358,1.90911865 L29.1476995,22.1647812 L28.8920179,22.1647812 L23.5937275,1.90911865 L17.8408921,1.90911865 L12.5283971,22.1221676 L12.2869201,22.1221676 L7.47158378,1.90911865 L0.752840191,1.90911865 L9.07669589,31 L15.0710084,31 Z M47.7130599,31.4119314 C50.9374887,31.4119314 53.0255549,30.0056828 54.0908948,27.9744347 L54.2613492,27.9744347 L54.2613492,31 L59.99998,31 L59.99998,16.2841049 C59.99998,11.0852463 55.5965752,8.8977484 50.7386252,8.8977484 C45.5113575,8.8977484 42.0738608,11.3977484 41.2357934,15.3750149 L46.832379,15.8295599 C47.2443104,14.3806977 48.5369228,13.3153578 50.7102162,13.3153578 C52.7698733,13.3153578 53.9488495,14.3522886 53.9488495,16.1420596 L53.9488495,16.2272868 C53.9488495,17.5163481 52.6955954,17.7789346 49.5654443,18.098216 L48.9755051,18.157133 C48.8736886,18.167137 48.7701139,18.1772534 48.6647636,18.1875122 C44.3465859,18.5852391 40.4687487,20.0341014 40.4687487,24.9062558 C40.4687487,29.2244335 43.5511321,31.4119314 47.7130599,31.4119314 Z M49.4460128,27.235799 C47.5852192,27.235799 46.2499932,26.3693226 46.2499932,24.7073924 C46.2499932,23.0028485 47.6562418,22.1647812 49.7869216,21.866486 C51.1079431,21.6818271 53.2670319,21.3693274 53.991463,20.8863733 L53.991463,23.201712 C53.991463,25.4886416 52.1022603,27.235799 49.4460128,27.235799 Z M73.4232848,31.2982952 C74.9857833,31.241477 76.0937368,30.9289773 76.7045317,30.7301139 L75.7528281,26.2272773 C75.4545329,26.2840954 74.815329,26.4261407 74.2471477,26.4261407 C73.0397625,26.4261407 72.2016951,25.9715957 72.2016951,24.2954609 L72.2016951,13.7272892 L76.3068048,13.7272892 L76.3068048,9.181839 L72.2016951,9.181839 L72.2016951,3.9545712 L66.1505645,3.9545712 L66.1505645,9.181839 L63.1676128,9.181839 L63.1676128,13.7272892 L66.1505645,13.7272892 L66.1505645,25.0909147 C66.1221554,29.3664788 69.0340845,31.4829541 73.4232848,31.2982952 Z M89.9573746,31.426136 C95.3550967,31.426136 98.9914569,28.7982976 99.8437288,24.750006 L94.2471432,24.3806881 C93.6363483,26.0426184 92.0738498,26.9090948 90.0568063,26.9090948 C87.031241,26.9090948 85.1136292,24.9062558 85.1136292,21.653418 L85.1136292,21.6392135 L99.9715696,21.6392135 L99.9715696,19.9772832 C99.9715696,12.5625176 95.4829375,8.8977484 89.7158975,8.8977484 C83.2954491,8.8977484 79.1335213,13.4574031 79.1335213,20.1903512 C79.1335213,27.1079583 83.238631,31.426136 89.9573746,31.426136 Z M94.2755523,17.889217 L85.1136292,17.889217 C85.24147,15.403424 87.1306727,13.4147895 89.8153293,13.4147895 C92.4431677,13.4147895 94.2613477,15.2897877 94.2755523,17.889217 Z M109.971583,31 L109.971583,18.6562618 C109.971583,15.9716052 111.931808,14.1250161 114.60226,14.1250161 C115.440328,14.1250161 116.590895,14.2670614 117.159076,14.4517203 L117.159076,9.0824073 C116.619304,8.9545665 115.866464,8.8693393 115.255669,8.8693393 C112.812489,8.8693393 110.80965,10.2897925 110.014196,12.9886535 L109.786924,12.9886535 L109.786924,9.181839 L103.920452,9.181839 L103.920452,31 L109.971583,31 Z M128.764195,31 L128.764195,13.7272892 L133.096577,13.7272892 L133.096577,9.181839 L128.764195,9.181839 L128.764195,7.7187722 C128.764195,6.2415009 129.360786,5.3750244 131.136352,5.3750244 C131.860783,5.3750244 132.599419,5.5312743 133.082373,5.6875241 L134.147713,1.14207393 C133.394873,0.91480142 131.732942,0.54548359 129.872149,0.54548359 C125.767039,0.54548359 122.713065,2.8608223 122.713065,7.6051359 L122.713065,9.181839 L119.630681,9.181839 L119.630681,13.7272892 L122.713065,13.7272892 L122.713065,31 L128.764195,31 Z M145.88067,31.426136 C152.499982,31.426136 156.619296,26.8948903 156.619296,20.1761467 C156.619296,13.4147895 152.499982,8.8977484 145.88067,8.8977484 C139.261358,8.8977484 135.142044,13.4147895 135.142044,20.1761467 C135.142044,26.8948903 139.261358,31.426136 145.88067,31.426136 Z M145.909079,26.7386404 C142.855105,26.7386404 141.292606,23.9403476 141.292606,20.1335331 C141.292606,16.3267185 142.855105,13.5142212 145.909079,13.5142212 C148.906235,13.5142212 150.468734,16.3267185 150.468734,20.1335331 C150.468734,23.9403476 148.906235,26.7386404 145.909079,26.7386404 Z M164.588061,31 L168.821012,23.4573936 L173.124985,31 L179.303956,31 L172.812485,20.0909195 L179.133502,9.181839 L172.926122,9.181839 L168.821012,16.8096726 L164.815334,9.181839 L158.56534,9.181839 L164.815334,20.0909195 L158.338067,31 L164.588061,31 Z" id="Waterfox"></path>
+            <path id="Waterfox" stroke="none" d="M 146.200531 30.501001 C 139.827286 30.501001 135.167328 26.214588 135.167328 20.176783 C 135.167328 14.138975 139.827286 9.852564 146.200531 9.852564 C 152.573792 9.852564 157.194672 14.138975 157.194672 20.176783 C 157.194672 26.214588 152.573792 30.501001 146.200531 30.501001 Z M 123.204437 30.202173 L 123.204437 15.071314 L 120.110687 15.071314 L 120.110687 10.598658 L 123.204437 10.598658 L 123.204437 9.704126 C 123.204437 5.194407 125.962158 2.249048 130.95639 2.249048 C 132.596298 2.249048 134.311096 2.58567 135.391937 3.331079 L 133.864594 7.542017 C 133.231003 7.09477 132.409454 6.834986 131.514984 6.834986 C 129.800522 6.834986 128.870453 7.765903 128.870453 9.741236 L 128.870453 10.598658 L 134.013031 10.598658 L 134.013031 15.071314 L 129.01889 15.071314 L 129.01889 30.202173 L 123.204437 30.202173 Z M 157.903656 30.202173 L 165.6185 20.102564 L 158.163422 10.151392 L 164.686859 10.151392 L 168.934906 16.002954 L 173.296234 10.151392 L 179.483734 10.151392 L 172.028656 19.954126 L 179.780609 30.202173 L 173.184906 30.202173 L 168.786469 24.053736 L 164.239594 30.202173 L 157.903656 30.202173 Z M 146.200531 25.729517 C 149.107635 25.729517 151.306 23.642931 151.306 20.176783 C 151.306 16.710634 149.107635 14.624048 146.200531 14.624048 C 143.293442 14.624048 141.057953 16.710634 141.057953 20.176783 C 141.057953 23.642931 143.293442 25.729517 146.200531 25.729517 Z M 111.986046 10.151335 L 106.432755 10.151335 L 106.432755 30.202839 L 112.246948 30.202839 L 112.246948 20.736143 C 112.246948 16.897287 114.371361 15.145576 117.576622 15.145576 C 118.023865 15.145576 118.396568 15.182848 118.881081 15.220116 L 118.881081 9.853172 C 115.787636 9.853172 113.402321 10.859474 111.986046 12.797539 Z M 102.556625 20.251629 C 102.556625 13.803839 98.009628 9.853172 92.120895 9.853172 C 86.008545 9.853172 81.424286 14.176544 81.424286 20.177086 C 81.424286 26.140358 85.934006 30.501001 92.866302 30.501001 C 96.481544 30.501001 99.276825 29.382889 101.14035 27.258472 L 98.046906 23.904133 C 96.667892 25.208597 95.139809 25.842196 93.015388 25.842196 C 89.959213 25.842196 87.834801 24.314106 87.275742 21.816986 L 102.444817 21.816986 C 102.482086 21.33247 102.556625 20.698872 102.556625 20.251629 Z M 92.158173 14.251085 C 94.767097 14.251085 96.667892 15.890985 97.077873 18.425375 L 87.201202 18.425375 C 87.611176 15.853714 89.511971 14.251085 92.158173 14.251085 Z M 78.703537 25.134056 C 78.069939 25.618572 77.212723 25.879465 76.355499 25.879465 C 74.790138 25.879465 73.858383 24.947704 73.858383 23.233265 L 73.858383 15.071035 L 78.852623 15.071035 L 78.852623 10.598581 L 73.858383 10.598581 L 73.858383 5.716152 L 68.044189 5.716152 L 68.044189 10.598581 L 64.950745 10.598581 L 64.950745 15.071035 L 68.044189 15.071035 L 68.044189 23.307804 C 68.044189 28.078423 70.8022 30.501001 75.535553 30.501001 C 77.324532 30.501001 79.076241 30.091026 80.268898 29.233807 Z M 52.427868 9.853172 C 49.22261 9.853172 45.98008 10.710392 43.781124 12.275749 L 45.868267 16.33823 C 47.321815 15.182848 49.520771 14.474707 51.645187 14.474707 C 54.775909 14.474707 56.266727 15.928257 56.266727 18.425375 L 51.645187 18.425375 C 45.532833 18.425375 43.035713 20.885225 43.035713 24.425919 C 43.035713 27.892071 45.831001 30.501001 50.527077 30.501001 C 53.471439 30.501001 55.55859 29.531971 56.639431 27.705717 L 56.639431 30.202839 L 62.080917 30.202839 L 62.080917 18.760809 C 62.080917 12.685726 58.540222 9.853172 52.427868 9.853172 Z M 51.980625 26.587605 C 49.930748 26.587605 48.700825 25.618572 48.700825 24.165024 C 48.700825 22.823288 49.558044 21.816986 52.27879 21.816986 L 56.266727 21.816986 L 56.266727 23.866861 C 55.59586 25.693113 53.918686 26.587605 51.980625 26.587605 Z M 31.034632 22.599667 L 25.07136 4.113523 L 19.480791 4.113523 L 13.331166 22.450584 L 7.442436 4.113523 L 1.181 4.113523 L 9.753203 30.202839 L 16.200991 30.202839 L 22.126993 12.536644 L 27.866642 30.202839 L 34.3517 30.202839 L 42.886635 4.113523 L 37.109715 4.113523 Z"/>
         </g>
     </g>
 </svg>

waterfox/browser/branding/content/aboutDialog.css

@@ -3,8 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #aboutDialogContainer {
-  background-color: #20123a;
+  background-image: url("chrome://branding/content/background.svg");
-  color: #fff;
+  background-position: center;
+  background-size: cover;
+  color: #053361;
   color-scheme: dark;
 }
 
@@ -30,29 +32,31 @@
   }
 }
 
-.text-link {
+/* .text-link {
   color: #fff !important;
   text-decoration: underline;
-}
+} */
 
 #rightBox {
   margin-inline: 30px;
 }
 
-#bottomBox {
+/* #bottomBox {
   background-color: hsla(235, 43%, 10%, .5);
   padding: 15px 10px 15px;
-}
+} */
 
 #trademark {
   font-size: xx-small;
   text-align: center;
-  color: #999999;
+  color: #053361;
   margin-block: 10px;
 }
 
 @media (-moz-platform: macos) {
-  #checkForUpdatesButton, #downloadAndInstallButton, #updateButton {
+  #checkForUpdatesButton,
+  #downloadAndInstallButton,
+  #updateButton {
     color: #053361;
   }
 }

waterfox/browser/branding/content/background.svg

@@ -0,0 +1,58 @@
+<svg width="1800" height="1361" viewBox="0 0 1800 1361" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_366_609" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="1800" height="1361">
+<rect width="1800" height="1360.85" fill="#B783FF"/>
+</mask>
+<g mask="url(#mask0_366_609)">
+<rect width="1800" height="1360.85" fill="#E2EEFB"/>
+<g filter="url(#filter0_f_366_609)">
+<ellipse cx="452.818" cy="495.186" rx="452.818" ry="495.186" transform="matrix(-0.530555 0.84765 -0.910775 -0.412903 983.496 54.0341)" fill="url(#paint0_linear_366_609)" fill-opacity="0.9"/>
+</g>
+<g filter="url(#filter1_f_366_609)">
+<ellipse cx="613.369" cy="566.147" rx="613.369" ry="566.147" transform="matrix(0.897507 -0.441 0.561397 0.827547 621.509 1120.15)" fill="url(#paint1_linear_366_609)" fill-opacity="0.8"/>
+</g>
+<g filter="url(#filter2_f_366_609)">
+<ellipse cx="168.881" cy="165.369" rx="168.881" ry="165.369" transform="matrix(0.801657 0.597784 -0.717314 0.69675 509.244 1074.04)" fill="url(#paint2_linear_366_609)"/>
+</g>
+<g filter="url(#filter3_f_366_609)">
+<ellipse cx="223.555" cy="262.654" rx="223.555" ry="262.654" transform="matrix(-0.0194398 -0.999811 0.999901 -0.0140817 1391.69 164.211)" fill="url(#paint3_linear_366_609)"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_f_366_609" x="-412.853" y="-395.577" width="1410.2" height="1257.96" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="97" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<filter id="filter1_f_366_609" x="570.072" y="493.082" width="1839.54" height="1650.16" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="142" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<filter id="filter2_f_366_609" x="132.005" y="923.023" width="788.005" height="734.387" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="107" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<filter id="filter3_f_366_609" x="1183.31" y="-490.545" width="933.33" height="855.088" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="102" result="effect1_foregroundBlur_366_609"/>
+</filter>
+<linearGradient id="paint0_linear_366_609" x1="342.367" y1="120.523" x2="527.101" y2="1016.57" gradientUnits="userSpaceOnUse">
+<stop stop-color="#51A9FF"/>
+<stop offset="1" stop-color="#B783FF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_366_609" x1="833.368" y1="109.108" x2="305.578" y2="1038.54" gradientUnits="userSpaceOnUse">
+<stop stop-color="#B783FF"/>
+<stop offset="1" stop-color="#51A9FF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_366_609" x1="127.688" y1="40.2491" x2="183.379" y2="341.925" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8DEDCF"/>
+<stop offset="1" stop-color="#51A9FF"/>
+</linearGradient>
+<linearGradient id="paint3_linear_366_609" x1="169.026" y1="63.9272" x2="273.641" y2="536.234" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8DEDCF"/>
+<stop offset="1" stop-color="#51A9FF"/>
+</linearGradient>
+</defs>
+</svg>

waterfox/browser/branding/content/firefox-wordmark.svg

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+<!-- Generated by Pixelmator Pro 3.3.11 -->
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
+<svg width="197" height="38" viewBox="0 0 197 38" xmlns="http://www.w3.org/2000/svg">
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+    <g id="Page-1">
-<svg width="197px" height="38px" viewBox="0 0 197 38" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>Waterfox</title>
-    <g id="Page-1" stroke="none" stroke-width="1">
         <g id="firefox-wordmark">
-            <path fill="context-fill #20123a" d="M18.08521,37 L24.7158855,14.1761581 L24.9886125,14.1761581 L31.6363335,37 L38.8295084,37 L48.8181353,2.0909424 L40.755643,2.0909424 L34.9772394,26.3977374 L34.6704215,26.3977374 L28.312473,2.0909424 L21.4090705,2.0909424 L15.0340766,26.3466011 L14.7443041,26.3466011 L8.96590054,2.0909424 L0.903408229,2.0909424 L10.8920351,37 L18.08521,37 Z M54.6156719,37.4943177 C58.4849864,37.4943177 60.9906659,35.8068193 62.2690737,33.3693216 L62.473619,33.3693216 L62.473619,37 L69.3599761,37 L69.3599761,19.3409259 C69.3599761,13.1022955 64.0758902,10.477298 58.2463503,10.477298 C51.973629,10.477298 47.8486329,13.477298 46.8429521,18.2500179 L53.5588548,18.7954719 C54.0531725,17.0568372 55.6043074,15.7784293 58.2122594,15.7784293 C60.683848,15.7784293 62.0986193,17.0227463 62.0986193,19.1704715 L62.0986193,19.2727442 C62.0986193,20.9602426 60.3088483,21.1818333 55.7577163,21.6250147 C50.5759031,22.1022869 45.9224984,23.8409216 45.9224984,29.687507 C45.9224984,34.8693202 49.6213585,37.4943177 54.6156719,37.4943177 Z M56.6952154,32.4829589 C54.462263,32.4829589 52.8599918,31.4431871 52.8599918,29.4488708 C52.8599918,27.4034182 54.5474902,26.3977374 57.1043059,26.0397832 C58.6895317,25.8181925 61.2804383,25.4431928 62.1497557,24.8636479 L62.1497557,27.6420544 C62.1497557,30.3863699 59.8827124,32.4829589 56.6952154,32.4829589 Z M82.8279418,37.3579542 C84.70294,37.2897725 86.0324842,36.9147728 86.765438,36.6761367 L85.6233937,31.2727327 C85.2654395,31.3409145 84.4983948,31.5113689 83.8165772,31.5113689 C82.367715,31.5113689 81.3620341,30.9659148 81.3620341,28.9545531 L81.3620341,16.272747 L86.2881658,16.272747 L86.2881658,10.8182068 L81.3620341,10.8182068 L81.3620341,4.5454855 L74.1006774,4.5454855 L74.1006774,10.8182068 L70.5211354,10.8182068 L70.5211354,16.272747 L74.1006774,16.272747 L74.1006774,29.9090977 C74.0665865,35.0397746 77.5609014,37.5795449 82.8279418,37.3579542 Z M100.028849,37.5113631 C106.506116,37.5113631 110.869748,34.3579571 111.892475,29.5000072 L105.176572,29.0568258 C104.443618,31.051142 102.56862,32.0909138 100.148168,32.0909138 C96.5174892,32.0909138 94.216355,29.687507 94.216355,25.7841016 L94.216355,25.7670562 L112.045883,25.7670562 L112.045883,23.7727399 C112.045883,14.8750211 106.659525,10.477298 99.739077,10.477298 C92.0345389,10.477298 87.0402255,15.9488837 87.0402255,24.0284215 C87.0402255,32.3295499 91.9663572,37.5113631 100.028849,37.5113631 Z M105.210663,21.2670605 L94.216355,21.2670605 C94.369764,18.2841088 96.6368073,15.8977474 99.8583951,15.8977474 C103.011801,15.8977474 105.193617,18.1477453 105.210663,21.2670605 Z M121.405899,37 L121.405899,22.1875141 C121.405899,18.9659263 123.75817,16.7500193 126.962712,16.7500193 C127.968393,16.7500193 129.349074,16.9204737 130.030891,17.1420644 L130.030891,10.6988887 C129.383165,10.5454798 128.479756,10.4432071 127.746802,10.4432071 C124.814987,10.4432071 122.41158,12.147751 121.457036,15.3863842 L121.184309,15.3863842 L121.184309,10.8182068 L114.144543,10.8182068 L114.144543,37 L121.405899,37 Z M141.317034,37 L141.317034,16.272747 L146.515893,16.272747 L146.515893,10.8182068 L141.317034,10.8182068 L141.317034,9.0625266 C141.317034,7.2898011 142.032943,6.2500293 144.163622,6.2500293 C145.03294,6.2500293 145.919303,6.4375291 146.498847,6.625029 L147.777255,1.1704887 C146.873847,0.8977617 144.879531,0.4545803 142.646578,0.4545803 C137.720447,0.4545803 134.055678,3.2329867 134.055678,8.9261631 L134.055678,10.8182068 L130.356817,10.8182068 L130.356817,16.272747 L134.055678,16.272747 L134.055678,37 L141.317034,37 Z M159.216804,37.5113631 C167.159978,37.5113631 172.103155,32.0738683 172.103155,24.011376 C172.103155,15.8977474 167.159978,10.477298 159.216804,10.477298 C151.27363,10.477298 146.330453,15.8977474 146.330453,24.011376 C146.330453,32.0738683 151.27363,37.5113631 159.216804,37.5113631 Z M159.250895,31.8863685 C155.586126,31.8863685 153.711128,28.5284172 153.711128,23.9602397 C153.711128,19.3920622 155.586126,16.0170655 159.250895,16.0170655 C162.847482,16.0170655 164.722481,19.3920622 164.722481,23.9602397 C164.722481,28.5284172 162.847482,31.8863685 159.250895,31.8863685 Z M179.025681,37 L184.105214,27.9488723 L189.269982,37 L196.684748,37 L188.894982,23.9091034 L196.480202,10.8182068 L189.031346,10.8182068 L184.105214,19.9716071 L179.298401,10.8182068 L171.798408,10.8182068 L179.298401,23.9091034 L171.525681,37 L179.025681,37 Z" id="Waterfox"></path>
+            <path id="Waterfox" fill="context-fill #20123a" fill-rule="evenodd" stroke="none" d="M 159.327484 34.668705 C 152.465225 34.668705 147.448578 30.054558 147.448578 23.553471 C 147.448578 17.05238 152.465225 12.436283 159.327484 12.436283 C 166.189758 12.436283 171.165375 17.05238 171.165375 23.553471 C 171.165375 30.054558 166.189758 34.668705 159.327484 34.668705 Z M 134.567719 34.348392 L 134.567719 18.055424 L 131.235687 18.055424 L 131.235687 13.239017 L 134.567719 13.239017 L 134.567719 12.276127 C 134.567719 7.420378 137.537933 4.250736 142.915375 4.250736 C 144.681107 4.250736 146.526993 4.610237 147.690765 5.412846 L 146.044281 9.948002 C 145.362076 9.46644 144.480057 9.186283 143.516937 9.186283 C 141.670944 9.186283 140.667328 10.190243 140.667328 12.317142 L 140.667328 13.239017 L 146.204437 13.239017 L 146.204437 18.055424 L 140.827484 18.055424 L 140.827484 34.348392 L 134.567719 34.348392 Z M 171.929047 34.348392 L 180.235687 23.471439 L 172.210297 12.758549 L 179.231781 12.758549 L 183.807953 19.057377 L 188.503265 12.758549 L 195.163422 12.758549 L 187.138031 23.311283 L 195.485687 34.348392 L 188.382172 34.348392 L 183.645844 27.725346 L 178.751312 34.348392 L 171.929047 34.348392 Z M 159.327484 29.531986 C 162.457642 29.531986 164.825531 27.285576 164.825531 23.553471 C 164.825531 19.821365 162.457642 17.573002 159.327484 17.573002 C 156.197327 17.573002 153.790375 19.821365 153.790375 23.553471 C 153.790375 27.285576 156.197327 29.531986 159.327484 29.531986 Z M 122.488136 12.757607 L 116.508728 12.757607 L 116.508728 34.347664 L 122.769051 34.347664 L 122.769051 24.154587 C 122.769051 20.021175 125.056473 18.135056 128.507675 18.135056 C 128.989243 18.135056 129.390533 18.175186 129.912231 18.215315 L 129.912231 12.436565 C 126.581421 12.436565 124.013084 13.520082 122.488136 15.606853 Z M 112.33519 23.632895 C 112.33519 16.690367 107.439301 12.436565 101.098724 12.436565 C 94.517372 12.436565 89.58136 17.091671 89.58136 23.552635 C 89.58136 29.973469 94.437111 34.668705 101.901329 34.668705 C 105.793968 34.668705 108.803734 33.464798 110.810242 31.177376 L 107.479439 27.565655 C 105.994614 28.970213 104.349274 29.652428 102.061852 29.652428 C 98.771179 29.652428 96.483757 28.007088 95.881805 25.318363 L 112.214798 25.318363 C 112.254929 24.796671 112.33519 24.114456 112.33519 23.632895 Z M 101.138863 17.17193 C 103.947975 17.17193 105.994614 18.937658 106.43605 21.666515 L 95.801544 21.666515 C 96.242973 18.897528 98.289619 17.17193 101.138863 17.17193 Z M 86.651848 28.889954 C 85.969643 29.411646 85.046646 29.692558 84.123642 29.692558 C 82.438171 29.692558 81.434921 28.689301 81.434921 26.843311 L 81.434921 18.054796 L 86.81237 18.054796 L 86.81237 13.23917 L 81.434921 13.23917 L 81.434921 7.982111 L 75.174606 7.982111 L 75.174606 13.23917 L 71.843803 13.23917 L 71.843803 18.054796 L 75.174606 18.054796 L 75.174606 26.923573 C 75.174606 32.060242 78.144241 34.668705 83.240784 34.668705 C 85.167038 34.668705 87.053154 34.227272 88.337318 33.304276 Z M 58.360046 12.436565 C 54.908852 12.436565 51.417519 13.35956 49.049839 15.045029 L 51.297131 19.419222 C 52.862209 18.175186 55.229889 17.412712 57.517315 17.412712 C 60.888252 17.412712 62.493458 18.977791 62.493458 21.666515 L 57.517315 21.666515 C 50.935955 21.666515 48.247231 24.315109 48.247231 28.12748 C 48.247231 31.859589 51.257 34.668705 56.313404 34.668705 C 59.483692 34.668705 61.730988 33.62532 62.894764 31.658937 L 62.894764 34.347664 L 68.753777 34.347664 L 68.753777 22.027687 C 68.753777 15.486462 64.941406 12.436565 58.360046 12.436565 Z M 57.878487 30.455032 C 55.671322 30.455032 54.347027 29.411646 54.347027 27.846567 C 54.347027 26.401878 55.270023 25.318363 58.199528 25.318363 L 62.493458 25.318363 L 62.493458 27.525526 C 61.771114 29.491905 59.965256 30.455032 57.878487 30.455032 Z M 35.325306 26.161098 L 28.904469 6.256512 L 22.884935 6.256512 L 16.263451 26.000576 L 9.922876 6.256512 L 3.181 6.256512 L 12.41095 34.347664 L 19.353476 34.347664 L 25.734182 15.325941 L 31.914236 34.347664 L 38.896893 34.347664 L 48.086712 6.256512 L 41.866528 6.256512 Z"/>
         </g>
     </g>
 </svg>

waterfox/browser/branding/content/jar.mn

@@ -8,7 +8,11 @@ browser.jar:
   content/branding/about-logo.png
   content/branding/about-logo.svg
   content/branding/about-logo@2x.png
+  content/branding/about-logo-private.png
+  content/branding/about-logo-private@2x.png
   content/branding/about-wordmark.svg
+  content/branding/background.svg
+  content/branding/document.ico                  (../document.ico)
   content/branding/firefox-wordmark.svg
   content/branding/icon16.png                    (../default16.png)
   content/branding/icon32.png                    (../default32.png)

waterfox/browser/branding/locales/en-US/brand.dtd

@@ -1,5 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY  brandShortName        "Waterfox">

waterfox/browser/branding/locales/en-US/brand.ftl

@@ -2,11 +2,26 @@
 # 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/.
 
+## Firefox and Mozilla Brand
+##
+## Firefox and Mozilla must be treated as a brand.
+##
+## They cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
+
 -brand-shorter-name = Waterfox
 -brand-short-name = Waterfox
+-brand-shortcut-name = Waterfox
 -brand-full-name = Waterfox
 # This brand name can be used in messages where the product name needs to
 # remain unchanged across different versions (Nightly, Beta, etc.).
 -brand-product-name = Waterfox
--vendor-short-name = Waterfox Limited
+-vendor-short-name = BrowserWorks
-trademarkInfo = Waterfox and the Waterfox logo are trademarks of Waterfox Limited.
+trademarkInfo = Waterfox and the Waterfox logos are trademarks of BrowserWorks.

waterfox/browser/branding/locales/jar.mn

@@ -8,5 +8,4 @@
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
-  locale/branding/brand.dtd        (%brand.dtd)
   locale/branding/brand.properties (%brand.properties)

waterfox/browser/branding/pref/firefox-branding.js

@@ -39,11 +39,11 @@ pref(
 // The number of days a binary is permitted to be old
 // without checking for an update.  This assumes that
 // app.update.checkInstallTime is true.
-pref("app.update.checkInstallTime.days", 31);
+pref("app.update.checkInstallTime.days", 2);
 
 // Give the user x seconds to reboot before showing a badge on the hamburger
-// button. default=4 days
+// button. default=immediately
-pref("app.update.badgeWaitTime", 345600);
+pref("app.update.badgeWaitTime", 0);
 
 // Number of usages of the web console.
 // If this is less than 5, then pasting code into the web console is disabled

waterfox/browser/branding/private_browsing.VisualElementsManifest.xml

@@ -0,0 +1,12 @@
+<!-- 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/. -->
+
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
+      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
+      ForegroundText='light'
+      BackgroundColor='#14171a'/>
+</Application>

waterfox/browser/branding/stubinstaller/installing_page.css

@@ -70,7 +70,7 @@ body.high-contrast #progress_background {
   margin: 0;
   width: 0%;
   height: 100%;
-  background-color: #00AAFF;
+  background-color: #00aaff;
 }
 
 /* In high contrast mode, fill the entire progress bar with its border. */

waterfox/moz.configure

@@ -0,0 +1,8 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+imply_option("MOZ_APP_UA_NAME", "Firefox")
+imply_option("MOZ_APP_PROFILE", "Waterfox")