Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

42 files changed, 392 insertions, 0 deletions

diff --git a/application/basilisk/branding/official/LICENSE b/application/basilisk/branding/official/LICENSE
new file mode 100644
index 000000000..8833fe212
--- /dev/null
+++ b/application/basilisk/branding/official/LICENSE
@@ -0,0 +1,10 @@
+This location contains official branding for the Basilisk browser.
+
+Please note that you are not granted any trademark rights or licenses
+to the trademarks of Moonchild Productions or any other party,
+including without limitation the Basilisk name or logo.
+
+These branding materials are Copyrighted (c) M. Straver. All rights reserved.
+
+Official branding using these files is only allowed by the copyright holder
+or by third parties with express permission from the copyright holder.
\ No newline at end of file
diff --git a/application/basilisk/branding/official/VisualElements_150.png b/application/basilisk/branding/official/VisualElements_150.png
new file mode 100644
index 000000000..70b256398
--- /dev/null
+++ b/application/basilisk/branding/official/VisualElements_150.png
diff --git a/application/basilisk/branding/official/VisualElements_70.png b/application/basilisk/branding/official/VisualElements_70.png
new file mode 100644
index 000000000..64ce3276d
--- /dev/null
+++ b/application/basilisk/branding/official/VisualElements_70.png
diff --git a/application/basilisk/branding/official/appname.bmp b/application/basilisk/branding/official/appname.bmp
new file mode 100644
index 000000000..1c2f44cf3
--- /dev/null
+++ b/application/basilisk/branding/official/appname.bmp
diff --git a/application/basilisk/branding/official/background.png b/application/basilisk/branding/official/background.png
new file mode 100644
index 000000000..d594986c1
--- /dev/null
+++ b/application/basilisk/branding/official/background.png
diff --git a/application/basilisk/branding/official/basilisk.VisualElementsManifest.xml b/application/basilisk/branding/official/basilisk.VisualElementsManifest.xml
new file mode 100644
index 000000000..d675d573f
--- /dev/null
+++ b/application/basilisk/branding/official/basilisk.VisualElementsManifest.xml
@@ -0,0 +1,8 @@
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\VisualElements_150.png'
+      Square70x70Logo='browser\VisualElements\VisualElements_70.png'
+      ForegroundText='light'
+      BackgroundColor='#0996f8'/>
+</Application>
diff --git a/application/basilisk/branding/official/branding.nsi b/application/basilisk/branding/official/branding.nsi
new file mode 100644
index 000000000..58d7554df
--- /dev/null
+++ b/application/basilisk/branding/official/branding.nsi
@@ -0,0 +1,50 @@
+# 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/.
+
+# NSIS branding defines for official release builds.
+# The nightly build branding.nsi is located in browser/installer/windows/nsis/
+# The unofficial build branding.nsi is located in browser/branding/unofficial/
+
+# BrandFullNameInternal is used for some registry and file system values
+# instead of BrandFullName and typically should not be modified.
+!define BrandFullNameInternal "Basilisk"
+!define CompanyName           "Moonchild Productions"
+!define URLInfoAbout          "https://www.basilisk-browser.org"
+!define URLUpdateInfo         "https://www.basilisk-browser.org/releasenotes.shtml"
+!define HelpLink              "https://www.basilisk-browser.org"
+
+; The OFFICIAL define is a workaround to support different urls for Release and
+; Beta since they share the same branding when building with other branches that
+; set the update channel to beta.
+!define OFFICIAL
+!define URLStubDownload ""
+!define URLManualDownload ""
+!define URLSystemRequirements "http://www.basilisk-browser.org/requirements.shtml"
+!define Channel "release"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   ""
+!define CertIssuerDownload ""
+
+# Dialog units are used so the UI displays correctly with the system's DPI
+# settings.
+# The dialog units for the bitmap's dimensions should match exactly with the
+# bitmap's width and height in pixels.
+!define APPNAME_BMP_WIDTH_DU "134u"
+!define APPNAME_BMP_HEIGHT_DU "36u"
+!define INTRO_BLURB_WIDTH_DU "258u"
+!define INTRO_BLURB_EDGE_DU "170u"
+!define INTRO_BLURB_LTR_TOP_DU "20u"
+!define INTRO_BLURB_RTL_TOP_DU "12u"
+
+# UI Colors that can be customized for each channel
+!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
+!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
+!define FOOTER_BKGRD_COLOR 0xFFFFFF
+!define INTRO_BLURB_TEXT_COLOR 0x666666
+!define INSTALL_BLURB_TEXT_COLOR 0x666666
+!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
+!define COMMON_TEXT_COLOR_NORMAL 0x000000
+!define COMMON_TEXT_COLOR_FADED 0x666666
+!define COMMON_BKGRD_COLOR 0xF0F0F0
diff --git a/application/basilisk/branding/official/configure.sh b/application/basilisk/branding/official/configure.sh
new file mode 100644
index 000000000..49126c4aa
--- /dev/null
+++ b/application/basilisk/branding/official/configure.sh
@@ -0,0 +1,5 @@
+# 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/.
+
+MOZ_APP_DISPLAYNAME=Basilisk
diff --git a/application/basilisk/branding/official/content/about-logo.png b/application/basilisk/branding/official/content/about-logo.png
new file mode 100644
index 000000000..a6c89cf2c
--- /dev/null
+++ b/application/basilisk/branding/official/content/about-logo.png
diff --git a/application/basilisk/branding/official/content/about-logo@2x.png b/application/basilisk/branding/official/content/about-logo@2x.png
new file mode 100644
index 000000000..761e47f6e
--- /dev/null
+++ b/application/basilisk/branding/official/content/about-logo@2x.png
diff --git a/application/basilisk/branding/official/content/about-wordmark.png b/application/basilisk/branding/official/content/about-wordmark.png
new file mode 100644
index 000000000..4ac8d3557
--- /dev/null
+++ b/application/basilisk/branding/official/content/about-wordmark.png
diff --git a/application/basilisk/branding/official/content/about.png b/application/basilisk/branding/official/content/about.png
new file mode 100644
index 000000000..4fc6e5c36
--- /dev/null
+++ b/application/basilisk/branding/official/content/about.png
diff --git a/application/basilisk/branding/official/content/aboutDialog.css b/application/basilisk/branding/official/content/aboutDialog.css
new file mode 100644
index 000000000..631f06a72
--- /dev/null
+++ b/application/basilisk/branding/official/content/aboutDialog.css
@@ -0,0 +1,49 @@
+/* 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/. */
+
+#clientBox {
+  background-color: #F7F7F7;
+  color: #222222;
+}
+
+#leftBox {
+  background-image: url("chrome://branding/content/about-logo.png");
+  background-repeat: no-repeat;
+  background-size: 192px auto;
+  /* min-width and min-height create room for the logo */
+  min-width: 210px;
+  min-height: 210px;
+  margin-top: 20px;
+  margin-inline-start: 30px;
+}
+
+
+@media (min-resolution: 2dppx) {
+  #leftBox {
+    background-image: url("chrome://branding/content/about-logo@2x.png");
+  }
+}
+
+#rightBox {
+  margin-left: 30px;
+  margin-right: 30px;
+  background-image: url("chrome://branding/content/about-wordmark.png");
+  background-repeat: no-repeat;
+  /* padding-top creates room for the wordmark */
+  padding-top: 38px;
+  margin-top:20px;
+}
+
+
+#updateDeck > hbox > label:not([class="text-link"]) {
+  color: #909090;
+}
+
+#trademark {
+  font-size: xx-small;
+  text-align: center;
+  color: #999999;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
diff --git a/application/basilisk/branding/official/content/icon48.png b/application/basilisk/branding/official/content/icon48.png
new file mode 100644
index 000000000..e7dcd8ae2
--- /dev/null
+++ b/application/basilisk/branding/official/content/icon48.png
diff --git a/application/basilisk/branding/official/content/icon64.png b/application/basilisk/branding/official/content/icon64.png
new file mode 100644
index 000000000..7bad34f8b
--- /dev/null
+++ b/application/basilisk/branding/official/content/icon64.png
diff --git a/application/basilisk/branding/official/content/identity-icons-brand.svg b/application/basilisk/branding/official/content/identity-icons-brand.svg
new file mode 100644
index 000000000..80d2155c2
--- /dev/null
+++ b/application/basilisk/branding/official/content/identity-icons-brand.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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: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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="identity-icons-brand.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="909"
+     inkscape:window-height="821"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     transform="matrix(0.09806566,0,0,0.09806566,0.8046769,0.794967)"
+     id="g4695">
+    <circle
+       r="152.95874"
+       cy="155.04951"
+       cx="154.9505"
+       id="path4138"
+       style="fill:#159677;fill-opacity:1;stroke:none;stroke-width:1.02310705;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" />
+    <ellipse
+       ry="141.58415"
+       rx="138.61386"
+       cy="155.54456"
+       cx="156.43564"
+       id="path4136"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65116278" />
+    <path
+       sodipodi:nodetypes="csssssssssssssssssssssssssssssssssccssssssssssssssssssssssscssssssssssssssssssscssssssssssscssssssssssssssssscs"
+       inkscape:connector-curvature="0"
+       id="path4158"
+       d="m 127.95182,303.54475 c -5.42765,-1.02093 -14.92656,-3.62133 -21.1087,-5.77867 -6.18214,-2.15735 -16.30326,-6.64613 -22.491383,-9.9751 -6.188122,-3.32895 -15.51351,-9.36105 -20.723085,-13.40464 -5.209574,-4.04361 -13.693816,-11.9823 -18.853871,-17.64159 -5.160055,-5.65926 -12.06401,-14.49733 -15.342124,-19.64014 -3.278112,-5.14282 -8.18276,-14.29065 -10.899218,-20.3285 -2.716457,-6.03785 -6.483488,-16.75495 -8.371181,-23.8158 -3.1894021,-11.92984 -3.4283741,-14.53982 -3.3785531,-36.89976 0.04858,-21.80859 0.360979,-25.24403 3.3358421,-36.68566 1.805227,-6.94309 5.548131,-17.66019 8.317568,-23.815802 2.769436,-6.15561 7.62586,-15.25077 10.792053,-20.21147 3.166194,-4.96071 9.969264,-13.68367 15.117932,-19.38435 5.148669,-5.70068 13.584686,-13.67575 18.746703,-17.72237 5.162016,-4.04663 14.534575,-10.17782 20.827907,-13.62488 6.29333,-3.447075 16.4997,-8.008262 22.68081,-10.135983 6.18112,-2.127723 16.53517,-4.7966559 23.00901,-5.9309599 6.47383,-1.134304 18.3156,-2.062372 26.31504,-2.062372 7.99944,0 19.82639,0.945049 26.28214,2.10011 21.43411,3.8349939 41.18811,12.0048139 59.18524,24.4777049 5.61631,3.89237 14.25757,10.97893 19.20284,15.7479 4.94527,4.76898 12.60023,13.67935 17.01106,19.80084 4.4108,6.12148 10.53577,16.44926 13.61104,22.95063 3.07526,6.50136 6.78194,15.890682 8.23707,20.865142 4.02216,13.75005 6.31582,29.59534 6.31582,43.63152 0,6.96612 -0.83802,17.67103 -1.86224,23.78868 -1.02423,6.11765 -3.25757,15.70525 -4.96297,21.3058 -1.70539,5.60055 -5.38687,14.82601 -8.18104,20.50104 -2.79419,5.67501 -7.64271,14.05839 -10.77448,18.62971 -3.13178,4.57132 -9.10633,12.11081 -13.27676,16.75444 -4.17045,4.64364 -12.40091,12.21847 -18.28992,16.83296 -5.88901,4.61451 -15.53733,10.99562 -21.44069,14.18023 -5.90338,3.18462 -15.73944,7.53716 -21.8579,9.67228 -6.11847,2.13512 -16.11243,4.78805 -22.20881,5.89538 -13.76317,2.49991 -41.47336,2.46144 -54.96515,-0.0763 z m 95.95681,-34.54419 c 4.84748,-2.98012 11.90936,-7.88086 15.69306,-10.89052 9.51274,-7.5667 22.9262,-22.65624 27.77856,-31.24963 2.2286,-3.94679 5.30879,-9.3466 6.84486,-11.9996 3.49738,-6.0404 8.26443,-19.14099 10.98415,-30.18613 1.14496,-4.6498 2.3724,-15.185 2.72766,-23.41156 0.47109,-10.90872 0.0836,-18.06479 -1.43178,-26.43737 -1.14274,-6.31401 -3.75449,-16.30674 -5.8039,-22.20607 -2.04939,-5.89934 -6.17923,-15.072922 -9.17742,-20.385742 -2.99817,-5.31282 -8.76002,-13.75669 -12.80407,-18.76417 -4.04408,-5.00747 -11.91062,-12.91922 -17.48121,-17.58167 -5.57059,-4.66246 -15.10386,-11.18977 -21.18507,-14.50516 -6.0812,-3.31537 -16.39496,-7.78029 -22.91947,-9.92203 -6.52451,-2.14175 -17.09287,-4.62781 -23.48523,-5.5246 -15.66988,-2.19833 -36.24257,-0.92992 -51.7837,3.19271 -6.71499,1.78131 -17.46036,5.82975 -23.8786,8.99654 -6.41823,3.16679 -15.183985,8.24369 -19.479452,11.282 -4.29547,3.03832 -11.892389,9.56341 -16.882046,14.5002 -4.989657,4.93681 -11.871045,13.20489 -15.291972,18.37351 -3.420927,5.16863 -8.254042,13.61841 -10.740253,18.777312 -2.486214,5.1589 -5.979551,14.52352 -7.762975,20.81027 -2.469225,8.70428 -3.404826,15.48348 -3.922826,28.42407 -0.65147,16.27502 0.295164,26.82296 3.467979,38.64214 0.725043,2.70089 1.767851,4.62129 2.317351,4.26755 0.549502,-0.35373 1.392334,-6.06899 1.872964,-12.70056 1.190411,-16.42492 6.155827,-46.05672 10.044947,-59.9446 1.762181,-6.29266 4.82574,-14.77934 6.807909,-18.8593 1.982169,-4.079952 5.732589,-9.694472 8.334265,-12.476692 2.601677,-2.78222 7.577332,-6.41018 11.057011,-8.06215 3.90144,-1.85219 12.070798,-3.809 21.311209,-5.1047 20.984849,-2.94249 33.033109,-5.449 44.795139,-9.31916 9.92991,-3.26731 10.32965,-3.29583 18.93362,-1.35105 4.83424,1.0927 13.35945,3.82237 18.94491,6.06593 5.58545,2.24356 13.99331,7.03655 18.6841,10.65107 4.69079,3.61453 9.93351,7.32393 11.65049,8.24313 1.71697,0.91919 4.95268,2.08197 7.19047,2.58395 2.23778,0.50198 4.62594,1.99721 5.30702,3.32274 0.68107,1.32554 1.23832,3.891442 1.23832,5.702012 0,1.81056 1.63028,5.96953 3.62285,9.24215 3.21856,5.28622 4.73947,10.04311 10.08948,31.55662 0.92947,3.73762 4.04159,8.72905 9.52741,15.28064 4.48088,5.35142 10.74764,11.59353 13.92613,13.87134 3.17848,2.2778 10.30492,5.83438 15.83652,7.9035 l 10.05747,3.76204 -7.71646,-0.71854 c -4.24405,-0.3952 -10.56564,-1.84618 -14.04798,-3.22439 -4.67209,-1.84908 -6.33154,-2.07443 -6.33154,-0.85974 0,0.90535 1.74283,5.6497 3.87296,10.54298 2.13014,4.89327 4.38109,10.38816 5.00212,12.21084 0.96638,2.8362 0.90309,2.99055 -0.439,1.07068 -0.8625,-1.2338 -3.41486,-5.637 -5.67192,-9.78491 -2.25707,-4.14788 -9.19573,-13.6736 -15.41923,-21.16827 -6.22352,-7.49466 -12.86479,-16.84574 -14.7584,-20.78018 -1.89359,-3.93445 -4.63511,-11.25056 -6.09226,-16.25804 -1.45714,-5.00747 -3.96487,-10.79642 -5.57274,-12.86432 l -2.92338,-3.75984 -7.71296,2.78024 c -4.24214,1.52914 -13.61474,4.23274 -20.82802,6.00801 -7.21327,1.77528 -15.50448,4.48222 -18.4249,6.01543 -7.94513,4.17117 -19.55264,13.14845 -26.16757,20.23806 -7.01295,7.51618 -11.57143,17.33819 -10.36686,22.33714 0.45791,1.90038 2.63917,5.79906 4.84724,8.66374 2.20805,2.86468 6.79857,10.37507 10.20113,16.68975 3.40258,6.31467 9.43687,15.20572 13.40954,19.75788 3.97268,4.55215 11.5586,11.46227 16.85758,15.35582 5.299,3.89355 16.92011,14.17072 25.82468,22.83815 8.90456,8.66743 16.73876,15.75898 17.4093,15.75898 0.67056,0 5.18531,-2.43829 10.03279,-5.41843 z M 161.46447,98.864488 c 1.7617,-0.69765 3.20307,-2.09825 3.20307,-3.11245 0,-1.0142 -0.88883,-2.19927 -1.97519,-2.63348 -2.53984,-1.01516 -8.49431,-1.01516 -11.03414,0 -1.08636,0.43421 -1.97519,1.5757 -1.97519,2.53666 0,2.02856 3.43173,4.380972 6.47443,4.438172 1.15718,0.0218 3.54534,-0.531252 5.30702,-1.228902 z"
+       style="fill:#159677;fill-opacity:1;stroke:#159677;stroke-width:1.00678515;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65116278" />
+  </g>
+</svg>
diff --git a/application/basilisk/branding/official/content/jar.mn b/application/basilisk/branding/official/content/jar.mn
new file mode 100644
index 000000000..4b8c5fc9d
--- /dev/null
+++ b/application/basilisk/branding/official/content/jar.mn
@@ -0,0 +1,18 @@
+# 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/.
+
+browser.jar:
+% content branding %content/branding/ contentaccessible=yes
+  content/branding/about.png
+  content/branding/about-logo.png
+  content/branding/about-logo@2x.png
+  content/branding/about-wordmark.png
+  content/branding/icon48.png
+  content/branding/icon64.png
+  content/branding/icon16.png                    (../default16.png)
+  content/branding/icon32.png                    (../default32.png)
+  content/branding/icon128.png                   (../mozicon128.png)
+  content/branding/identity-icons-brand.svg
+  content/branding/silhouette-40.svg
+  content/branding/aboutDialog.css
diff --git a/application/basilisk/branding/official/content/moz.build b/application/basilisk/branding/official/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/application/basilisk/branding/official/content/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/basilisk/branding/official/content/silhouette-40.svg b/application/basilisk/branding/official/content/silhouette-40.svg
new file mode 100644
index 000000000..c00a38cb1
--- /dev/null
+++ b/application/basilisk/branding/official/content/silhouette-40.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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: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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="-45 31 40 40"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="silhouette-40.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1365"
+     inkscape:window-height="882"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="20"
+     inkscape:cy="20"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#cdcdcd;fill-opacity:1;stroke:none;stroke-width:0.09873105;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.65116278"
+     d="m -27.647643,65.562283 c -0.532266,-0.100118 -1.463783,-0.355128 -2.070039,-0.566689 -0.606256,-0.211562 -1.59879,-0.651757 -2.205632,-0.978215 -0.606843,-0.326455 -1.521343,-0.917997 -2.032223,-1.314534 -0.510881,-0.39654 -1.342893,-1.175053 -1.848918,-1.730035 -0.506024,-0.554979 -1.183065,-1.42169 -1.504535,-1.926023 -0.32147,-0.504334 -0.802448,-1.401422 -1.068839,-1.993528 -0.266391,-0.592105 -0.635808,-1.643085 -0.820925,-2.335512 -0.312771,-1.169907 -0.336206,-1.425857 -0.331321,-3.618599 0.0048,-2.138674 0.0354,-2.475573 0.327132,-3.597604 0.177031,-0.680878 0.544081,-1.731858 0.815668,-2.335512 0.271586,-0.603654 0.747835,-1.495577 1.05833,-1.982051 0.310495,-0.486475 0.977642,-1.341898 1.48255,-1.900939 0.504907,-0.559041 1.332191,-1.341122 1.838407,-1.737956 0.506217,-0.396836 1.425343,-0.998095 2.042503,-1.336133 0.617159,-0.33804 1.618054,-0.785335 2.224208,-0.993992 0.606156,-0.208656 1.621533,-0.470387 2.256394,-0.581623 0.634861,-0.111237 1.796132,-0.202248 2.580602,-0.202248 0.78447,0 1.944288,0.09268 2.577375,0.205948 2.101951,0.376082 4.03914,1.17726 5.80404,2.400423 0.550767,0.381708 1.398178,1.076656 1.883139,1.544328 0.484961,0.467673 1.23565,1.341474 1.668201,1.941782 0.432548,0.600307 1.033197,1.613108 1.334776,2.250669 0.301577,0.63756 0.665075,1.55833 0.807773,2.046154 0.394436,1.348408 0.619365,2.902287 0.619365,4.278754 0,0.683137 -0.08218,1.732921 -0.182621,2.332852 -0.100442,0.599932 -0.319456,1.540146 -0.486697,2.089368 -0.167241,0.549221 -0.528267,1.453922 -0.802279,2.010448 -0.274014,0.556523 -0.749488,1.378645 -1.056607,1.826935 -0.30712,0.448289 -0.893018,1.187654 -1.301994,1.643035 -0.408978,0.455381 -1.216104,1.198212 -1.793613,1.650735 -0.57751,0.452525 -1.523679,1.078293 -2.102596,1.390594 -0.578918,0.312302 -1.543498,0.739136 -2.143509,0.948518 -0.600012,0.209382 -1.580076,0.469544 -2.177922,0.578135 -1.349694,0.245155 -4.067112,0.241382 -5.390193,-0.0075 z m 9.410068,-3.387599 c 0.475371,-0.292247 1.167899,-0.772841 1.53895,-1.067986 0.932873,-0.742033 2.248273,-2.221799 2.724123,-3.064515 0.218549,-0.387045 0.52061,-0.916581 0.671245,-1.176749 0.342973,-0.592356 0.810457,-1.877074 1.077168,-2.960223 0.112282,-0.455985 0.232651,-1.489127 0.26749,-2.29587 0.0462,-1.069771 0.0082,-1.771535 -0.140408,-2.592598 -0.112064,-0.619187 -0.368187,-1.599131 -0.569164,-2.177653 -0.200974,-0.578522 -0.60597,-1.478136 -0.899989,-1.999141 -0.294018,-0.521005 -0.859058,-1.349059 -1.25564,-1.840121 -0.396585,-0.491061 -1.168023,-1.266932 -1.714306,-1.724158 -0.546284,-0.457227 -1.48117,-1.097332 -2.077528,-1.422458 -0.596357,-0.325124 -1.607783,-0.762979 -2.247613,-0.97301 -0.639831,-0.210032 -1.676224,-0.45383 -2.303095,-0.541774 -1.536677,-0.215581 -3.554151,-0.09119 -5.078202,0.313095 -0.65851,0.174686 -1.712262,0.571699 -2.341671,0.882252 -0.629408,0.310553 -1.489028,0.808423 -1.910265,1.106377 -0.421239,0.297955 -1.166235,0.937842 -1.655549,1.421971 -0.489314,0.484132 -1.164142,1.294947 -1.499618,1.801811 -0.335475,0.506865 -0.809438,1.335498 -1.05325,1.841409 -0.243812,0.505911 -0.586388,1.424259 -0.761281,2.040773 -0.242146,0.853591 -0.333897,1.518398 -0.384695,2.787425 -0.06389,1.596021 0.02895,2.630412 0.34009,3.789467 0.0711,0.264865 0.173366,0.45319 0.227253,0.4185 0.05389,-0.03469 0.13654,-0.595159 0.183673,-1.245488 0.116739,-1.610721 0.603675,-4.516583 0.985064,-5.878507 0.17281,-0.617094 0.47324,-1.449346 0.667623,-1.84945 0.194382,-0.400103 0.56217,-0.950695 0.817305,-1.223535 0.255135,-0.27284 0.743076,-0.628618 1.084313,-0.79062 0.382597,-0.181636 1.183731,-0.373532 2.089898,-0.500596 2.057893,-0.288557 3.239413,-0.534359 4.392864,-0.913889 0.973784,-0.320411 1.012984,-0.323208 1.856738,-0.132492 0.474073,0.107156 1.310104,0.374843 1.857846,0.59486 0.54774,0.220016 1.372263,0.690043 1.832268,1.044504 0.460006,0.354461 0.974136,0.718226 1.142513,0.808368 0.168376,0.09014 0.485688,0.20417 0.705138,0.253397 0.21945,0.04923 0.453646,0.195857 0.520437,0.325846 0.06679,0.12999 0.121436,0.381617 0.121436,0.559172 0,0.177554 0.159875,0.585406 0.355278,0.906337 0.31563,0.518397 0.464779,0.984885 0.989431,3.094621 0.09115,0.366532 0.396341,0.85602 0.934312,1.498506 0.43942,0.524791 1.053974,1.136927 1.365675,1.360302 0.3117,0.223374 1.010559,0.572153 1.553019,0.775062 l 0.986292,0.368927 -0.75672,-0.07046 c -0.416195,-0.03876 -1.036126,-0.181047 -1.377624,-0.316202 -0.458172,-0.181331 -0.620907,-0.20343 -0.620907,-0.08431 0,0.08878 0.170912,0.554042 0.379805,1.033904 0.208893,0.479862 0.429634,1.018722 0.490536,1.197465 0.09477,0.278133 0.08856,0.29327 -0.04305,0.104996 -0.08458,-0.120993 -0.33488,-0.552796 -0.55622,-0.959563 -0.221342,-0.406765 -0.901786,-1.340911 -1.512097,-2.075881 -0.610314,-0.734968 -1.261595,-1.651988 -1.447293,-2.037822 -0.185696,-0.385834 -0.454545,-1.103293 -0.597441,-1.594355 -0.142896,-0.491061 -0.388818,-1.058758 -0.546495,-1.261548 l -0.286683,-0.368711 -0.756376,0.272646 c -0.416009,0.149956 -1.335139,0.415086 -2.042514,0.589179 -0.707374,0.174094 -1.520457,0.439552 -1.80685,0.589907 -0.779144,0.409049 -1.917442,1.289412 -2.56614,1.984659 -0.687729,0.737079 -1.13476,1.700281 -1.016633,2.190506 0.0449,0.186362 0.258812,0.568689 0.475348,0.849616 0.216534,0.280927 0.666706,1.017438 1.000381,1.636691 0.333676,0.619252 0.925432,1.491159 1.315015,1.93757 0.389583,0.446409 1.133502,1.124055 1.65315,1.505878 0.51965,0.381824 1.659281,1.389661 2.532514,2.239639 0.873231,0.849977 1.641497,1.545414 1.707254,1.545414 0.06576,0 0.508501,-0.239112 0.983873,-0.531362 z m -6.123628,-16.684506 c 0.172762,-0.06842 0.314111,-0.205766 0.314111,-0.305224 0,-0.09946 -0.08716,-0.215673 -0.193698,-0.258254 -0.249071,-0.09955 -0.833,-0.09955 -1.082071,0 -0.106534,0.04258 -0.193698,0.154522 -0.193698,0.248759 0,0.198932 0.336535,0.429623 0.634919,0.435232 0.11348,0.0021 0.347677,-0.0521 0.520437,-0.120513 z"
+     id="path4158"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssssssssssssssssssssssssssssssssccssssssssssssssssssssssscssssssssssssssssssscssssssssssscssssssssssssssssscs" />
+</svg>
diff --git a/application/basilisk/branding/official/default16.png b/application/basilisk/branding/official/default16.png
new file mode 100644
index 000000000..6618c0667
--- /dev/null
+++ b/application/basilisk/branding/official/default16.png
diff --git a/application/basilisk/branding/official/default22.png b/application/basilisk/branding/official/default22.png
new file mode 100644
index 000000000..d53d5b503
--- /dev/null
+++ b/application/basilisk/branding/official/default22.png
diff --git a/application/basilisk/branding/official/default24.png b/application/basilisk/branding/official/default24.png
new file mode 100644
index 000000000..1e86c0cdd
--- /dev/null
+++ b/application/basilisk/branding/official/default24.png
diff --git a/application/basilisk/branding/official/default256.png b/application/basilisk/branding/official/default256.png
new file mode 100644
index 000000000..96f72ae15
--- /dev/null
+++ b/application/basilisk/branding/official/default256.png
diff --git a/application/basilisk/branding/official/default32.png b/application/basilisk/branding/official/default32.png
new file mode 100644
index 000000000..ac39ccf0d
--- /dev/null
+++ b/application/basilisk/branding/official/default32.png
diff --git a/application/basilisk/branding/official/default48.png b/application/basilisk/branding/official/default48.png
new file mode 100644
index 000000000..e7dcd8ae2
--- /dev/null
+++ b/application/basilisk/branding/official/default48.png
diff --git a/application/basilisk/branding/official/default64.png b/application/basilisk/branding/official/default64.png
new file mode 100644
index 000000000..7bad34f8b
--- /dev/null
+++ b/application/basilisk/branding/official/default64.png
diff --git a/application/basilisk/branding/official/disk.icns b/application/basilisk/branding/official/disk.icns
new file mode 100644
index 000000000..82fdccff8
--- /dev/null
+++ b/application/basilisk/branding/official/disk.icns
diff --git a/application/basilisk/branding/official/document.icns b/application/basilisk/branding/official/document.icns
new file mode 100644
index 000000000..5f03305d7
--- /dev/null
+++ b/application/basilisk/branding/official/document.icns
diff --git a/application/basilisk/branding/official/document.ico b/application/basilisk/branding/official/document.ico
new file mode 100644
index 000000000..525b1a929
--- /dev/null
+++ b/application/basilisk/branding/official/document.ico
diff --git a/application/basilisk/branding/official/firefox.icns b/application/basilisk/branding/official/firefox.icns
new file mode 100644
index 000000000..4d2ad5a04
--- /dev/null
+++ b/application/basilisk/branding/official/firefox.icns
diff --git a/application/basilisk/branding/official/firefox.ico b/application/basilisk/branding/official/firefox.ico
new file mode 100644
index 000000000..320796dd2
--- /dev/null
+++ b/application/basilisk/branding/official/firefox.ico
diff --git a/application/basilisk/branding/official/locales/browserconfig.properties b/application/basilisk/branding/official/locales/browserconfig.properties
new file mode 100644
index 000000000..06cefece3
--- /dev/null
+++ b/application/basilisk/branding/official/locales/browserconfig.properties
@@ -0,0 +1,6 @@
+# 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/.
+
+# Do NOT localize or otherwise change these values
+browser.startup.homepage=about:home
diff --git a/application/basilisk/branding/official/locales/en-US/brand.dtd b/application/basilisk/branding/official/locales/en-US/brand.dtd
new file mode 100644
index 000000000..1d2ac791e
--- /dev/null
+++ b/application/basilisk/branding/official/locales/en-US/brand.dtd
@@ -0,0 +1,10 @@
+<!-- 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  brandShorterName      "Basilisk">
+<!ENTITY  brandShortName        "Basilisk">
+<!ENTITY  brandFullName         "Basilisk">
+<!ENTITY  vendorShortName       "Moonchild">
+<!ENTITY  vendorFullName        "Moonchild Productions">
+<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Moonchild Productions.">
diff --git a/application/basilisk/branding/official/locales/en-US/brand.properties b/application/basilisk/branding/official/locales/en-US/brand.properties
new file mode 100644
index 000000000..9bdb66706
--- /dev/null
+++ b/application/basilisk/branding/official/locales/en-US/brand.properties
@@ -0,0 +1,16 @@
+# 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/.
+
+brandShorterName=Basilisk
+brandShortName=Basilisk
+brandFullName=Basilisk
+vendorShortName=Moonchild
+
+homePageSingleStartMain=Internal home page with search.
+homePageImport=Import your home page from %S
+
+homePageMigrationPageTitle=Home Page Selection
+homePageMigrationDescription=Please select the home page you wish to use:
+
+syncBrandShortName=Sync
diff --git a/application/basilisk/branding/official/locales/jar.mn b/application/basilisk/branding/official/locales/jar.mn
new file mode 100644
index 000000000..9fdfe578b
--- /dev/null
+++ b/application/basilisk/branding/official/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# 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/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+  locale/branding/brand.dtd        (%brand.dtd)
+  locale/branding/brand.properties (%brand.properties)
+  locale/branding/browserconfig.properties
diff --git a/application/basilisk/branding/official/locales/moz.build b/application/basilisk/branding/official/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/application/basilisk/branding/official/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- 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/.
+
+JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/application/basilisk/branding/official/moz.build b/application/basilisk/branding/official/moz.build
new file mode 100644
index 000000000..e3b7fd1ab
--- /dev/null
+++ b/application/basilisk/branding/official/moz.build
@@ -0,0 +1,13 @@
+# -*- 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/.
+
+DIRS += ['content', 'locales']
+
+DIST_SUBDIR = 'browser'
+export('DIST_SUBDIR')
+
+include('../shared/branding.mozbuild')
+ApplicationBranding()
\ No newline at end of file
diff --git a/application/basilisk/branding/official/mozicon128.png b/application/basilisk/branding/official/mozicon128.png
new file mode 100644
index 000000000..0de78e0ce
--- /dev/null
+++ b/application/basilisk/branding/official/mozicon128.png
diff --git a/application/basilisk/branding/official/pref/basilisk-branding.js b/application/basilisk/branding/official/pref/basilisk-branding.js
new file mode 100644
index 000000000..3a97a1490
--- /dev/null
+++ b/application/basilisk/branding/official/pref/basilisk-branding.js
@@ -0,0 +1,47 @@
+/* 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/. */
+
+#filter substitution
+#filter emptyLines
+
+// Set defines to construct URLs
+#define BRANDING_BASEURL basilisk-browser.org
+#define BRANDING_SITEURL www.@BRANDING_BASEURL@
+#define BRANDING_RELNOTESPATH releasenotes.shtml
+#define BRANDING_FIRSTRUNPATH firstrun/
+#define BRANDING_APPUPDATEURL aus.@BRANDING_BASEURL@
+#define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%
+
+// Shared Branding Preferences
+// XXX: These should REALLY go back to application preferences
+#include ../../shared/preferences.inc
+
+// Branding Specific Preferences
+pref("startup.homepage_override_url", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@");
+pref("startup.homepage_welcome_url", "http://@BRANDING_SITEURL@/@BRANDING_FIRSTRUNPATH@");
+pref("startup.homepage_welcome_url.additional", "");
+
+// Version release notes
+pref("app.releaseNotesURL", "http://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@");
+
+// Vendor home page
+pref("app.vendorURL", "http://@BRANDING_SITEURL@/");
+
+pref("app.update.url", "https://@BRANDING_APPUPDATEURL@/@BRANDING_APPUPDATEPATH@");
+
+// URL user can browse to manually if for some reason all update installation
+// attempts fail.
+pref("app.update.url.manual", "https://@BRANDING_SITEURL@/");
+// A default value for the "More information about this update" link
+// supplied in the "An update is available" page of the update wizard.
+pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@");
+
+// Provide UA Gecko and Firefox slices for web compatibility
+pref("general.useragent.compatMode.firefox",true);
+pref("general.useragent.compatMode.gecko",true);
+
+pref("app.update.enabled", true);
+
+// Shared User Agent Overrides
+#include ../../shared/uaoverrides.inc
diff --git a/application/basilisk/branding/official/wizHeader.bmp b/application/basilisk/branding/official/wizHeader.bmp
new file mode 100644
index 000000000..8f1a0598b
--- /dev/null
+++ b/application/basilisk/branding/official/wizHeader.bmp
diff --git a/application/basilisk/branding/official/wizHeaderRTL.bmp b/application/basilisk/branding/official/wizHeaderRTL.bmp
new file mode 100644
index 000000000..8f1a0598b
--- /dev/null
+++ b/application/basilisk/branding/official/wizHeaderRTL.bmp
diff --git a/application/basilisk/branding/official/wizWatermark.bmp b/application/basilisk/branding/official/wizWatermark.bmp
new file mode 100644
index 000000000..491f27aa5
--- /dev/null
+++ b/application/basilisk/branding/official/wizWatermark.bmp