Merge remote-tracking branch 'origin/master' into custom

2026-09-08 08:48:39 +09:00 · 2021-07-02 11:02:20 +08:00 · 2021-07-02 11:02:20 +08:00 · 8803266417
commit 8803266417
parent 20c6498ca1 abdb4ac723
12 changed files with 523 additions and 409 deletions
--- a/application/palemoon/components/abouthome/aboutHome.css
+++ b/application/palemoon/components/abouthome/aboutHome.css
@ -7,7 +7,7 @@
 html {
  font: message-box;
  font-size: 100%;
-  background-color: hsl(0,0%,90%);
+  background-color: rgb(229,229,229);
  color: #000;
  height: 100%;
 }
@ -51,110 +51,127 @@ a {
  background-repeat: no-repeat;
 }

+/* SEARCH */
 #searchForm {
  width: 470px;
 }

+#searchContainer {
+  display: -moz-box;
+  position: relative;
+  -moz-box-pack: center;
+  margin: 10px 0 15px;
+}
+
+#searchContainer[page-disabled] {
+  opacity: 0;
+  pointer-events: none;
+}
+
 #searchForm {
  display: -moz-box;
-}
-
-#searchLogoContainer {
-  display: -moz-box;
-  -moz-box-align: center;
-  padding-top: 2px;
-  padding-inline-end: 8px;
-}
-
-#searchLogoContainer[hidden] {
-  display: none;
+  position: relative;
+  height: 36px;
+  -moz-box-flex: 1;
+  max-width: 600px; /* 2 * (290 cell width + 10 cell margin) */
 }

 #searchEngineLogo {
-  display: inline-block;
-  height: 28px;
-  width: 70px;
-  min-width: 70px;
+  border: 1px transparent;
+  padding: 2px 4px 2px 2px;
+  margin: 0;
+  width: 32px;
+  height: 32px;
+  position: absolute;
 }

 #searchText {
  -moz-box-flex: 1;
-  padding: 6px 8px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 42px;
+  padding-inline-end: 8px;
  background: hsla(0,0%,100%,.9) padding-box;
  border: 1px solid;
-  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
-  box-shadow: 0 1px 0 hsla(210,65%,9%,.02) inset,
-              0 0 2px hsla(210,65%,9%,.1) inset,
+  border-spacing: 0;
+  border-radius: 2px 0 0 2px;
+  border-color: hsla(228,54%,20%,.15) hsla(228,54%,20%,.17) hsla(228,54%,20%,.2);
+  box-shadow: 0 1px 0 hsla(228,65%,9%,.02) inset,
+              0 0 2px hsla(228,65%,9%,.1) inset,
              0 1px 0 hsla(0,0%,100%,.2);
-  border-radius: 2.5px 0 0 2.5px;
+  color: inherit;
+  unicode-bidi: plaintext;
 }

-#searchText:-moz-dir(rtl) {
-  border-radius: 0 2.5px 2.5px 0;
+#searchText:dir(rtl) {
+  border-radius: 0 2px 2px 0;
 }

-#searchText:focus,
-#searchText[autofocus] {
-  border-color: hsla(206,100%,60%,.6) hsla(206,76%,52%,.6) hsla(204,100%,40%,.6);
+#searchText[aria-expanded="true"] {
+  border-radius: 2px 0 0 0;
+}
+
+#searchText[aria-expanded="true"]:dir(rtl) {
+  border-radius: 0 2px 0 0;
+}
+
+#searchText[keepfocus],
+#searchText:focus {
+  border-color: hsla(234,0%,60%,.6) hsla(234,0%,52%,.6) hsla(234,0%,40%,.6);
 }

 #searchSubmit {
  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);
-  border-inline-start: 1px solid transparent;
+  background-color: #e0e0e0;
+  color: black;
+  border-color: hsla(234,0%,20%,.15) hsla(234,0%,20%,.17) hsla(234,0%,20%,.2);
  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);
  cursor: pointer;
-  transition-property: background-color, border-color, box-shadow;
-  transition-duration: 150ms;
+  width: 50px;
 }

-#searchSubmit:-moz-dir(rtl) {
-  border-radius: 2.5px 0 0 2.5px;
+#searchSubmit:dir(rtl) {
+  border-radius: 2px 0 0 2px;
 }

-#searchText:focus + #searchSubmit,
-#searchText + #searchSubmit:hover,
-#searchText[autofocus] + #searchSubmit {
-  border-color: #59b5fc #45a3e7 #3294d5;
+#searchSubmit:hover {
+  background-color: hsl(220,54%,30%);
  color: white;
 }

 #searchText:focus + #searchSubmit,
-#searchText[autofocus] + #searchSubmit {
-  background-image: linear-gradient(#4cb1ff, #1793e5);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
-              0 0 0 1px hsla(0,0%,100%,.1) inset,
-              0 1px 0 hsla(210,54%,20%,.03);
+#searchText + #searchSubmit:hover {
+  border-color: #808080;
 }

-#searchText + #searchSubmit:hover {
-  background-image: linear-gradient(#66bdff, #0d9eff);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
-              0 0 0 1px hsla(0,0%,100%,.1) inset,
-              0 1px 0 hsla(210,54%,20%,.03),
-              0 0 4px hsla(206,100%,20%,.2);
+#searchText[keepfocus],
+#searchText:focus,
+#searchText[keepfocus] + #searchSubmit,
+#searchText:focus + #searchSubmit
+{
+  box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset,
+              0 2px 4px 0px rgba(37,37,37,.2);
 }

 #searchText + #searchSubmit:hover:active {
-  box-shadow: 0 1px 1px hsla(211,79%,6%,.1) inset,
-              0 0 1px hsla(211,79%,6%,.2) inset;
-  transition-duration: 0ms;
+  background-color: hsl(220,24%,10%);
+  color: #a0a0a0;
 }

+/* LAUNCHER */
 #launcher {
  display: -moz-box;
  -moz-box-align: center;
  -moz-box-pack: center;
  width: 100%;
-  background-color: hsla(0,0%,0%,.03);
-  border-top: 1px solid hsla(0,0%,0%,.03);
-  box-shadow: 0 1px 2px hsla(0,0%,0%,.02) inset,
-              0 -1px 0 hsla(0,0%,100%,.25);
+  background-color: rgba(0,0,0,.03);
+  border-top: 1px solid rgba(0,0,0,.03);
+  box-shadow: 0 1px 2px rgba(0,0,0,.02) inset,
+              0 -1px 0 rgba(255,255,255,.25);
 }

 #launcher:not([session]),
@ -176,12 +193,12 @@ body[narrow] #launcher[session] {
  white-space: normal;
  background: transparent padding-box;
  border: 1px solid transparent;
-  border-radius: 2.5px;
+  border-radius: 5px;
  color: #525c66;
  font-size: 75%;
  cursor: pointer;
  transition-property: background-color, border-color, box-shadow;
-  transition-duration: 150ms;
+  transition-duration: 120ms;
 }

 body[narrow] #launcher[session] > .launchButton {
--- a/application/palemoon/components/abouthome/aboutHome.js
+++ b/application/palemoon/components/abouthome/aboutHome.js
@ -2,109 +2,7 @@
 * 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/. */

-const SEARCH_ENGINES = {
-  "DuckDuckGo": {
-  	 image: "data:image/png;base64," +
-           "iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAVhUlEQVR4Xu3dd5SU1d3A8e/vPs/0" +
-           "2crussBSdkHEAgoomEQSUTAW3hRbfMUeUwgSj9FoorGXqDGxBHvMazRGE0KsBQuiEVRUEEEM0pfO" +
-           "1tndmZ32PPf3knDCUZAlIYsxOfM553f2v91/vnufOzP33BFV5TOnQFQ1snFN/YCVb88Z6S2dd1B8" +
-           "3Qf7lTSv6R9PNle4uXQEVNRxvUy4qL29pPeGRNXA5d6g4fOLhoyYN2C/oe8Vl5QmAoFAnm72GQqm" +
-           "oKO9vXj5e/NHtr48/fjq92eOq2xYOsixvuMpKFuhfJywjQMYI5oKF7evrR09t/LE7z3Ze9TYZyPx" +
-           "+FpjjPdfEkxBY0ND9ftP//7EkpceOLNm/cJh+J6rylYWcIwSiCHhuEo4ggRdMCLq+UomK5pJq2Y7" +
-           "BD8HqoIAAmKhPdKjuX7EMc9WnfCde/YZOfot13Xz/6HBFKi1pdmlCya23Dz5PPeDN/eygCqAqIn3" +
-           "ULduiAb2Ha3BfUYgJeUgBhxHRAwgoupbfF/wPcXL461bRX7xm5Jb8q7Yhno0lzUYMIANx9Lh0y99" +
-           "svjEc292YkXzAfufE0yBse0tX+qY+uNrOp/+9SGo5yggTlADQw72I4efQGDf4Wg6RW7xO5Jf8g7+" +
-           "ulVi21rRXAr8HKpWRBzFCSGRIpyKSnX6701wv0PU7Vunms2RmfO0ZGc/Z/zWjSKiAqJOdV1LyUVT" +
-           "7wkdcuQvENP8mQ+mQGPZt2ZelLj2nCl+Q30ZAqijoVFH+rGTJiHROJnXniE75znxN64yms8AKghd" +
-           "062DEZVIqQbq9tHwYcdpcL+DNDvvFUlNv1dsywYHA0jAjx512lslF956vkSL5n5Wgymwfq+O/7vx" +
-           "jvZfX/0/+FkXC27N3n7xlOvVlFdp8pFfSnbuC0bTbYKqIOw+BcSoKeut0WNPtZEjjtPOx++X1FMP" +
-           "GPysAXD777epxy1PXuj2qXsEsJ+hYArUy9e2Xn7GtPTLj44AFVVHY1/7tld0+g8l+cht2vnE/Y7N" +
-           "p0S2htJ9FEDUlPWxxZOusE5VjSRunIK3YbkrAhIpzlRMfeGy4P6jbwH8z0AwBZrPDWqacvQzmfkv" +
-           "D0ZETbxCS3/wC9/t1ZeWq78t3oZlDqiwp6nRyJiveMXnXEL7fdeTef1JV9UKKlp118wrQgeNvX5X" +
-           "0Rj2uMJjqOmik/6UmbclFkSdylrb4/qHfU0naTzvK463fqkLKijo1oGt0/3ESudrT7jNPznTxL8x" +
-           "iehXvuUhroJKw6RxV+aWzJ8MyL9vhSmIJm778fT2h244CiPqVg+0Pa64TzPzZtv2X18XUD8jAIiB" +
-           "3nWEK6rBDaHZTmyiCb+lGe1MoGpB6FZOWR+/7KJbbXb+n0lOv8tV64mJlnX2mr74ZKei11PshMue" +
-           "UmA6X3nyqrbf/uxIAKe4l5ZdcqdNz5vNllhc9TKCAIAaQ6puNLEzzqN86EhQRTs78BvWkX3/bTpf" +
-           "mkZm3p/RbAoM3cJrWe+03PB9yn881drOlJd85gHXT7VGG77/1TvK7n1pRThe/MGnuMIU+M2bj91w" +
-           "wrBHbUdDnEDUVlx2n29TbbT8/AIXLy18hAQiFJ8wmdD44wnvPwoxZvs9ENlFb9D2qxvIzH0BxNId" +
-           "VMGtGuBXXPNrm7j7OskueNkBKDnjkudKp1x7ItD5KQRToNavaLzgGy91vjr9ABAtPuUCL/LFo2m8" +
-           "8ETHJlsMwsek9zqEztMvRbw8TjBMqLSU4spKiquqicVjiAgANtVBx8O3kbjvOtTPgPCvUwjufZBX" +
-           "ftEt2njBScZv2+gYN5KvfvCN84N7H3DHpxBMQerNmZc3nHvU5ajnBGqHedW3Psam848jv+I9F2FH" +
-           "4qA4gIJvkHgZgeGHEvzSUZSMP4FQccnHVpvk0w+Seu73ZN57Hc11guFfo6JFX/+uFzpgNE1XnOUi" +
-           "KpEDvriy4p4XxrrB0Jo9GExB0+bNtanvjX/VX7mor6jR6rtmeOk3ZpJ46CZXRKWrx4MTK6fkrB8S" +
-           "n3AqTnkVuAFEgO0qU1Xw8ngbVpO462o6ZjyCGMu/RB3tOfUZr+03t5B5+/kAIhq7/g8/rTrqhEv3" +
-           "YDAFCx+889qiWyZfahVihx2fL598haw7ebRRmzbshCgEBgyj+rY/Eui/F/8UVVp+eTmt918HRvlX" +
-           "hOqGexWX3q4bvn2kg582nZW1awc9vuhL4Whs1R4IpqC1ubnXhm8d/mp45cK9cEK29/0v+22P3Elq" +
-           "xsMBhJ3Ssj7U/OYVwv0GsTvU99h03nGkXnsKEXabqqNVV96b75z9vCRf+kPAEWi5+P4fjvzfs2/e" +
-           "Ay+rC96f9fzYPqsX11mF2EGH+yYal9TMJ4wCKJ9ILAQmXbXbsWSyeVLpPGUX3ULm3Tfxk43sNrG0" +
-           "/eE+Uz7pMk29/Li1Nmeyj917QsexJ9xbVFzcDmDoFgWe5wWysx7/mvq+o1Y0NuEUOp6bpjaXEgV2" +
-           "Nuke/Sg6+n8B8H3LklWNzJq7gtXrW7BW6UpzopN7fj+X+6bNZdqCNuKnnof6oOzmqEr2w/cc9fMa" +
-           "2OsAtQoVq947YPVfFu/XzStMQWtTU1WPJXNHWwWnR28bHjZKWu+9AUVFlE+mkDxoPEXxCNYq055f" +
-           "yKamJGNHD0REUFVA2JlgwOGbJxxMLBKkrSNDONWTjkfvxG/dwO6yXobO2TMl+sVjNPPBO+pmM+FV" +
-           "s18cP3T0597oxmAKNqxYtm9R07oaayG0/0HqNW4mt26Vg4LyycSD7N6jcIFM3iMWDTH5lKEEXId/" +
-           "RFEsxN+VFkfQWDXxcceReHQqGHaPqnS+NctUXnyzlUBIfS8jzvzXxnieF3ZdN+PSLQo6PlhwcMxa" +
-           "Y30IH/h5Mu+/o9bLsCu58l4AhIMuR4/ZG9cx/LNS6RwbGzuorSkjfuTxtP7hLsBntwjkNq0T9TxM" +
-           "RV/1Ni2jdPUH+3q5XNFfgzF0hwLHXfmXA3wFcRwN7zuC9HvviKqC0uXkjYsCIrItlpa2TmbM/pCV" +
-           "a5tR1a5DTWWZ+MNHuPTWGbwwZxnBQfvi9hwAym6PptvFb20kWDsQtRBNbO6ZSyX7dNcjqUA1HG9a" +
-           "308VJF6qblVvydUvQa2KCjtlFGwqScazRAMOAIn2NOdc9kfqN7Ry8jEHcvyRQ6mrKWdn1m5KsHJd" +
-           "C9Fw4G97oKMO+SrBQUPIbVgBwu5RJbP8Qwn03UvVn4FR39H21kFUVi0wdIeCYDjRWKkKpqiHqlr1" +
-           "WpsEdvGfDLgNa2nPeADbVpctEeD7lufnLGXpqka6MnhAJRMnDKdf7zLO/NpIxA0QqKlF7XZ/a+uA" +
-           "bB0UdGcrjKrkN9QT6N0fFVEVcFJt3bXCFKiq6zdtKlYFJxoDL49NZ1GlawLRVYtozfhUFwFA76pi" +
-           "vvyFvXnpjWVUlcU4aP8auuI6hovPOQxVRUQAMOE4WFC2MmEI9YaiUUJ0X0F9yKyGxIuW3AZA+DgF" +
-           "v61ZnPJKRQEFL9FS3k3BFAjq4uWCqkAoiFormvdF6ZoKRFcupjnt8XfhUIDLJx3BN48/mMqyGPFY" +
-           "iF1jWyyqis21E6iGyF5CdD8hMkQI9gYJCFgAiB6oaN7Q8LAFYQeay6iJRFQFVMHx8+HuC6ZAsCoA" +
-           "iICqKICyS6H1S9mcaEf7Fm1bIYJBl9qacrqm4DWguTWgafDbIL8O0u9R/qWn6HGEgxMTAFC2soAB" +
-           "P6G0zrS0PKEggPIxqqBWQURQUO3mE3cF4uG6nirYnAeOYzGOURB2wSTb8NavJrNPLyIBh11jayTN" +
-           "v0TbHgevETQHeKAWALcYQEDZSkBEyayDtlmWttlKvpGthE8WDInN5nRbLMZ43RdMgS/hWEqh3E+m" +
-           "RNygEgqqtrNrCsFlC2g79OBdB6OKpl5G10+C7CpAQYRtRPgYB/x2JTlfScxSUksUzW4XirIDtWDi" +
-           "ZeolWrEWACQUaeuuYApEck5JeTNKX789gRhHnJJS8pvXIkKX1ED0w3m0ZM+muoguaXYxWj8R/CYQ" +
-           "AQSskmsCJw5OVEDA71BSi5S217b+9FOg2/ekXUcc6NmX/MZ1YFUQcGJFm7ormAIh41b1Wm+VAzXZ" +
-           "gteR0GDNYNJL39cthF0IL1tIUzIPFXStcy74jSAGAFWl/lpLxzuKBMCJAgb8JKgHOHyMKv8QMUZD" +
-           "g4aQnPMiKoCIOqU9VnZbMAWSD9UN+QDlWJvJSeYv7xMeOpzEzD8h7Fpw43Kam5rw+xXjGGGnIsPB" +
-           "REHTgGDTkF6tqANY8JJsgwEUAJSPPL0EULoWjGmgujfp5R8KgImVtG0JZhWAoVsUlIz/2jtqRUGl" +
-           "8903NDb8EMSEUNjlmM40/pplpHIeXZHwUKTHZMAFwIkJ1acZghWAgNqPjAIGnDhE66DHl4Wacw0D" +
-           "LjGE+8FOP7VQcCur1cSKNbe+XhSIjfjCMhONd+cepiBYO/hdU1TW6idbyjvemWuqzv2JBqr62OzG" +
-           "FQ67oh7BD9+l/YjDKA4H2CkJID0vJ1OfQJvvI1QjlI8zFB0sZJYr2U3gd4I44JZAsEoI9gS3FCQo" +
-           "CEpmDXgZ2PnLftkS+xc0/eH7+Ml2wUB05Ji54jipbgymwEQi6yNDhi1Mvv3KYdk1SyW3ZqUWjz3G" +
-           "Njw81QgqdEFVCS9ZQFPGUlNC10yUxBt9aLjXEttHKB4txIcKsf3lb+GgoApYthLAQm6j0vqK0vSs" +
-           "Jd8CIjuPsnjcMdoy7TeiqBjj+LERh7wIaDcGUyCO27klkGc7tgSDlzctT/7eVpx8Ng2/uwfVHLsS" +
-           "Wv0+ifYUWhVBROiKWh8vBe3v6t/GhCHYE6IDhUidEKoGEwIvCZl6SP1F6Vyh+B2AbB1lRyiEB+zl" +
-           "B/v0p+PtOQaBQJ8BqyN77/c2QDcHU1AybsLTm35184Vec0NVYsbjUn3uj6Ro9OFe++szAghdcho3" +
-           "0LlpI7naHoRcoStueSXKNvgZSK+GzlWKiO74ASMg0vV7LwCqRstPPlsTzz2Gl2wTMVB82DHPumXl" +
-           "mwvXfewB6vvO6h+c/mDLE787Ra1or8mXeMWHHcmHJx3uiPiGLqgE2XTlg3z+xK9THg3SlbZZM1h+" +
-           "1gTApzsFq+u8QQ8+ydKTxomX2OSYaFHH4N++OD42YvTcPbDCFIjj+JWnn3tX2ysvTMgnmoo3P3CH" +
-           "6XHyWfT46kS/6YmHBFTYCdEcgSXvksh+lfIoXQrVDsKUVOIlNrGdrhaRrlmjvS66yjb+7n7JNW9y" +
-           "cUR7njFlRmz4qPl78H6YgtiBo96s/t4lz6iKesmEs/6Gy2yvC66QQGU/q12djbEQWrqI5lSOXa8E" +
-           "fQgP2ptP+n1N8SCpoPPPnbBT0dIj/icfrhssmx+611GBQGXftupvnX8bIvk9G0xhlfGqTv/2jZEB" +
-           "+zQAND89zU0teFv7Xn6TlUDUdtEMwbVLaG9N4FslmW+gKbOGjN+5wzFNE45QPGY8WFAAC4niEHdM" +
-           "GMjJU0bw4Ji+GPsP9qIQqq6zfS6+Rtb85HzRXMqAY/v+6PpH3PKKN9mOc+WVV9K9CiQQ3Bzdd1iw" +
-           "afrDX1LNO8m359LzrO+pW1yh7W+/blAr7AjJWzoOPZaaAX2Yu/lWHls1ldc2z2VjOklJsILiQBwR" +
-           "wVefXDRAy1N/gnyWv4yu4s4zhzCztox2DAIctaABlF1y4mW29md32y2bdJqfneYCUnzI4cv6XnrD" +
-           "d8SYxKd1e0OBaqz+yose23j/z8cBFA3/gjfw9l/Lxjt+rg2P/soFX9iBQ+OP7mTUWWeyoOkaXtv0" +
-           "KqtTsDxpSfoVfLn34YzoU8bsxnksb23EeWMxxwRyvDGigqVJWJ5U2vLQvznNA3cuIJLz6YqEiuyA" +
-           "a27x1fOov+J8x+bTxo2Xdw6btfDUYK8+j32aN1AViKT6/eS6ye1zXn45tWR+Tce7r7v1V/zQ73/N" +
-           "L0R9z2+Y9oCzQzTWx/1wEa1pH8SwlWDE0JBp5oHVv2eB+jQnhdaUoWNQnIE1LmQUUP4uHzDkHEOY" +
-           "nQSjYCJFtt9lN/kmFmflxZMdm0sbxbGDpj50+5ZYngT49IMpPJqW7TP9pVPf/fy+T3qJTcUtM59y" +
-           "FPEGXHuLOOUV3oZ7fuGieeEjgsvfo7WjE9cN8FECOI5gEEQEgJyFVF7ZnhXBIqiyA1UIlFb5tdff" +
-           "ZlFY+aMpjt/ebFSh/yU/nV467pgrAf/fdItmgVtS9uqwF98620TK0mCl5aUn3OWTT6dq4tky8Of3" +
-           "eSZSZlXZJrC+nmRTC0aibE/4OFVFAWv4GMcqxirbUysaG3yAN+S3T2i+sYHlF37H8doajSr0Ovv7" +
-           "s/qce+E5QPbffO1qQah33+kH/nnhaYHKfq2qKm3vvOYu/to43LIKhr0415aOOTpvNaBWwSSayNav" +
-           "QrR0hzhcP86g6H4MjNUyuuJArjrwO9w06hGOesWl3+oOgr5iBEpSecJZH2vZOiqKG7N9Jl3k7f2b" +
-           "P7Hp/+7RlZed7/rpdqM4ts+5lz5be+2txyHS/hm62Lkg39x05AenfOWejoVv9hdUkIBWTzzHqznv" +
-           "YumYN1fX//JnJvXBItNy7k8lftpgZm28iRVJZXM2yoiKcXx3yERqi3qxvaY/Pcqyb09kc0WQRf3i" +
-           "lKY8Rq5IYBF1wnFKDxtva6ZcaHONTdRffZF0Ll/iYsAEI/m6a29/qPq0b56/LZbPVjAFNpMeuvrK" +
-           "i2/f+ODdY9TmHXwI1dT6vSedpz3GHyvJhfN1VUMSjhljFrb/UuLBfeRzPY+hX7w/O2PzORYePYbk" +
-           "orcQFRXXJVBdo+Vjj7QVx5+MuAHZcPdt2vTsYw54gkKopq55yN2/vano4M/dBmQBPqvBFKiWtc56" +
-           "4YJlF3x3Unb96nIEUKOR2sG28usnafmErxOoHUwwGkLEiCDCNgg70paXnmPNjVdr0fCRWjJmLOEB" +
-           "daRXraDxj7+j9dUXjc2kBFTEuH7VSWfOrbvqpkvc0rI/Awrw2Q+mwPgdHaPX3X3rj9dNvfEom0kF" +
-           "VAEVdYvLtGjoAVo85ggtGf05CfcbqMGqKjGhMB9pRwEBUN/Ha23R9OrlZFatlMRrL2v73NclXb/C" +
-           "qJ8XMQCyJaZD1g687hdTi0aMvh+Rlv/AL9gq0Hw+3PbWnMPX3n7jlLY5s8baXDYEgIIiagIh3NIe" +
-           "Gqqq1EBVb9zyCtxoXDFGbT5n/PaE5ho2mtzmjeSbW/A720R9X8SwTbimf33Pb5zxUO9vTv5VoKKq" +
-           "/r/gK/wKbDYTTi1eNHTzH393SvPzT0/IrF5Zp2KNCFtpF8cqBba/ndVEYqmKCcfP6Xn8xEeLRx78" +
-           "rFtS2oCIAvx3BVMgms/H8q3N+zc9/cTYphlPf/6vIWU3ru+jnufySUTULSpujwzca9mWPcy8skMP" +
-           "e6Xkc4fODlb32iyOk6cb/T/N+faHj8AX2gAAAABJRU5ErkJggg=="
-  }
-};
+#include ../shared/searchenginelogos.js

 // This global tracks if the page has been set up before, to prevent double inits
 var gInitialized = false;
--- a/application/palemoon/components/abouthome/jar.mn
+++ b/application/palemoon/components/abouthome/jar.mn
@ -4,7 +4,7 @@

 browser.jar:
 * content/browser/abouthome/aboutHome.xhtml
-  content/browser/abouthome/aboutHome.js
+* content/browser/abouthome/aboutHome.js
 * content/browser/abouthome/aboutHome.css
  content/browser/abouthome/noise.png
  content/browser/abouthome/snippet1.png
--- a/application/palemoon/components/newtab/newTab.css
+++ b/application/palemoon/components/newtab/newTab.css
@ -13,7 +13,7 @@ body {
  height: 100%;
  padding: 0;
  margin: 0;
-  background-color: #F9F9F9;
+  background-color: rgb(229,229,229);
  display: -moz-box;
  position: relative;
  -moz-box-flex: 1;
@ -251,7 +251,7 @@ input[type=button] {

 #searchEngineLogo {
  border: 1px transparent;
-  padding: 2px 4px;
+  padding: 2px 4px 2px 2px;
  margin: 0;
  width: 32px;
  height: 32px;
@ -268,9 +268,9 @@ input[type=button] {
  border: 1px solid;
  border-spacing: 0;
  border-radius: 2px 0 0 2px;
-  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
-  box-shadow: 0 1px 0 hsla(210,65%,9%,.02) inset,
-              0 0 2px hsla(210,65%,9%,.1) inset,
+  border-color: hsla(228,54%,20%,.15) hsla(228,54%,20%,.17) hsla(228,54%,20%,.2);
+  box-shadow: 0 1px 0 hsla(228,65%,9%,.02) inset,
+              0 0 2px hsla(228,65%,9%,.1) inset,
              0 1px 0 hsla(0,0%,100%,.2);
  color: inherit;
  unicode-bidi: plaintext;
@ -290,22 +290,20 @@ input[type=button] {

 #searchText[keepfocus],
 #searchText:focus {
-  border-color: hsla(216,100%,60%,.6) hsla(216,76%,52%,.6) hsla(214,100%,40%,.6);
+  border-color: hsla(234,0%,60%,.6) hsla(234,0%,52%,.6) hsla(234,0%,40%,.6);
 }

 #searchSubmit {
  margin-inline-start: -1px;
-  padding: 0;
+  padding: 0 9px;
  border: 1px solid;
  background-color: #e0e0e0;
  color: black;
-  border-color: hsla(220,54%,20%,.15) hsla(220,54%,20%,.17) hsla(220,54%,20%,.2);
-  border-radius: 0 2px 2px 0;
+  border-color: hsla(234,0%,20%,.15) hsla(234,0%,20%,.17) hsla(234,0%,20%,.2);
+  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);
  cursor: pointer;
-  transition-property: background-color, border-color, box-shadow;
-  transition-duration: 150ms;
  width: 50px;
 }

@ -314,33 +312,27 @@ input[type=button] {
 }

 #searchSubmit:hover {
-  background-color: hsl(220,54%,20%);
+  background-color: hsl(220,54%,30%);
  color: white;
 }

 #searchText:focus + #searchSubmit,
 #searchText + #searchSubmit:hover {
-  border-color: #5985fc #4573e7 #3264d5;
+  border-color: #808080;
 }

-#searchText:focus + #searchSubmit,
-#searchText[keepfocus] + #searchSubmit {
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
-              0 0 0 1px hsla(0,0%,100%,.1) inset,
-              0 1px 0 hsla(220,54%,20%,.03);
-}
-
-#searchText + #searchSubmit:hover {
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,
-              0 0 0 1px hsla(0,0%,100%,.1) inset,
-              0 1px 0 hsla(220,54%,20%,.03),
-              0 0 4px hsla(216,100%,20%,.2);
+#searchText[keepfocus],
+#searchText:focus,
+#searchText[keepfocus] + #searchSubmit,
+#searchText:focus + #searchSubmit
+{
+  box-shadow: 0 0 2px hsla(0,0%,100%,.5) inset,
+              0 2px 4px 0px rgba(37,37,37,.2);
 }

 #searchText + #searchSubmit:hover:active {
-  box-shadow: 0 1px 1px hsla(221,79%,6%,.1) inset,
-              0 0 1px hsla(221,79%,6%,.2) inset;
-  transition-duration: 0ms;
+  background-color: hsl(220,24%,10%);
+  color: #a0a0a0;
 }

 .contentSearchSuggestionTable {
--- a/application/palemoon/components/newtab/page.js
+++ b/application/palemoon/components/newtab/page.js
@ -108,10 +108,14 @@ var gPage = {

    this._initialized = true;

+    // XXX: this comment makes no sense for what it does. There's no HC check,
+    // and it changes the button unconditionally to a "play" button. Which is
+    // wrong for search. Commented out for now.
+    //    
    // Set submit button label for when CSS background are disabled (e.g.
    // high contrast mode).
-    document.getElementById("searchSubmit").value =
-      document.body.getAttribute("dir") == "ltr" ? "\u25B6" : "\u25C0";
+    // document.getElementById("searchSubmit").value =
+    //   document.body.getAttribute("dir") == "ltr" ? "\u25B6" : "\u25C0";

    if (document.hidden) {
      addEventListener("visibilitychange", this);
--- a/application/palemoon/components/newtab/search.js
+++ b/application/palemoon/components/newtab/search.js
@ -4,47 +4,7 @@
 * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #endif

-const SEARCH_ENGINES = {
-  "DuckDuckGo": {
-  	 image: "data:image/png;base64," +
-            "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAACT1BMVEXvISn/////9/fvUlr3ra3/" +
-            "zs7/7+/va2v/5+f/xsbvMTn/tbX/3t7/vb3vOUL3WmPvQkr/zgDvKTHvSlL3hIT3paX/1tbnISn3" +
-            "c3v3e3v3a3P3jIz3nJz/tb33c3PvKSn3lJT39/cAc73vSkr3e4Tv7+/3Yxj3pa3/tQj3jJT3nKX3" +
-            "Y2P/xs73hIzvQkL/vQjvQiHn5+f3hBD/ztbvMTH/vcb/3ucIc733lJz/pQilzufe7/fvMSHOzs73" +
-            "//cQrUpKvVprxmP3Y2vvShiUzmvWlJRzzmMYtUrvOTnn7/davVrWra3v9//nY2PvISGUxudztd7e" +
-            "3t7/76XvKSHea2v/xgDnOUK93vfW5/f/1t73Uhj/52ut3q2l3rXO784pjMZrrdb/rQjera3/5+/e" +
-            "paWMxufO79aEazkYrUr/nAj3jBD3axj3lBD///fehIRKpd7/1hCEYzk5vVL3//8ptVLW77UxtVLn" +
-            "SlLW1tZCvVp7vef/1gj/3invSkL//+fWtbXvpaX/3kr/97XvnJznWmMxjM5zvefOxsbWnKXWjIzG" +
-            "3u/ea3Pn997O5/fnQkqExuf3Whit1u/nUlrnxs7v5+d7zmuU1pT3exDOSjFjrVL/987/pUoQe8b/" +
-            "75T/3jFKxnO158bWKSl7zoRSxmtajEK1e0pzxlqcUjH/1iHOMSnOvb33cxDWnJx7td6EzmP/74xz" +
-            "azlrcznec3Pe771jxlpzczne78YpvVqEvWPn99YxvWOtSjHee3vG787OOTE5lEK1QjHv9+drzmve" +
-            "tbXO772q+r8wAAAFbUlEQVR4Xo2X84PzTBDHN3Zqu2fbemzbNl7atm3btvGHvTNJ2myuyd3NL2mT" +
-            "zmdnvjM76RImyGQlH5dCHBeSmscNmQkyfwBrZMLEY2aRF5cMSDYPEx+LZpUlAYRQbVEpnuc1je/M" +
-            "SbVwYoVFAbpE0IaLmiwqiVymmE3H84YuGs2mheCEhQH5qPUrje2ONxHKVIkXR2x2MxsMkDnLvftk" +
-            "2fSTQNCzSAgngwCCipkXxHiU+BsnCDFE8f6AQgnwaTGhkmDLymW8jPsBeIsth8iCpha618El1wgo" +
-            "4FOhWyWLWY+O8pbnAwTI29S1ElncJBmF4L0AGeJSdR4dUpt5w+DL0nAgoUuGGKKCBxDCOxrykaDb" +
-            "+yFQjhUylLlXpAB5jGnIqV6uvvWUcAAhLmDBXIAMrkXRdHQ+cerUiWefq1hRrAgg8LikUgdkQUAx" +
-            "6+2Ze0WLEO/1BQzrHCFNrAPAeDSD4q/Ln6R3p68MSYzDAUiwIEutJM0bHXE/gpEhJMxaAB3T6aT8" +
-            "mfkm+QBiMlwKFqAHvrHu9tvTOLrEdX4hFAkJWQB42qbVyam75ruv3zvF+wBCKJ0MAAV6SAy5+raA" +
-            "y+lb9tYBUw9sffKRJh+CDl2SAEAPquaC76swU1c+zlxbA9if/EIY78AcCBODDKjnVzDM0+sb57zq" +
-            "N14gdpbg4nraBaxm3NWpIDKNgJIIDTxEAKMyVM9/VrFcpijK52PbNhmk0RQORCA8dhGhIkDA+qPV" +
-            "Y/U8No2NHZsUfQCdzYTECSiRSRJKgxYAnK6+tnVrPYL7q2P7GNNnT0L3SQSS61AowK4BAExWq9XJ" +
-            "OmDT5D4GtUab7p92W1aD6AFBOjUKcONNKMG2o9vmScmhd+v5SCTS91StDLBwmHR5q0iiM4yv3X5g" +
-            "sD1i24tUHc0GQOrOihdw+ZV7drx+8I1IzfpaCQ1oSIGsbqEBdxy8KkLb8dYt7m7AFBpEJI8OUIAd" +
-            "Hve+wX509IqYgzLqxKMi5X+r6737wgHfMrZBKGwpQMWP0PN8/8qLn15cSRosEQeI3coxGrzRVfE2" +
-            "BEyTAMNpmbA3k2erPOyq+CUCPGvv3OmGykYBQhiYFbynDLu2uyW826qb7bSlv/VCe2R3vQqhIYQQ" +
-            "nLmSGKUAT1AqXn7V6p72iUsTThsNuhKUAeKMNFaiW2nG08H90IF1m6DywVdsHgA4bPgRGgAqUgBr" +
-            "DwxOtPcdv9RK6yklnaGKOXBMmN7RVCtJJMiUdG2s78dv9HbY7KrI9AQBOHwjaxaA6cKhRLXCHkpF" +
-            "PrAJYBz1su7LtSBQIjzozgI5AJDWsQ7gTJxETTHuEh5yW8kR5+1fvQBT5PDdWgPokE6GSuK3Aaby" +
-            "2KwNyGFIZ8/NfexVMAGXEfe8MA5QTVdrgGe2M9evev6FMwiAYr308nVzcx/SgHwSlswyLgDLHU0K" +
-            "tX5UZwCwZsM1b7516J1333v/g2UAuJoCNMsmZkEDZBXujCoOIfVJxQKsvXnDshvWfrEcAV9RAoqY" +
-            "rfdvHjY06R3tVmtjzQYsQ8ByC/C1O0dEzqkAGqELbiZ1W/RvBr51Ad9ZgO8dQCkh4/q5xvMC6hot" +
-            "sBl7rP1QT+HHQz9RGoSHhkyMgqEBdNPFWSWMY+1nBPxy+MjvZ2aZxB9n/zz3FwKiOTZfotb3AhhF" +
-            "xSUUNmGSjX+vWvPPYacVWJOkUilUT05ymEVb0JFHj9l/AVn+35b/jsx6YzNz8mja+iAEH7rYDntY" +
-            "Gaz3dizW080KWaeICx77kiG7lTKG6EEoPb0Wu0lZ9OA5whFH8GxHQjOMQls5HSs5t/glHX2FYtT/" +
-            "mGAs/fCtFU0vQJUSQYfvIBvVyukuLhbjuood/H6WCbD/AQSFvIO3JDxgAAAAAElFTkSuQmCC"
-  }
-};
+#include ../shared/searchenginelogos.js

 // This global tracks if the page has been set up before, to prevent double inits
 var gInitialized = false;
--- a/application/palemoon/components/preferences/privacy.xul
+++ b/application/palemoon/components/preferences/privacy.xul
@ -1,6 +1,6 @@
 <?xml version="1.0"?>

-<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
+<!-- -*- Mode: XML; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
 <!-- 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/. -->
@ -87,187 +87,174 @@
    
    <script type="application/javascript" src="chrome://browser/content/preferences/privacy.js"/>

-    <tabbox id="privacyPrefs" flex="1"
-            onselect="gPrivacyPane.tabSelectionChanged();">
+    <!-- History -->
+    <groupbox id="historyPanel">
+      <caption>&history.label;</caption>
+      <hbox align="center">
+        <label id="historyModeLabel"
+               control="historyMode"
+               accesskey="&historyHeader.pre.accesskey;">&historyHeader.pre.label;</label>
+        <menulist id="historyMode"
+                  oncommand="gPrivacyPane.updateHistoryModePane();
+                             gPrivacyPane.updateHistoryModePrefs();
+                             gPrivacyPane.updatePrivacyMicroControls();
+                             gPrivacyPane.updateAutostart();">
+          <menupopup>
+            <menuitem label="&historyHeader.remember.label;" value="remember"/>
+            <menuitem label="&historyHeader.dontremember.label;" value="dontremember"/>
+            <menuitem label="&historyHeader.custom.label;" value="custom"/>
+          </menupopup>
+        </menulist>
+        <label>&historyHeader.post.label;</label>
+      </hbox>

-      <tabs id="tabsElement">
-        <tab id="historyTab" label="&history.label;"/>
-        <tab id="trackingTab" label="&tracking.label;"/>
-        <tab id="locationBarTab" label="&locationBar.label;"/>
-      </tabs>
-
-      <tabpanels flex="1">
-
-        <!-- History -->
-        <tabpanel id="historyPanel" orient="vertical">
-        
-          <hbox align="center">
-            <label id="historyModeLabel"
-                   control="historyMode"
-                   accesskey="&historyHeader.pre.accesskey;">&historyHeader.pre.label;</label>
-            <menulist id="historyMode"
-                      oncommand="gPrivacyPane.updateHistoryModePane();
-                                 gPrivacyPane.updateHistoryModePrefs();
-                                 gPrivacyPane.updatePrivacyMicroControls();
-                                 gPrivacyPane.updateAutostart();">
-              <menupopup>
-                <menuitem label="&historyHeader.remember.label;" value="remember"/>
-                <menuitem label="&historyHeader.dontremember.label;" value="dontremember"/>
-                <menuitem label="&historyHeader.custom.label;" value="custom"/>
-              </menupopup>
-            </menulist>
-            <label>&historyHeader.post.label;</label>
+      <deck id="historyPane">
+        <vbox align="center" id="historyRememberPane">
+          <hbox align="center" flex="1">
+            <spacer flex="1" class="indent"/>
+            <vbox flex="2">
+              <description>&rememberDescription.label;</description>
+              <separator/>
+              <description>&rememberActions.pre.label;<html:a
+                class="inline-link" href="#"
+                onclick="gPrivacyPane.clearPrivateDataNow(false); return false;"
+              >&rememberActions.clearHistory.label;</html:a>&rememberActions.middle.label;<html:a
+                class="inline-link" href="#"
+                onclick="gPrivacyPane.showCookies(); return false;"
+              >&rememberActions.removeCookies.label;</html:a>&rememberActions.post.label;</description>
+            </vbox>
+            <spacer flex="1" class="indent"/>
          </hbox>
-
-          <deck id="historyPane">
-            <vbox align="center" id="historyRememberPane">
-              <hbox align="center" flex="1">
-                <spacer flex="1" class="indent"/>
-                <vbox flex="2">
-                  <description>&rememberDescription.label;</description>
-                  <separator/>
-                  <description>&rememberActions.pre.label;<html:a
-                    class="inline-link" href="#"
-                    onclick="gPrivacyPane.clearPrivateDataNow(false); return false;"
-                  >&rememberActions.clearHistory.label;</html:a>&rememberActions.middle.label;<html:a
-                    class="inline-link" href="#"
-                    onclick="gPrivacyPane.showCookies(); return false;"
-                  >&rememberActions.removeCookies.label;</html:a>&rememberActions.post.label;</description>
-                </vbox>
-                <spacer flex="1" class="indent"/>
-              </hbox>
+        </vbox>
+        <vbox align="center" id="historyDontRememberPane">
+          <hbox align="center" flex="1">
+            <spacer flex="1" class="indent"/>
+            <vbox flex="2">
+              <description>&dontrememberDescription.label;</description>
+              <separator/>
+              <description>&dontrememberActions.pre.label;<html:a
+                class="inline-link" href="#"
+                onclick="gPrivacyPane.clearPrivateDataNow(true); return false;"
+              >&dontrememberActions.clearHistory.label;</html:a>&dontrememberActions.post.label;</description>
            </vbox>
-            <vbox align="center" id="historyDontRememberPane">
-              <hbox align="center" flex="1">
-                <spacer flex="1" class="indent"/>
-                <vbox flex="2">
-                  <description>&dontrememberDescription.label;</description>
-                  <separator/>
-                  <description>&dontrememberActions.pre.label;<html:a
-                    class="inline-link" href="#"
-                    onclick="gPrivacyPane.clearPrivateDataNow(true); return false;"
-                  >&dontrememberActions.clearHistory.label;</html:a>&dontrememberActions.post.label;</description>
-                </vbox>
-                <spacer flex="1" class="indent"/>
-              </hbox>
-            </vbox>
-            <vbox id="historyCustomPane">
-              <separator class="thin"/>
-              <checkbox id="privateBrowsingAutoStart" class="indent"
-                        label="&privateBrowsingPermanent2.label;"
-                        accesskey="&privateBrowsingPermanent2.accesskey;"
-                        preference="browser.privatebrowsing.autostart"
-                        oncommand="gPrivacyPane.updateAutostart()"/>
+            <spacer flex="1" class="indent"/>
+          </hbox>
+        </vbox>
+        <vbox id="historyCustomPane">
+          <separator class="thin"/>
+          <checkbox id="privateBrowsingAutoStart" class="indent"
+                    label="&privateBrowsingPermanent2.label;"
+                    accesskey="&privateBrowsingPermanent2.accesskey;"
+                    preference="browser.privatebrowsing.autostart"
+                    oncommand="gPrivacyPane.updateAutostart()"/>

-              <vbox class="indent">
-                <vbox class="indent">
-                  <checkbox id="rememberHistory"
-                            label="&rememberHistory2.label;"
-                            accesskey="&rememberHistory2.accesskey;"
-                            preference="places.history.enabled"/>
-                  <checkbox id="rememberForms"
-                            label="&rememberSearchForm.label;"
-                            accesskey="&rememberSearchForm.accesskey;"
-                            preference="browser.formfill.enable"/>
-
-                  <hbox id="cookiesBox">
-                    <checkbox id="acceptCookies" label="&acceptCookies.label;" flex="1"
-                              preference="network.cookie.cookieBehavior"
-                              accesskey="&acceptCookies.accesskey;"
-                              onsyncfrompreference="return gPrivacyPane.readAcceptCookies();"
-                              onsynctopreference="return gPrivacyPane.writeAcceptCookies();"/>
-                    <button id="cookieExceptions" oncommand="gPrivacyPane.showCookieExceptions();"
-                            label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
-                            preference="pref.privacy.disable_button.cookie_exceptions"/>
-                  </hbox>
-
-                  <hbox id="acceptThirdPartyRow" class="indent">
-                    <hbox id="acceptThirdPartyBox" align="center">
-                      <label id="acceptThirdPartyLabel" control="acceptThirdPartyMenu"
-                             accesskey="&acceptThirdParty.pre.accesskey;">&acceptThirdParty.pre.label;</label>
-                      <menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
-                      onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
-                      onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
-                        <menupopup>
-                          <menuitem label="&acceptThirdParty.always.label;" value="always"/>
-                          <menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
-                          <menuitem label="&acceptThirdParty.never.label;" value="never"/>
-                        </menupopup>
-                      </menulist>
-                    </hbox>
+          <vbox class="indent">
+            <vbox class="indent">
+              <checkbox id="rememberHistory"
+                        label="&rememberHistory2.label;"
+                        accesskey="&rememberHistory2.accesskey;"
+                        preference="places.history.enabled"/>
+              <checkbox id="rememberForms"
+                        label="&rememberSearchForm.label;"
+                        accesskey="&rememberSearchForm.accesskey;"
+                        preference="browser.formfill.enable"/>
+                <hbox id="cookiesBox">
+                  <checkbox id="acceptCookies" label="&acceptCookies.label;" flex="1"
+                            preference="network.cookie.cookieBehavior"
+                            accesskey="&acceptCookies.accesskey;"
+                            onsyncfrompreference="return gPrivacyPane.readAcceptCookies();"
+                            onsynctopreference="return gPrivacyPane.writeAcceptCookies();"/>
+                  <button id="cookieExceptions" oncommand="gPrivacyPane.showCookieExceptions();"
+                          label="&cookieExceptions.label;" accesskey="&cookieExceptions.accesskey;"
+                          preference="pref.privacy.disable_button.cookie_exceptions"/>
+                </hbox>
+                <hbox id="acceptThirdPartyRow" class="indent">
+                  <hbox id="acceptThirdPartyBox" align="center">
+                    <label id="acceptThirdPartyLabel" control="acceptThirdPartyMenu"
+                           accesskey="&acceptThirdParty.pre.accesskey;">&acceptThirdParty.pre.label;</label>
+                    <menulist id="acceptThirdPartyMenu" preference="network.cookie.cookieBehavior"
+                    onsyncfrompreference="return gPrivacyPane.readAcceptThirdPartyCookies();"
+                    onsynctopreference="return gPrivacyPane.writeAcceptThirdPartyCookies();">
+                      <menupopup>
+                        <menuitem label="&acceptThirdParty.always.label;" value="always"/>
+                        <menuitem label="&acceptThirdParty.visited.label;" value="visited"/>
+                        <menuitem label="&acceptThirdParty.never.label;" value="never"/>
+                      </menupopup>
+                    </menulist>
                  </hbox>
+                </hbox>
              
-                  <hbox id="keepRow" class="indent">
-                    <hbox id="keepBox" align="center">
-                      <label id="keepUntil"
-                             control="keepCookiesUntil"
-                             accesskey="&keepUntil.accesskey;">&keepUntil.label;</label>
-                      <menulist id="keepCookiesUntil"
-                                preference="network.cookie.lifetimePolicy">
-                        <menupopup>
-                          <menuitem label="&expire.label;" value="0"/>
-                          <menuitem label="&close.label;" value="2"/>
-                        </menupopup>
-                      </menulist>
-                    </hbox>
-                    <hbox flex="1"/>
-                    <button id="showCookiesButton"
-                            label="&showCookies.label;" accesskey="&showCookies.accesskey;"
-                            oncommand="gPrivacyPane.showCookies();"
-                            preference="pref.privacy.disable_button.view_cookies"/>
+                <hbox id="keepRow" class="indent">
+                  <hbox id="keepBox" align="center">
+                    <label id="keepUntil"
+                           control="keepCookiesUntil"
+                           accesskey="&keepUntil.accesskey;">&keepUntil.label;</label>
+                    <menulist id="keepCookiesUntil"
+                              preference="network.cookie.lifetimePolicy">
+                      <menupopup>
+                        <menuitem label="&expire.label;" value="0"/>
+                        <menuitem label="&close.label;" value="2"/>
+                      </menupopup>
+                    </menulist>
                  </hbox>
+                  <hbox flex="1"/>
+                  <button id="showCookiesButton"
+                          label="&showCookies.label;" accesskey="&showCookies.accesskey;"
+                          oncommand="gPrivacyPane.showCookies();"
+                          preference="pref.privacy.disable_button.view_cookies"/>
+                </hbox>

-                  <hbox id="clearDataBox" align="center">
-                    <checkbox id="alwaysClear" flex="1"
-                              preference="privacy.sanitize.sanitizeOnShutdown"
-                              label="&clearOnClose.label;"
-                              accesskey="&clearOnClose.accesskey;"/>
-                    <button id="clearDataSettings" label="&clearOnCloseSettings.label;"
-                            accesskey="&clearOnCloseSettings.accesskey;"
-                            oncommand="gPrivacyPane.showClearPrivateDataSettings();"/>
-                  </hbox>
-                </vbox>
+                <hbox id="clearDataBox" align="center">
+                  <checkbox id="alwaysClear" flex="1"
+                            preference="privacy.sanitize.sanitizeOnShutdown"
+                            label="&clearOnClose.label;"
+                            accesskey="&clearOnClose.accesskey;"/>
+                  <button id="clearDataSettings" label="&clearOnCloseSettings.label;"
+                          accesskey="&clearOnCloseSettings.accesskey;"
+                          oncommand="gPrivacyPane.showClearPrivateDataSettings();"/>
+                </hbox>
              </vbox>
            </vbox>
-          </deck>
+          </vbox>
+        </deck>

-        </tabpanel>
+      </groupbox>
        
-        <!-- Tracking -->
-        <tabpanel id="trackingPanel" orient="vertical">
-
+      <!-- Tracking -->
+      <groupbox id="trackingPanel">
+        <caption>&tracking.label;</caption>
+        <hbox align="center">
          <checkbox id="privacyDoNotTrackCheckbox"
                    label="&dntTrackingNotOkay.label2;"
                    accesskey="&dntTrackingNotOkay.accesskey;"
                    preference="privacy.donottrackheader.enabled"/>
          <separator class="thin"/>
          <label class="text-link" id="doNotTrackInfo"
-                 href="https://www.mozilla.org/dnt"
+                 href="https://www.palemoon.org/support/do-not-track"
                 value="&doNotTrackInfo.label;"/>

-        </tabpanel>
+        </hbox>
+      </groupbox>
        
-        <!-- Location Bar -->
-        <tabpanel id="locatioBarPanel" orient="vertical">
-        
-          <label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
-
-          <vbox id="tabPrefsBox" align="start" flex="1">
-            <checkbox id="historySuggestion" label="&locbar.history.label;"
-                      accesskey="&locbar.history.accesskey;"
-                      preference="browser.urlbar.suggest.history"/>
-            <checkbox id="bookmarkSuggestion" label="&locbar.bookmarks.label;"
-                      accesskey="&locbar.bookmarks.accesskey;"
-                      preference="browser.urlbar.suggest.bookmark"/>
-            <checkbox id="openpageSuggestion" label="&locbar.openpage.label;"
-                      accesskey="&locbar.openpage.accesskey;"
-                      preference="browser.urlbar.suggest.openpage"/>
-          </vbox>
+      <!-- Location Bar -->
+      <groupbox id="locatioBarPanel">
+        <caption>&locationBar.label;</caption>
+          
+        <label id="locationBarSuggestionLabel">&locbar.suggest.label;</label>
+        <hbox id="tabPrefsBox" align="center" flex="1">
+          <checkbox id="historySuggestion" label="&locbar.history.label;"
+                    accesskey="&locbar.history.accesskey;"
+                    preference="browser.urlbar.suggest.history"/>
+          <checkbox id="bookmarkSuggestion" label="&locbar.bookmarks.label;"
+                    accesskey="&locbar.bookmarks.accesskey;"
+                    preference="browser.urlbar.suggest.bookmark"/>
+          <checkbox id="openpageSuggestion" label="&locbar.openpage.label;"
+                    accesskey="&locbar.openpage.accesskey;"
+                    preference="browser.urlbar.suggest.openpage"/>
+        </hbox>
      
-        </tabpanel>
+      </groupbox>

-      </tabpanels>
-    </tabbox>
  </prefpane>

 </overlay>
--- a/application/palemoon/components/shared/searchenginelogos.js
+++ b/application/palemoon/components/shared/searchenginelogos.js
@ -0,0 +1,258 @@
+/* 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/. */
+
+const SEARCH_ENGINES = {
+  "DuckDuckGo": {
+  	 image: "data:image/png;base64," +
+            "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAACT1BMVEXvISn/////9/fvUlr3ra3/" +
+            "zs7/7+/va2v/5+f/xsbvMTn/tbX/3t7/vb3vOUL3WmPvQkr/zgDvKTHvSlL3hIT3paX/1tbnISn3" +
+            "c3v3e3v3a3P3jIz3nJz/tb33c3PvKSn3lJT39/cAc73vSkr3e4Tv7+/3Yxj3pa3/tQj3jJT3nKX3" +
+            "Y2P/xs73hIzvQkL/vQjvQiHn5+f3hBD/ztbvMTH/vcb/3ucIc733lJz/pQilzufe7/fvMSHOzs73" +
+            "//cQrUpKvVprxmP3Y2vvShiUzmvWlJRzzmMYtUrvOTnn7/davVrWra3v9//nY2PvISGUxudztd7e" +
+            "3t7/76XvKSHea2v/xgDnOUK93vfW5/f/1t73Uhj/52ut3q2l3rXO784pjMZrrdb/rQjera3/5+/e" +
+            "paWMxufO79aEazkYrUr/nAj3jBD3axj3lBD///fehIRKpd7/1hCEYzk5vVL3//8ptVLW77UxtVLn" +
+            "SlLW1tZCvVp7vef/1gj/3invSkL//+fWtbXvpaX/3kr/97XvnJznWmMxjM5zvefOxsbWnKXWjIzG" +
+            "3u/ea3Pn997O5/fnQkqExuf3Whit1u/nUlrnxs7v5+d7zmuU1pT3exDOSjFjrVL/987/pUoQe8b/" +
+            "75T/3jFKxnO158bWKSl7zoRSxmtajEK1e0pzxlqcUjH/1iHOMSnOvb33cxDWnJx7td6EzmP/74xz" +
+            "azlrcznec3Pe771jxlpzczne78YpvVqEvWPn99YxvWOtSjHee3vG787OOTE5lEK1QjHv9+drzmve" +
+            "tbXO772q+r8wAAAFbUlEQVR4Xo2X84PzTBDHN3Zqu2fbemzbNl7atm3btvGHvTNJ2myuyd3NL2mT" +
+            "zmdnvjM76RImyGQlH5dCHBeSmscNmQkyfwBrZMLEY2aRF5cMSDYPEx+LZpUlAYRQbVEpnuc1je/M" +
+            "SbVwYoVFAbpE0IaLmiwqiVymmE3H84YuGs2mheCEhQH5qPUrje2ONxHKVIkXR2x2MxsMkDnLvftk" +
+            "2fSTQNCzSAgngwCCipkXxHiU+BsnCDFE8f6AQgnwaTGhkmDLymW8jPsBeIsth8iCpha618El1wgo" +
+            "4FOhWyWLWY+O8pbnAwTI29S1ElncJBmF4L0AGeJSdR4dUpt5w+DL0nAgoUuGGKKCBxDCOxrykaDb" +
+            "+yFQjhUylLlXpAB5jGnIqV6uvvWUcAAhLmDBXIAMrkXRdHQ+cerUiWefq1hRrAgg8LikUgdkQUAx" +
+            "6+2Ze0WLEO/1BQzrHCFNrAPAeDSD4q/Ln6R3p68MSYzDAUiwIEutJM0bHXE/gpEhJMxaAB3T6aT8" +
+            "mfkm+QBiMlwKFqAHvrHu9tvTOLrEdX4hFAkJWQB42qbVyam75ruv3zvF+wBCKJ0MAAV6SAy5+raA" +
+            "y+lb9tYBUw9sffKRJh+CDl2SAEAPquaC76swU1c+zlxbA9if/EIY78AcCBODDKjnVzDM0+sb57zq" +
+            "N14gdpbg4nraBaxm3NWpIDKNgJIIDTxEAKMyVM9/VrFcpijK52PbNhmk0RQORCA8dhGhIkDA+qPV" +
+            "Y/U8No2NHZsUfQCdzYTECSiRSRJKgxYAnK6+tnVrPYL7q2P7GNNnT0L3SQSS61AowK4BAExWq9XJ" +
+            "OmDT5D4GtUab7p92W1aD6AFBOjUKcONNKMG2o9vmScmhd+v5SCTS91StDLBwmHR5q0iiM4yv3X5g" +
+            "sD1i24tUHc0GQOrOihdw+ZV7drx+8I1IzfpaCQ1oSIGsbqEBdxy8KkLb8dYt7m7AFBpEJI8OUIAd" +
+            "Hve+wX509IqYgzLqxKMi5X+r6737wgHfMrZBKGwpQMWP0PN8/8qLn15cSRosEQeI3coxGrzRVfE2" +
+            "BEyTAMNpmbA3k2erPOyq+CUCPGvv3OmGykYBQhiYFbynDLu2uyW826qb7bSlv/VCe2R3vQqhIYQQ" +
+            "nLmSGKUAT1AqXn7V6p72iUsTThsNuhKUAeKMNFaiW2nG08H90IF1m6DywVdsHgA4bPgRGgAqUgBr" +
+            "DwxOtPcdv9RK6yklnaGKOXBMmN7RVCtJJMiUdG2s78dv9HbY7KrI9AQBOHwjaxaA6cKhRLXCHkpF" +
+            "PrAJYBz1su7LtSBQIjzozgI5AJDWsQ7gTJxETTHuEh5yW8kR5+1fvQBT5PDdWgPokE6GSuK3Aaby" +
+            "2KwNyGFIZ8/NfexVMAGXEfe8MA5QTVdrgGe2M9evev6FMwiAYr308nVzcx/SgHwSlswyLgDLHU0K" +
+            "tX5UZwCwZsM1b7516J1333v/g2UAuJoCNMsmZkEDZBXujCoOIfVJxQKsvXnDshvWfrEcAV9RAoqY" +
+            "rfdvHjY06R3tVmtjzQYsQ8ByC/C1O0dEzqkAGqELbiZ1W/RvBr51Ad9ZgO8dQCkh4/q5xvMC6hot" +
+            "sBl7rP1QT+HHQz9RGoSHhkyMgqEBdNPFWSWMY+1nBPxy+MjvZ2aZxB9n/zz3FwKiOTZfotb3AhhF" +
+            "xSUUNmGSjX+vWvPPYacVWJOkUilUT05ymEVb0JFHj9l/AVn+35b/jsx6YzNz8mja+iAEH7rYDntY" +
+            "Gaz3dizW080KWaeICx77kiG7lTKG6EEoPb0Wu0lZ9OA5whFH8GxHQjOMQls5HSs5t/glHX2FYtT/" +
+            "mGAs/fCtFU0vQJUSQYfvIBvVyukuLhbjuood/H6WCbD/AQSFvIO3JDxgAAAAAElFTkSuQmCC"
+  },
+  "Yahoo": {
+    image: "data:image/png;base64," +
+           "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAJjUlEQVR4Xs1aa3BU5Rl+nu/sZnPZ" +
+           "sLvZAMVECgoFokUUBbnkAjNqa6W2XlqsWAE1Ee0P+8NO2z+1Y2dsx5nO9I5aBERxrDo6Vp2OZQrE" +
+           "hEvRqqOFqVy8IRZCdjeBkOxmz/eUTLM7Q4BzTkOn3Wf257tnvue9PPt871lms1mUHATh6fsPtv+q" +
+           "TxBBj1CDEoSQPa4dG4/B7/QAQig9iNj+XCrXHSi5pgSbh2L7oynBF1KpEZAI2n27eg6+PQh/kCVX" +
+           "AVrK2bI6Y6wB5FcsWKq0ZoAyPV25t17oY4DMEqi/PFRiLUR1buh2TzDIrAhobo2XEAFJyJuONT2C" +
+           "/GNhKsbm59yYNCWkPsC7m1Ld+60J1D/u3GXxSKUpFQIUCWx+JEMQQRBCyx21ggxKBl0fZHdvGghW" +
+           "LkxbXPG5KRGSJUOA2LImbXJCMLS0JsQS8UIChMF+27khLQTSn/gkM/OaGGEBhATQKxoUwMBHARQs" +
+           "uPhYAYD++kKq/wgI+pIlsGBlzCkjYACENv/uaLGIxecVTWwoiqZbE4ADBlXCreuPugMQzAhmxTRQ" +
+           "EnXJtdVjJ5YDAEGh/bEMZYgA2Sq3TctrIIAEEPrDfV0gIBRpnAJjJ19SVT+zggiEA2/2bVx1xFjH" +
+           "wwhYMhLPL7w1CQgghQ/fPvHhzqyBA9BXamd9rXLM+DIJLNhpQqdEnQLX6Xiie+nD9WAgG9yxLuNY" +
+           "B4DHURzpyltikWozfCpiy+9TcA38QdA235WkoEILhuBXs50be2960IYr6BeIbK9949kewfGMk3Vs" +
+           "c2uSAghBJ9LY9cyxgHM2YaYzbX61KAa/D/R3880/piH/yB3Pp3O9Xs0DSOCUpvK66RXicP63b+x2" +
+           "j9EEIqDGO2tgQBBgUAIAO9f2iNanOy061mYowROWWtQaK6oN89i6phvBEIpr/tLkyCEVXV/Xuvf1" +
+           "/iP7ct5G4KN3T3z8Ro6ghxQKjNXp0utqUAja/Xpv1+6gEn3l0jGRMSN12tTNDAt+GDQdT6QhSDqb" +
+           "De5YmzIu4YeFK+NO2AxLrrD50Qxkg/gfOWpprQEo6hQCzW0JerYtIcDseCrt5l2ejWCfdg4Nog9M" +
+           "xF14exLDYObT7HsvH2cwrzplYVldQ+XpFTZXfiMZqc3DCyRs70G881rP6VohUcKuF9PZNDybR4Iu" +
+           "XlKVrIsUxsluXZtGLti1lra5NcEzJyXKebcl/ESABuhc22t5hvqIbufQ+HoVkjCiPdkD4rBu53Ps" +
+           "XJ9iMDMWncDLliTOKLVGxKK7kjY8CB9wz2t9mYO502frsz3Z/dsG4OkCBDu+ITSjsZoQAEhvvpI+" +
+           "9kmQm7sELFwed8pwxmBDceyF5Q1XVwrysYxZs31jCiNAdK5LG9fQr4ZNQxIugAAFtD+aBhTAftKU" +
+           "uY0ras8WaERRWrxqKMKzByCwY31a7ilB+QFt39gjvyyGY+6CWxIFkjq0p3/v1uzwU32gi64dUzMx" +
+           "RAE8YwVAkA2Lq8dNc7zzQSC9D3vaeymhgL+9nBroIrxgBTNnaaw8YQoSrpPmx7GGgL+AEs1tMcCA" +
+           "BHjW1aIxbGwbQ/988KRdKzYVpI7H05LPj5eMbbkzUfQvA73a+XSvgAAf1X6BF7VUA/Jf7i741tiX" +
+           "ftQ92OvdzXrnpWPHj+ajtWFCR/Zn923NAd4+j5Pnh+q/WAkSgKRdL3YPDshUWO/+EUGoqS3pLVSF" +
+           "9wOC6D5136cdq09Q3nqiG36euPqecQCff+Cfm37a42sBbn9y7LybasACSYvgd7zhQMK/ApRpaR3b" +
+           "8dgHypNed0a77fFj16wan3e5Y0PG9woSnWBnL0mIJAowUuEqU/AFpAR6sPJdrxMg62aUT22O0HOO" +
+           "Ceez9wb37up7+0+pY4coz9MTZv7yeDhCjsiqQAnD5ydhRWJUMCM8w6JVNdZX28iT2t+5pgfyVl66" +
+           "4XzzilqSwyMvQLavO/fnX3f94voPf9Dw/v0X/OPBy99f13bo769lYAlJECQExinvyATZPH948e6e" +
+           "D7zu14LCVXSzUp7wxMVfLbvn2ckEIQmU3L880v3SA125jITiYlkAXdrJ8yO3rz7vvKnlIgiOpgIA" +
+           "HAdNrQnBCwQH+6zN+1g3O6QhCQoAREruhu988tx3u3OZEBEyEIZBAUb8qDP3s8UHPnqrjxp1C4Eg" +
+           "mm6rDUddPw6G3hyh2ummoSUOCgClVx4+vP3xAYqERihL8Rct12V+882Dfen8aAgUUV0bnn1zFUCM" +
+           "FgQA03hH3HEoAMLhA/2vPpSC6F1YgL0fD1EVBGiUBEAtunsc6GL0kBN1Fy5LgoAMgE2/Sak/RPg+" +
+           "U4La1/W4/YQ4SgICJs2qnDwvIgijxRU3VVfVOIUOxzsvH1exNr4DljYH3uodfQUISmq+N0GY0XFw" +
+           "TWHzA1Doy9j0wbwJRIAEKR7eNzj6GQBA8vLraqrOzwP8zzfNmjSnfNJl0cJ32d+bM9YgOCCbA3gO" +
+           "BAA45WpcWTOqZblpao2RAgFARFV1xNIiOMDoeCOcGwECzSuSKHcthOAAK8a5c29IQiiiMs5kfTh4" +
+           "Aa0ZnHxpFOdIQDBjJpTN/nqUACAExrxvx0Ll5pR+MJh5fTRYCUSYCxsrknVlAM+JACAjtdydBIXA" +
+           "UDjfsjLBkYR11b3JcIVVAAmCca/7fq0g6lxbiCCnzInWzw4rGAkBDVdVjrugErRF2gQJ1k6KLPlJ" +
+           "jShBOlvvQAIa761qWBQDgw+xJ0i0tCUAAS78oKHlfQ0owYxoAAJX3zP+qu9FYexZyNNSc1ZGlj40" +
+           "EURwGPhh7s2x8vGgT6QEJCabmdfEz2hiRcLoxh+f3/ZsXe10WAyXovBhfIq7Yv345b+dxDAgIjBC" +
+           "8AZtqDxcNyO8/7CXdRZIoOnOGI2XOwIx6yuxmV+K7d12/P3O4+lPcgDi9eEvzK+eOj8aKmMx+r9H" +
+           "QObw3r59r2cJA3hSiNrGZbWkz5/cSDoOpjVVzWisUrGqHL1r8fnTn6Bn7v90yy99dsiCrlhWuXLN" +
+           "RIL438LAEwO97vYnewj5qndza2H5WlIEtj2TyqUc35PVX+pcMGcMpRIiIEgW7aszvlbCAk1tcQOV" +
+           "VgUo7GnPHNqdJ+h9+oqknXtjshBVQi3EzaszxvoskAnMvTVWXu1ABEuphY5+nH3v1RO+C2Q5+Za7" +
+           "aiCCKJUWEgBpy5pu5UhPtydoekvlhKkRUUDJtBClwQF1rs1ABLzfb/Pk+AoGKCUCIHY8l+o/Yvxe" +
+           "eyHxecz6coIAwBIiYMX2R9K+SSW4YOitNUAQ/zf8C4sZTcVG5HPrAAAAAElFTkSuQmCC"
+  },
+  "Bing": {
+    image: "data:image/png;base64," +
+           "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAACslBMVEX+sgf9vwj+uQj+wwn+uQn+" +
+           "wwj/rgf+xAn+sgb+rgb9wAj9wwn9wwj9vgj+uAj+swf9wAlQUFD+wAn+xAj+ughQUE/+wQn9wglQ" +
+           "T1D9vAj9sgf9sQf+sQdPUE/9uwj+twj9vwn9wQn/uQn9ugj9uQj+rgf+vAlPT1D9sgb9wQj+rQb9" +
+           "vQj+wAj+sAf+rwb9uAhPUFD9tAf9swf+ugn+rQf+tQf9vgn9sQb+tAf+wgn+vQn+uwj9twf9tgf+" +
+           "sAb9vQn+sQZQT09RUE/+wghPT0/+uwn+vAj9xAj9uwl8aj39tQf9wgj+uAlTUk7EkR//rgZ8bD10" +
+           "ZED+tghnXUZXVEz+vghVUk1cV0r6qwjuuQ+ugij+tQiogir9rQf+vwjlpBGHbzj7sAhbVUtkW0do" +
+           "XUX7rAhzY0HhohJdWUp8bT3anRZdWEp8aD18aT1dV0r2rQrKnh23iiT8vwnRmRnyuQ3ZqBeBazv3" +
+           "uwvqpw/6sAi2iSXSmRneoBSkhi3wqgxmXEbcnxSNcja+lyKVfDOdey/rpw5eWEn+vQjzqwt8az3o" +
+           "pg/+vgm7jCK2iST8sQfFkh5rX0RiW0iCbDr3rgl9aTxoYEblrhKthChvZEL+twdyZ0GGczn+tgfn" +
+           "pRCQdDRSUU9+ajzYnBaOczX0vA2agTFUUk5iWkiNdTf6tgrztg2khy1YVUyjfyz2rQmdeS/9sAf3" +
+           "sAquiCmDbDqvgyiogSq4iCRiWkfJlB29iyLCjSBpXUVXVE34rgn+uAd/bTyEbDmbeDBxYkGIdDno" +
+           "qxG0hiVrYUTOoRzRlRlkWkdZVEz9uQfPlxrzpwuMcDaNcTbspA7goROqgirAjCDfoBNvYULTlhic" +
+           "ey/pog98Zz2zhSZZVUxVUk6SczTvpQ30rAvdnBRtYEPYmRf9tgj9ugf+rwf/rQfADIlEAAAE5ElE" +
+           "QVR4Xo3XY7fkShgF4GKIpo1j22ds29a1bdu2bdu2bf+PW0ljJp0J9rdeq/dTb1VqpVcDrpMU9ZAo" +
+           "zwedAlVU/uYiMob5SjD2CkDYjow6Qk2juFZP9HkFav1+CSvV/gW9AHgDIEyQRQwg6BJMy22K1V6Q" +
+           "9AhAOMdYHyVGaXV4uEBgbW8AhFm9T/o7aChUBjomWN0rAOE81kdkqDr93MJNAHgHIAwXixpqivGV" +
+           "RDWj6BWAaj8pktkFWSmvPrPESt4BCFWkIbIFV45Oyfpahl2AYyW/+fqQMTlUeXIJn15xBvzLbjzt" +
+           "uKOl2vUh2ajMG5HbewFwB4LLArOmX3XOkSf4YTCfQOE8VvTdK/LqQZDyCOiJrLrlbHZ9xuTy8njL" +
+           "oPHgvAMsh2Rnx6i++xDumGyxNt0BP6Z6nUZfA/Z90GYLHGicvVxoAI4RHQG6sAQEZ6DLAcB43Afc" +
+           "krYH9HvjHq3PDMC9hzgCvISUhhCpARBKB1WBwwWQOmIYpF2AYjhWCKMKAGGrvC8Atl191HmCGyDx" +
+           "eAwRHZBaFV4xAacEAjOWf/VNSnACoIypP4yiPI7xPKYmILU8o1srvz/mJAeArcvPbIpSHvOUFi7a" +
+           "FxCWGEAmHl9795LfBZstQGy8pvmQjBeWkoftC4DtuwLVZNYcf9mJ+wWkVqowA+NR9r4BZgCcnAnU" +
+           "Eg/M2LPp1JRlC1DClAFyPgsEUA9cc74B1IxZkTO2mgDEzkCWeSq3N8gyHEnWA+DZeKAuB5sAqMZo" +
+           "CGN1sBuHZDpTswCnr3IGFiqUKrFu0NIxNyTzIbp6fh0gnHnW4kDcHqAKjTb1l4DQwTOAxXQPyrn4" +
+           "3J97bAGpMBURhHxCB7UDWC684f4eG2B2GKpNiOSANhSTQzaAsP3SndNtABSW9N+fRF8OoamjWNkP" +
+           "kLz8iisztlsoMoAFfpwrEg2xC20BUp8sj0QCrgDUGFBcRMarL5T4Lh0QknddG2HPwA1ggjqvQdPf" +
+           "LPMr/euu94Hh5JfbIgFzMosP2C8gxSAEvhwhZaD55vW09dbbbr8jUJfInUbfCvhjrf4pothVvonN" +
+           "r9+D6fp778uY2/GenUtSgh2A4RSO5VB9mQceJA89/Ii5zdg1jz7GKnYAX+isAJHHn3jyqbUBy/RP" +
+           "bx0GToBSBjKRZ3Y/93xzc127eeULKQAcAd4n6sDiF196uad+9VmvbHoVABcglG3kuIE33nxrunX6" +
+           "t9/xCUk3gJdSHCe+O8Paf+99KMFEt88NCDaInDjwwYfm7cc/2rAuPdEOWdobFoAWJwB2sk1wn34W" +
+           "2Qv0RD7/QuSWip0r5hmGWppMOgDdIgPEga931IBvv2tr4/SI6Y0o3KTqSHbCZwfALn0ErvGHH+PG" +
+           "8jt+2q3PVBa6wGA36p+jQj/MJ7p708kWCxCEk+XlBjZv+IX9LP76m/GxRkwDvTmkkfHqgbQIFkAV" +
+           "K4WBP/7c85fImdIoTgGgL4eKCIUTKszDodKkGWDCYFUQ121u4+rTJqaB4FuhIYKIYeTrgWC7uJRz" +
+           "ChuC5W/N+AuCxqdaANjnDLCznAbAtORGjegEsQIJ0RkwzlLPSE6fwgpA0OgqdBmEMJIjFoAJ/4ic" +
+           "W9oqQwDfCisQzKcbXQWRnWUlVgA26CO4byNtAzDhXwZ42YYdIE38xwCPQ1gBFtjFAI9D/A+btEBN" +
+           "Oyr4fwAAAABJRU5ErkJggg=="
+  },
+  "Ecosia": {
+    image: "data:image/png;base64," +
+           "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAN9klEQVR4XuVbCVQUV9Z+1SvVQAPN" +
+           "urQgiAiouCcY3BOjOCExjkuCGDWa/DHbjOPEjEuMSeY3GZ2YxTgmkkTNoAbJuBJ1EgUNUXFwRdki" +
+           "myzNYjcNNN1N71PfOXlnQIVuZmjhHMrTx+9offd+71a9V7fufcXYbDbSnw9ebzit17fJDpdXz+y3" +
+           "AfjgSsHqRadzvr2t0Qb2uwCYrFb+7uLy51vNZo+P84p/1+8CcE2pHtZkNPkCZ9xWPNEd7tGKmsdH" +
+           "pZ+8wNmI7nMBuHKncdifL+e/oWwzeHRFqNBoQyku07RGOHjX8JadubjtqZPZJ6+pmuJUbUafPheA" +
+           "W82tEW/l3tgc/e3xgpx65ejOCAz3h2KrzTH/L57N3fZ1UfmroIPny4rv9LkADPF0/wWAuwOCnjyR" +
+           "fUxtMLrfjzDIw62EYh8X+wM5UlE9g1szVlCOr4tYEeMlLe5zARjh7VnwiL9PJvAdLggphaXP348Q" +
+           "y503wFVSCjzax+uyPbsfXS9eSa88jleGDf5UwOPZ+lwAGIYhBx5/JClW5pELwrk6Zfz9CHzuvLWj" +
+           "Y94DThocurcrm2arlTlfr5xIucNkHpdXj4zeSnrwEPSksWBXSX3ub2eMT71VMV9vtkg6ndMxg/bo" +
+           "zGZxcuTAA13ZazWZWZPVJgGWu7KlR2ZOnM0K+Kae1OxoKoyrQbgzGSFuvwd0WKw2xnv3QUViaFDG" +
+           "lvEj/xQgYVX2OFzg+UIeY8U06dEAnFU0xE09mpnNLUA3lkcP2snNxZ1cMKyOcG1mE89Y9HOc8UbW" +
+           "VFPppbFmxS+RVnVtkM2gcwOBEUtaeV6BCkFQ5C/CQWMviYZPzRJFTchhBEKH7Ku4R+97l/PXppdW" +
+           "zVPo9AN/eGLKlOnygJ96NAAWm40ZnnbiSmFTy0gQpgX5HT82a9IciUBg6HQO15aEaI9ve6Ute98i" +
+           "a4uyW2kvT+pT6zIx6e+us17bLgiMqOyMUKPV+U04fDqbyy8iwRvs4Zafv2DWCO7iWHo0AADXVero" +
+           "R49lneYSkUAQXoqJ+HjHpLEr7wmWqsZPs2/du/qzqc8Tq0XY0SNj5vuGlvF9QioZibQFBJuuRWpR" +
+           "VoZY7twOJzaboGMk+CZ2cvLX7kn/v4HvHdxwt69nT53f9W1J5RLgUDfJre9nTf7NUJnHLYcHhQB0" +
+           "51ep0QYszczZ4f31PxTinWktJoulA0f745cLa5OkKsXTxEZ/tYtkdU2fr/hIf/n7aRZtk6Qz2/g/" +
+           "nINzwWlvAzZh+26O766DFeGpRwvXXby+rtlglHR3PP9TPUBvNvNYgcAKbDO2CZv/9sJ2/U+pL1AC" +
+           "z1te5jZv/buSKc/tY0RsN1Zv2NMLdWe+SWpN//MGq6o6nBLYSckpHi+nvMKIXExOfgo4Dqx6jUS9" +
+           "KfGgMf/sDIKD4Zlcn1r1vvuCjZsYscTQboUW/Vx3J+5SQ+O4spbW8EaD0Qt8mVikDpe6lY31k+VO" +
+           "CPDNYQV8I+VwC6VYk7ZxrfbIh2uIzSqEHdHQyf/0WntsDo911/V6AHDlG9+beYwOnnH3rvNalTZX" +
+           "HPvoOUrQthUPP1Z+4bXP8jXz6vSMZ6nWG67va89NIGiaEy4/8PvYIZ+M8vEqoDYMeafj1R8u+M6m" +
+           "UQXQIMjeOpmIO6FXA9D08aKd9LbnyYLKvd/JfFQQPKScVn4Kar/4q9SatphhCA8EuEv8eQmpbZPa" +
+           "TQOSIkJ3b40ftdqfdWkE11xTHKZ6e9ppa6MijE4Hz9///cVeS4V1p75aiMHTK08HT/OG2AMnrrfp" +
+           "M5Zi8G0WPils8SVv5iU4MngA/r6S28tgA7ZAgG34gC8Q4BsaeiUAeNS17PrDp3TO47angy9UXk2Y" +
+           "8X1WZoPeIE+viiWrryeQiZkrSPLFZ8nphsEd7Ih5JjLNr4SM9arixNyb98DG4xlnMrkaYgINAnzB" +
+           "J/jQAC0PfAo0bVvyuT5rz/8Bu85+413pc5vfBq7VFMRV1L2aueraDPaCKrRLG8M9asmWEceJr1hL" +
+           "cCgNEpJ9J4ybHu7EU9hGAlw0JIDVEH+xhrACRj/Af/u0UI8hOeC2fLP6He3hLRuA2amLv/B8bfdL" +
+           "D+xlCBkekhz6qMNqD6w1tsgOF29PP1U7ni3XenXKnx2UT3LVcrJk4GU6eBzER6wjT8vzO6Oxt+vX" +
+           "pXu47B7hKXZrhE999v5kPCKhxW3u+k3IGB/IFEB6SzM8POfpo+7Fn/I3v3xpovxgzXBS18U8Twgs" +
+           "IunjU8kk37Ju+XXjK+Q3FCmbgeETvoGhBZqcvgbQFxvk9sCMm6weSQ7wVaU6hlu0ltjjB7PNxFus" +
+           "I2K+hfCY7gvmmw4tqWypiQGGb2gAhiZoc3oA8FZHX2zY+AX7aYaHEjf02eOvicoiYa5qUsFNkUPV" +
+           "Q4nJ2j0JLnwzv1r9HXwR+IYGYGiCNqcHAK+0FIvHPXGMZngHy6rnO3L1R3opAEmoRE0KNX5k7vlk" +
+           "ckwRjQKpw4eh7cf5bWaziGpor83pAcD7PH2rE0XF5wAiveUaHZ72Bv/FmIOE5Zt/pRPyJ+5uWMwt" +
+           "hDeaA8hfiqY4rMFD0OhZ21oUBwwN0EK1OT0AKGYA4JWWJ/HQAV9XNoyzx3sz6gwJZDUdnTOEzJHn" +
+           "k7XRWWRN9Jlu6TAYC+CTQAO0UG1ODwAqOQB4n6eEJ/x/CH8r5hRhuyjXydnm7r9n2FCKY+4fAJMi" +
+           "HIBqodqcHgBaxkIx4z9Km2Wzgwu4K5nZKa9a79G9NNssJCuvJZKFXPZosd0bBCFplAFQLVRbr5TF" +
+           "eYwNgCQEFJN58rz7prSfl8YRJEdGB1b9ghY/knTxGZKtDCMlrT7kUqOc4PimYhR5++ZjpJULjpBn" +
+           "YXqlL4ACJi1jUQKfJ1UTurBxc3n/+H0kRKK+a1D+3Iq/iEzKXIGBdOljT8UYUqXzIvQ4WTeEVGg9" +
+           "yae3JpCM2hiyq3wcEfLdmkCgWqg2pwcA1VsA1PAoQSgILu3Q/nJtJDKR7r58k41Ptt2KJyoDe1/7" +
+           "p+ojyNmG8A6cDEUUefXKbGL7tYZQ1iojIkFQGTDVQrU5PQAoXQOggGnVNUuAJeKoS+0JuY1ycq0p" +
+           "uPOFlHNbrpXdY/tyYzBZkzcTQbr7/A71g0FuKuIqjsoFhgZoodqcHgDU7QFQvTUWnYsD9JIMv8Aw" +
+           "Li3AzSYxSSl/yK4dmUh/j+2M2igM1i63XDeg2Y0deR4YGqCFanN6ANC0oNiQm5EIwOeJjB6S+CPN" +
+           "RheyMOdZckUtt2snRNJ0V+eJIXlNgYTlG+1zPePS+DyxgWpor83pAUDHBk0LYP25tGdRvQX2kSam" +
+           "vFf4qMXBag/RmoUdBr8xfzoZ7K4kC0Ou2qNaUC+klWNooI0UaHN6ANCuQscG2Nba6I/SNbBU8lB2" +
+           "oHTabkft5KoHUEj2Vo4iJ+qiiM4sIodqhnXJQ52QFkvhGxqAoQnaHkgegHYVOjbAqNujdA2MAqYf" +
+           "K662bwF5wcOkWiclx2uHkB0l4wmOc6qBRGV07ZQD2/BBy+XwTbtH0NQnSmIoYKKGZ7RaWdKDh4jH" +
+           "03NNz2mTg/wcKYk5PxNEr45hpY3AaFqgbg8MgWnTH/ktBPfk4GGTDh6+4BMYGqDlgVeF0aiULt36" +
+           "OjA6NmhaoG4Pwuww+QlcLfvTwT6ADdiCTdobgC/aJYIGaOmVvoDksWV70ZwARscGTQsIpHdC3vyE" +
+           "Edyi9RVWbtL9wwIubMBW+8YIfNHGCDT06h4hNCrRpgJGx0a5Nv48nQ7o6Ox9bPzyK3NnxD4XOXAn" +
+           "2l727OEcnAsOuLBBb3vYhg/aGoPvzuw4rT0ObDBb+Gdr6uNSi8vngWPRtUiU6yefpK1sxRyesXnP" +
+           "G+9Y27Ti9jydySz6oap20qbL+auWZ13cPudk9j78gPFv+D+c054DG7AFm9Q+fMEnWvMpBSWLDpVV" +
+           "zVK3GVz/m7F0m/BVYWmS/+5DlWTHflts2vF/UY7VoBeqP0re2b6nX7dcXtr6z88XWw06YXf9gAMu" +
+           "bLS3CR/wRTlBew6XQYv7l+mqXYWlzzg1AB9eK1zBObPCIf7+9tbtp8DpzQ0Se4rK5rfXtOPmrcXO" +
+           "2CCBTq/XwNSjVW0Wq6uAYYybHo794xsjo7eB0JtbZAC23fhl+R/OX/3MbLOJ3YQCdVXykyGeYlFr" +
+           "jyZCOfXKUe9fKVwzVCbNfy4yLDXKS1pKCb25SYqCAnVzxJeFZcuK1C0xG8cN2/CQn/d1J2WCji+u" +
+           "DMM4cZucfdArAeCuQPiyM/9KmRkSePKtMUO39JTd9NLKJzdeurlxZeyQvy6LCt+H4Pa1DybwLUDw" +
+           "5KOnf+L2906zWK1CB3afMh9cLXjdaLHy7eYbImFzgbpl1Atnc/dyv0/65BcjS7MuftmgNwQDR3ra" +
+           "39K+Na/4tTUX8z7Zcq1wpT3bU4L8fx7gJikD/qqo7PWM2zXT+1QALtQpR59RNMz8NZtrTggJ/KEr" +
+           "gsFi4W++WrgG+G/5JS/bm4oiPs+yfcKYlzjBZnC4zZHP9KUAoD84keINY4eu9xKLNF0RztcpH1YZ" +
+           "jAHACp0+rFqrt7vNJXFg8I9pj8c/7eMiVlS16uR9KgAakxkruu314ZEfrBoR9Zk9wo3G5tiOW+NN" +
+           "no74mRs+ION2cmL41kdGrepT3wtMDPTNzkiYNP03oUGnHdzhLWvPZwUCjaO+sEF7jK/sZp8KgKPb" +
+           "0ynwZcXKdiu8klvg6vrNl6MAU4P8szBlgJ8Ok3/HZxhbvwoAtrTPHBBwhOXzNetGx7zfr74dpmDH" +
+           "pHGv7Hts/IIID/fK3tLQ7z+f/zdtBQxrg2hCXQAAAABJRU5ErkJggg=="
+  },
+  "Ekoru": {
+    image: "data:image/png;base64," +
+           "iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAACplBMVEVCrUIApdYYrbUhrbVzvUJ1" +
+           "wUaBxj8Apc4AnNpHskcApd7O7/f///8praRovUc3s4dCtYRKuXuMyDxuwFWHyU1WvWtnv2lUvXUI" +
+           "pcYAnM4InM4Ipc4Qpb0QrcYQrb0IpdZKtUoYrb1dwNuUzjmczjmUzkKl3ufG7+9St0TO9/fn9/f3" +
+           "//8trZRjwWMYpa0InMYhraQQpcZzvTl7vTlGuIdKtVJSuVIMnNpLuGmMzkJauVZhwFghrb0ttb0Y" +
+           "n9Mcps4mq881scpBtsI8sNZHt9BOvc4xsKJoxdNrxt5zxt6E0uK11jE8sp95w1Jctz+czkKUzkqM" +
+           "zoyl1qXG58aM1udjvT2p4uu95+9avUrG7/fO7+9rxmd/x2Te7/f39/d4xXCDyYeMztYApcbv9+/W" +
+           "79YQpa9GtT0rq9ilzkqUzlKUzmsIrcat2JGczpyt2Jyt2qW93q233re93r3O58pSvWOIyliU1t6U" +
+           "1uec1udSrUpMut613ue15+dcv8zG5+fG5+8ArecIpd4QpdoIstt3zNfW587n7+fe79Z3zORjtUoQ" +
+           "nM4Qpc7v9/f3//elzjmUxkKc2toYra1SvUoYpd4Ard6t5++15+8YpcbW7+/e78a33qet1jnO571S" +
+           "tTne797v9+ec0I6MzpQIlM4Ypb2t1lKg3uJrvTkhta2UzlqUznuczmMprb295+ex1mcIrc4InL2U" +
+           "zpQYnN7O5++l1oiE0taUzpwAlNYQrc6czkrW9/etzjGt1jGt27re9/e93ojn9+cArdYAnOcKqrpf" +
+           "v46957XL57e13sa93sal1mul1jkApefW786t1krW796UzozW7/e11kqcznu11jlrxka11lLn79a9" +
+           "584hnL3G584AlN6t1kLG797v9/8htb2lzmeM1tb///eg1q3q6+s+AAAJxklEQVR4XoWXY5NsSxqF" +
+           "K7dVtG00bds2jm3bNi5t2zbGtuefzJt7V+OeqohZ1dHR/WE9+SpRqmi2RDGeQ+JkNIfuzwJM5rZj" +
+           "gpiLcQ9AXLKL45GRzsDhxsbG5sOBzoNHZWwOhCrX6mI00tlSf8WLOI5D8OG83vrmwIGoiBFZgKzc" +
+           "pyKBDVewFSGWZZEiIDkaOsZEOYjcgEnFHh1pOY29SFCcCoITBGRH3J1ABCNyApTlowdanEjgBMQi" +
+           "zs7abC6QzWZjZRJEJZwOjOOGZAOUGo0dvgzL2WFR27q8VEpn3Quq0OtT6nX5GCAAecNBcSVBtdI/" +
+           "Uq9E7XSpdebqiYlYjAepeD42sVendkFFcGKnO6IrCqFa9k9dLBfwGm/k6dLVfdjrKy0DlZYe4lXr" +
+           "fVXmtnVKPbiW+5cJquX1O8oF3DeXtlrTx6t8VQvbdg+vBZ0b3jU4X+Xj+TJ9ygW1AW1YJqiW/J0O" +
+           "XCR7gZme4PnShd1rpJVaM/yUBRC6PMQh+GmJxsUMINM/8QBeX3C2pak+3rew9j9SluaG53lfhdqG" +
+           "7E6OC0xlCKpMAPfV49a5eoxUTGXZc03KqWvDab5M68IxnOqCqZcBygBED0PvkT0Fft+bXyxbrs4e" +
+           "P378wURyEXH+TV9VyToBCPVjSjNVsl/sOi0ILCqopmJlQ3OL5lffba19pQb0z6azRxKZPHZXlenX" +
+           "4UI0K2VQyQmMb8Aj8oyZjvGL/tl3m0iCIEmSAPn9/qazJ5JKGmW39S6EkPeinIRK7sBFL/jzS4yX" +
+           "fE8p/qv7a8FHYj9J1PgxwV/TPiWj/3KoqoQAQsN9cQxYCgAVGGnVvNK8qWNuD4mlxnrhBUABw1O7" +
+           "/yom7C6d0NmgZwERCCo5gFMnEXJZoQBrZf/RJsJPki+0legtM6B5i7VETfoJwuM/NosJQ2XVKQdC" +
+           "dWMZQFQOIGXU8Ntk/6u1hJ8ge8wzA/3910OgYKhyxtpDEh6Pv/VBXIfB2N48xJ7CIWDAAe8ZhBxW" +
+           "+lLZeew/3gR29TcmbO0PZdT/4T4rROF3N2LC4+kJnROdrB+XAWJAuItQXjXFL8j1a4Xwe6YHwGsw" +
+           "MHRxMcMY+kPB/tANS5vf4/G04oZ+OmHO4wRvVzwOgGjDSQF5tcyobw8GrAK/dh8OnKF7eze/9NJM" +
+           "L00xBpyJUe0miMJ2vDUsE1qnHbWIGBA5DQCb2dCXxi18sJYgtTPXP+5nqN6tF9bgjNec295LMTeA" +
+           "kC7wEO7CI0DYdcnsgjKOY0C7AD0gjTdigxLoLFHTNh0MhRjqnSekJT2xvbfIEA5XWkmP3/1KAodQ" +
+           "XYDQqREAiC1QAlZNF/NDYEg0+knrQChEax5OSit1YYYyGMImnZvwuFbhVlZpEfoqAIBo3ckziNXS" +
+           "Gt85MBzxE21QAAP1zr078onfUpX9wTTpcRc+ACGsrdbbWKEZunD/5ZNfIqeOnjh0AWdAkiUDoTDV" +
+           "C/Hfo/MzVGXQpAOA7SbkkDa72K/qTqjiEQeUwKmnYqWPQw+bCPU0BKDZLmXrW01xMGy55XazLTDS" +
+           "C1V5SHCMq+IjXrkJRT48RrO1ZA9kwPQCDAQdOH9+bulY20wZwjMp9we2B2Cadkyk4M47qop3obsA" +
+           "2EsdkgGvECXhUKhoZk62X9j6k5c3P7kbyLL20IzBpHW73baDkjQ8oeW48ucw4AwCQFHMB6u+Td6y" +
+           "hkPXi7bKhu+efeSRjc9ufHHhT5kQoAo3rB4gBJLSeYvOznn34xQwwAyAtQoAZpjaiQ0P/eYXr33+" +
+           "2saNv/tw/pcK4clRU6UFAB4owpppHYu8EMH+8kXALgD4MSBIP4oNn//hoWvS3M9f6+7+MHPObB9l" +
+           "DBhgg1mam9evFjBgrPxnGED14UGarSH0YZgCGfDQH5UR2vjJT+d/kAE7MgD2gVnp2rzeJnjH8CAJ" +
+           "AgbE+HlcRA+MQZD6buV98K/uT/Y9Jc/lTg1jmJYBcLr9qsImOKGNkxswwEpN8JaklGzy40EsfvhH" +
+           "AMjhm7kVgELWOS5JgxU2dBkA8VbhLuvQ9VLrcR9XeQgLbP3Ncytm+MXuj//Wk5BT6GMGrMTXhTbX" +
+           "CRkgNEwCQD6SUxpNDJ8HJ2r8WlOwEqq4pJ3B7u5NPfJxuhVqUOJxnXHiSVqocAot4uJ5UFD9+1js" +
+           "PUlKtnsKpoNBw74LS1vgxf7r3ZZjSXkORhmmZ0vhGbZ+FnfBIcBuzJypLjOlWW+BHThVS2hNoWDl" +
+           "vm+VLC68HLp+fVPJTcx63EiZjAWsm2UbEnAi6GCOMEAMINgVOtr0mLyhb9aQ1k0QA7P54Uf37Hxn" +
+           "IAx+a1NCko+hYpOZeL3wdbYVJjGtFa4cxQCYRSSwKSMcim9CCFfP+tUWaGU4bDDduAFnU2jA2nZE" +
+           "bsdCH2PSuWwfOFe3J6Vze9XchkkAyDkglGehNHwV3jaJdpkQDikKz1jbVslTsNZIGYwFhZ4tbH5E" +
+           "kr7f+2euIy4DxA4OZlFP0zEcAo6hhiyZGcDmgU1wo9Sukltw7UkNw1hdq1ezuIb/eK+i8PQYBoAi" +
+           "dzh8MdCXeOVkTx5p8qv1lulpuNPayKbnkpISAG0wpraAH5dgdkHLNYsZgBjgOHyqUbHF2zXxbm0N" +
+           "3I5wM9eums3s5QUNY9K7PBgQkZJ/t+aV74+LMAdKCAKHnkkXaXjfECQhI179d3vrsbORxOLzZhuM" +
+           "cXUBuwX89Qnps+/1TvmJAQAlBMSilIa+zVftzv082nGJMdBaG8t+ybIXpavif1N1kbgCwBqrRxyb" +
+           "r9XQPlXZnlz+oZiRYfRfy8/3hkTyo+PfPNOFn7yLALHTLnCCUwc7gq8azvKvGYxRxcXmPCQDDkqf" +
+           "xafaR0SwKW8krGizwLHoDT1NXeJLt93zyNxliT0P/lssbiFqTCZgbRH7lWeeEsJYPYcEzqU30hBE" +
+           "escXS+5zQ5ZYn7GYtuax7GpYv/7tRFxRBjCZIXQ5IQmhUGekqNHH+KrBoR9Anw5afHxMw9BGPfhx" +
+           "/JcPXv1o2a+8VDOEDq8gQAwps+b55zW3fbwPxPPrY30UXZzWusBtRw5HV2LZv/KxDYoGyjmEkBNe" +
+           "+xoNVUSNjvaNauCvYli+wMauRo6n3y/v/LW46J/MAFYSHPi1JTjztPo0TVG0IrO2wAnR2x3vOy53" +
+           "isv+rC8cOIsrwldQCc7uIlPaCrPZatZr1eucCNntDke+o2Eky48BKwlddWDn7Ahxdnt+vi0/34EU" +
+           "99OgxgjY7/ED4MeESEs553DYQQ744F8OB2De/+vTdR3j8Sx/1tc+KERXcx3orbfuLAv+bzh2n5jL" +
+           "D4B7CdCesciBrs6OTvxzsbOza+TA2Pjksj33F08ljf+nbH/0f+C6zXUwzYSLAAAAAElFTkSuQmCC"
+  }
+};
--- a/application/palemoon/config/version.txt
+++ b/application/palemoon/config/version.txt
@ -1 +1 @@
-28.10.3a1
+28.10.4a1
--- a/application/palemoon/themes/shared/newtab/newTab.css.inc
+++ b/application/palemoon/themes/shared/newtab/newTab.css.inc
@ -9,7 +9,7 @@
 }

 body {
-  background: linear-gradient(to top,#DFF3FF,#F9F9F9) fixed;
+  background: #ececec;
 }

 /* SCROLLBOX */
@ -106,7 +106,7 @@ body {

 .newtab-site:hover,
 .newtab-site[dragged] {
-  box-shadow: 0 3px 6px 1px rgba(8,20,37,.6);
+  box-shadow: 0 2px 4px 0px rgba(37,37,37,.2);
 }

 .newtab-site[dragged] {
@ -125,8 +125,8 @@ body {
 /* TITLES */
 .newtab-title {
  padding: 0 8px 1px;
-  background-color: rgba(248,249,251,.95);
-  color: #1f364c;
+  background-color: rgba(229,229,229,.95);
+  color: black;
  line-height: 24px;
 }

--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@ -8,11 +8,7 @@ EXPORTS += [
    'pixman.h',
 ]

-# Apple's arm assembler doesn't support the same syntax as
-# the standard GNU assembler, so use the C fallback paths for now.
-# This may be fixable if clang's ARM/iOS assembler improves into a
-# viable solution in the future.
-if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']:
+if CONFIG['GNU_CC']:
    if CONFIG['HAVE_ARM_NEON']:
        SOURCES += [
            'pixman-arm-neon-asm-bilinear.S',
@ -94,16 +90,11 @@ if '86' in CONFIG['OS_TEST']:
 elif 'ppc' in CONFIG['OS_TEST']:
    if CONFIG['GNU_CC']:
        use_vmx = True
-# Apple's arm assembler doesn't support the same syntax as
-# the standard GNU assembler, so use the C fallback paths for now.
-# This may be fixable if clang's ARM/iOS assembler improves into a
-# viable solution in the future.
 elif 'arm' in CONFIG['OS_TEST']:
-    if CONFIG['OS_ARCH'] != 'Darwin':
-        if CONFIG['HAVE_ARM_SIMD']:
-            use_arm_simd_gcc = True
-        if CONFIG['HAVE_ARM_NEON']:
-            use_arm_neon_gcc = True
+    if CONFIG['HAVE_ARM_SIMD']:
+        use_arm_simd_gcc = True
+    if CONFIG['HAVE_ARM_NEON']:
+        use_arm_neon_gcc = True

 if use_mmx:
    DEFINES['USE_MMX'] = True
--- a/toolkit/content/logopage.xhtml
+++ b/toolkit/content/logopage.xhtml
@ -13,8 +13,8 @@
  <title></title>
  <style type="text/css">
  body {
-    background: Menu;
-    color: MenuText;
+    background: rgb(229,229,229);
+    color: black;
  }
  
  img {
@ -27,6 +27,13 @@
    left: 0;
    opacity: 0.2;
  }
+  
+  @media(-moz-dark-theme) {
+    body {
+      background: #2E3B41;
+      color: #eee;
+    }
+  }
  </style>
 </head>
 @ -1 +1 @@
 .10.3a1
 .10.4a1