16 files changed, 297 insertions, 0 deletions
diff --git a/browser/themes/addons/alpenglow/background-gradient-dark.svg b/browser/themes/addons/alpenglow/background-gradient-dark.svg
new file mode 100644
index 0000000000..6ab26b42d5
--- /dev/null
+++ b/browser/themes/addons/alpenglow/background-gradient-dark.svg
@@ -0,0 +1,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/. -->
+<svg width="72" height="144" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="0%" x2="50%" y2="50%" id="a"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#291D4F" offset="100%"/></linearGradient></defs><path fill="url(#a)" d="M0 0h72v144H0z" fill-rule="evenodd"/></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-gradient.svg b/browser/themes/addons/alpenglow/background-gradient.svg
new file mode 100644
index 0000000000..a0b54a46ad
--- /dev/null
+++ b/browser/themes/addons/alpenglow/background-gradient.svg
@@ -0,0 +1,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/. -->
+<svg width="72" height="144" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="-18.096%" x2="50%" y2="50%" id="a"><stop stop-color="#FF6BBA" offset="0%"/><stop stop-color="#FFC999" offset="100%"/></linearGradient></defs><path fill="url(#a)" d="M0 0h72v144H0z" fill-rule="evenodd"/></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-left-dark.svg b/browser/themes/addons/alpenglow/background-noodles-left-dark.svg
new file mode 100644
index 0000000000..40d99a78b6
--- /dev/null
+++ b/browser/themes/addons/alpenglow/background-noodles-left-dark.svg
@@ -0,0 +1,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/. -->
+<svg width="160" height="144" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="9.5%" x2="79.211%" y2="21.548%" id="c"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="62.978%" y2="75.109%" id="d"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#321C64" offset="100%"/></linearGradient><linearGradient x1="41.797%" y1="-6.305%" x2="113.914%" y2="120.857%" id="e"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#5F2ECA" offset="64.418%"/><stop stop-color="#7542E5" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="35.625%" y1="-6.728%" x2="75.087%" y2="128.478%" id="f"><stop stop-color="#2B1753" offset="0%"/><stop stop-color="#7033CA" offset="35.304%"/><stop stop-color="#FF4AD9" offset="73.362%"/><stop stop-color="#FF778E" offset="100%"/><stop stop-color="#FF778E" offset="100%"/></linearGradient><linearGradient x1="51.531%" y1="102.377%" x2="34.091%" y2="-21.792%" id="g"><stop stop-color="#FC4CA0" offset="0%"/><stop stop-color="#FFA769" offset="100%"/></linearGradient><linearGradient x1="0%" y1="0%" x2="0%" y2="100%" id="a"><stop stop-color="#fff" offset="60%"/><stop stop-color="#fff" stop-opacity="0" offset="100%"/></linearGradient><mask id="b" x="0" y="0" width="100%" height="100%"><rect width="100%" height="100%" fill="url(#a)"/></mask></defs><g mask="url(#b)"><path fill="url(#c)" filter="url(#b)" d="M0 0h160v144H0z"/><path d="M72.036 0C108.15 10.622 135 50.606 135 98.308c0 16.443-3.19 31.97-8.85 45.692H0L-.002 20.97C9.606 11.01 21.095 3.713 33.716 0h38.32z" fill="url(#d)"/><path d="M70.511 0C94.736 17.553 111 50.047 111 87.23c0 21.045-5.21 40.588-14.124 56.77L0 143.997V.003L70.511 0z" fill="url(#e)"/><path d="M38.316 0l52.766 75.046c13.99 19.898 14.364 48.659 2.105 68.954H21.635L0 113.229V0h38.316z" fill="url(#f)"/><path d="M25.588 72.994l2.445 3.333C42.91 95.856 52.223 119.417 56 144H0L-.001 14.588c4.074 21.204 12.588 41.404 25.589 58.406z" fill="url(#g)"/></g></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-left.svg b/browser/themes/addons/alpenglow/background-noodles-left.svg
new file mode 100644
index 0000000000..ee2b4b6b75
--- /dev/null
+++ b/browser/themes/addons/alpenglow/background-noodles-left.svg
@@ -0,0 +1,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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="160" height="144"><defs><linearGradient id="c" x1="36.13" y1="115.75" x2="36.42" y2="115.63" gradientTransform="matrix(160 0 0 -144 -5724 16732)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc56a1"/><stop offset="1" stop-color="#fc56a1" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="36.04" y1="115.68" x2="36.45" y2="115.42" gradientTransform="matrix(135 0 0 -144 -4824.07 16732)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc4ca0"/><stop offset="1" stop-color="#ffa769"/></linearGradient><linearGradient id="e" x1="35.6" y1="116.06" x2="36.35" y2="115.39" gradientTransform="matrix(111 0 0 -144 -3960 16732)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4e27a4"/><stop offset=".34" stop-color="#8b4ee5"/><stop offset=".73" stop-color="#ff4ad9"/><stop offset="1" stop-color="#ff778e"/></linearGradient><linearGradient id="f" x1="35.51" y1="116.3" x2="36.42" y2="115.12" gradientTransform="matrix(102 0 0 -144 -3635.99 16732)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#20123a"/><stop offset=".11" stop-color="#3f2574"/><stop offset=".24" stop-color="#5f39b0"/><stop offset=".34" stop-color="#7245d6"/><stop offset=".39" stop-color="#7a4ae4"/><stop offset=".45" stop-color="#7a4ae4" stop-opacity=".97"/><stop offset=".53" stop-color="#7949e4" stop-opacity=".89"/><stop offset=".63" stop-color="#7948e4" stop-opacity=".75"/><stop offset=".74" stop-color="#7846e4" stop-opacity=".56"/><stop offset=".86" stop-color="#7745e5" stop-opacity=".32"/><stop offset=".99" stop-color="#7542e5" stop-opacity=".02"/><stop offset="1" stop-color="#7542e5" stop-opacity="0"/></linearGradient><linearGradient x1="0%" y1="0%" x2="0%" y2="100%" id="a"><stop stop-color="#fff" offset="60%"/><stop stop-color="#fff" stop-opacity="0" offset="100%"/></linearGradient><mask id="b" x="0" y="0" width="100%" height="100%"><rect width="100%" height="100%" fill="url(#a)"/></mask></defs><g mask="url(#b)" fill-rule="evenodd"><path d="M0 0h160v144H0z" fill="url(#c)"/><path d="M72 0c36.11 10.62 63 50.61 63 98.31a119.92 119.92 0 01-8.85 45.69H0V21A77.43 77.43 0 0133.72 0z" fill="url(#d)"/><path d="M70.51 0C94.74 17.55 111 50.05 111 87.23A117.86 117.86 0 0196.88 144H0V0z" fill="url(#e)"/><path d="M38.32 0l52.76 75.05c14 19.89 14.37 48.66 2.11 69H21.64L0 113.23V0z" fill="url(#f)"/><path d="M25.59 73L28 76.33C42.91 95.86 52.22 119.42 56 144H0V14.59C4.07 35.79 12.59 56 25.59 73z" fill="#20123a"/></g></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-right-dark.svg b/browser/themes/addons/alpenglow/background-noodles-right-dark.svg
new file mode 100644
index 0000000000..b8a53679d9
--- /dev/null
+++ b/browser/themes/addons/alpenglow/background-noodles-right-dark.svg
@@ -0,0 +1,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/. -->
+<svg width="160" height="144" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="40.05%" y1="65.335%" x2="89.619%" y2="55.891%" id="a"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/><stop stop-color="#20123A" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="55.904%" y1="13.312%" x2="59.943%" y2="106.223%" id="c"><stop stop-color="#321C64" offset="0%"/><stop stop-color="#20123A" offset="100%"/></linearGradient><linearGradient x1="53.449%" y1="103.324%" x2="83.014%" y2="-63.876%" id="d"><stop stop-color="#20123A" offset="0%"/><stop stop-color="#5F2ECA" offset="64.418%"/><stop stop-color="#7542E5" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="52.55%" y1="106.999%" x2="57.768%" y2="-26.862%" id="e"><stop stop-color="#2B1753" offset="0%"/><stop stop-color="#7033CA" offset="36.937%"/><stop stop-color="#FF4AD9" offset="73.362%"/><stop stop-color="#FF778E" offset="100%"/><stop stop-color="#FF778E" offset="100%"/></linearGradient><linearGradient x1="58.794%" y1="0%" x2="-74.439%" y2="-16.628%" id="f"><stop stop-color="#FC4CA0" offset="0%"/><stop stop-color="#FFA769" offset="100%"/></linearGradient><filter x="0%" y="0%" width="100%" height="100%" filterUnits="objectBoundingBox" id="b"><feGaussianBlur in="SourceGraphic"/></filter></defs><g fill="none" fill-rule="evenodd"><path fill="url(#a)" filter="url(#b)" transform="rotate(180 80 72)" d="M0 0h160v144H0z"/><path d="M160 0v143.998l-20.783.002C80.276 130.93 34.071 72.955 25 0h135z" fill="url(#c)"/><path d="M160 0v141.76C112.93 119.62 78.896 64.927 76 .003L160 0z" fill="url(#d)"/><path d="M111.14 9.511l.39.968 45.484 116.068A57.65 57.65 0 01160 137h-54V0c1.969 2.852 3.7 6.03 5.14 9.511z" fill="url(#e)" transform="rotate(180 133 68.5)"/><path d="M160 28h-14.998L145 0c3.895 9.971 8.903 19.403 15 28z" fill="url(#f)" transform="rotate(180 152.5 14)"/></g></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/background-noodles-right.svg b/browser/themes/addons/alpenglow/background-noodles-right.svg
new file mode 100644
index 0000000000..da1357b8c7
--- /dev/null
+++ b/browser/themes/addons/alpenglow/background-noodles-right.svg
@@ -0,0 +1,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/. -->
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="160" height="144"><defs><linearGradient id="a" x1="36.76" y1="115.32" x2="36.99" y2="115.42" gradientTransform="matrix(-160 0 0 144 5956 -16532)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fe82a4"/><stop offset="1" stop-color="#fe7fa3" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="36.29" y1="115.74" x2="35.97" y2="115.48" gradientTransform="matrix(135 0 0 -144 -4799 16732)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc4ca0"/><stop offset="1" stop-color="#ffa769"/></linearGradient><linearGradient id="c" x1="36.14" y1="116.11" x2="35.99" y2="115.21" gradientTransform="matrix(84 0 0 -141.76 -2912 16472.16)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7542e5"/><stop offset=".15" stop-color="#8b4ee5"/><stop offset=".62" stop-color="#ff4aa2"/><stop offset="1" stop-color="#ff778e"/></linearGradient><linearGradient id="d" x1="191.06" y1="13.93" x2="137.54" y2="64.24" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#20123a"/><stop offset="1" stop-color="#20123a" stop-opacity="0"/></linearGradient></defs><path d="M160 144H0V0h160z" fill-rule="evenodd" fill="url(#a)"/><path d="M160 0v144h-20.78C80.28 130.93 34.07 73 25 0z" fill-rule="evenodd" fill="url(#b)"/><path d="M160 0v141.76C112.93 119.62 78.9 64.93 76 0z" fill-rule="evenodd" fill="url(#c)"/><g fill-rule="evenodd"><path d="M154.86 127.49l-.39-1L109 10.45A56.68 56.68 0 01106 0h54v137a51 51 0 01-5.14-9.51z" fill="#8c58ff"/><path data-name="d" d="M154.86 127.49l-.39-1L109 10.45A56.68 56.68 0 01106 0h54v137a51 51 0 01-5.14-9.51z" fill="url(#d)"/></g><path d="M145 0h15v28a130.53 130.53 0 00-15-28z" fill="#20123a" fill-rule="evenodd"/></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/icon.svg b/browser/themes/addons/alpenglow/icon.svg
new file mode 100644
index 0000000000..30895a43e2
--- /dev/null
+++ b/browser/themes/addons/alpenglow/icon.svg
@@ -0,0 +1,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/. -->
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32"><defs><linearGradient id="a" x1="-102.26" y1="165.14" x2="-102.26" y2="164.98" gradientTransform="matrix(160 0 0 -128 16377 21140)" gradientUnits="userSpaceOnUse"><stop offset=".6" stop-color="#fff"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="-101.35" y1="165.18" x2="-101.35" y2="165.03" gradientTransform="matrix(72 0 0 -128 7313 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff6bba"/><stop offset="1" stop-color="#ffc999"/></linearGradient><linearGradient id="d" x1="-102.28" y1="165.06" x2="-102.23" y2="165.05" gradientTransform="matrix(160 0 0 -128 16377 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc56a1"/><stop offset="1" stop-color="#fc56a1" stop-opacity="0"/></linearGradient><linearGradient id="e" x1="-102.13" y1="165.06" x2="-102.05" y2="165.01" gradientTransform="matrix(128 0 0 -128 13081 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc4ca0"/><stop offset="1" stop-color="#ffa769"/></linearGradient><linearGradient id="f" x1="-102.01" y1="165.09" x2="-101.93" y2="165.03" gradientTransform="matrix(107 0 0 -128 10918 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4e27a4"/><stop offset=".34" stop-color="#8b4ee5"/><stop offset=".73" stop-color="#ff4ad9"/><stop offset="1" stop-color="#ff778e"/></linearGradient><linearGradient id="g" x1="-101.95" y1="165.14" x2="-101.8" y2="164.97" gradientTransform="matrix(99 0 0 -128 10094.01 21140)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#20123a"/><stop offset=".51" stop-color="#5f2eca"/><stop offset="1" stop-color="#7542e5" stop-opacity="0"/></linearGradient><mask id="c" x="2" y="2" width="26.73" height="21" maskUnits="userSpaceOnUse"><path fill="url(#a)" d="M2 2h26.73v21H2z"/></mask></defs><path d="M2 2h28v28H2z" fill-rule="evenodd" fill="url(#b)"/><g mask="url(#c)"><path d="M2 2h26.73v21H2z" fill="url(#d)"/><path d="M14 2c5.36 1.55 9.35 7.38 9.35 14.34A17.23 17.23 0 0122.07 23H2V6.64A12.08 12.08 0 018.34 2z" fill="url(#e)"/><path d="M13.84 2c3.61 2.56 6 7.3 6 12.72A16.88 16.88 0 0117.77 23H2V2z" fill="url(#f)"/><path d="M9.05 2l7.86 10.94A9.35 9.35 0 0117.22 23H6.56L2 16.65V2z" fill="url(#g)"/><path d="M7.16 12.64l.36.49A21.45 21.45 0 0111.69 23H2V2h1a20.5 20.5 0 004.16 10.64z" fill="#20123a"/></g><path fill="#fff" fill-opacity=".76" d="M16 2v13H2v15h28V2H16z"/><rect x="1" y="1" width="30" height="30" rx="2" fill="none" stroke="#08091a" stroke-opacity=".35" stroke-width="2"/><circle cx="9.5" cy="22.5" r="6" fill="#fff" fill-opacity=".8" stroke="#b7a1aa"/><path d="M12.5 22H7.71l2.14-2.15a.49.49 0 00-.7-.7l-3 3a.36.36 0 00-.11.16.5.5 0 000 .38.36.36 0 00.11.16l3 3a.48.48 0 00.7 0 .48.48 0 000-.7L7.71 23h4.79a.5.5 0 000-1zm8-2h4a.5.5 0 000-1h-4a.5.5 0 000 1zm4 2h-4a.5.5 0 000 1h4a.5.5 0 000-1zm0 3h-4a.5.5 0 000 1h4a.5.5 0 000-1z" fill="#5a2acb"/><path fill="#ac70ff" d="M16 2h14v1H16z"/><path d="M26.35 8.65l-3.5-3.5a.48.48 0 00-.7 0l-3.5 3.5a.49.49 0 00.7.7l.65-.64v2.79a.5.5 0 00.5.5h4a.5.5 0 00.5-.5V8.71l.65.64a.48.48 0 00.7 0 .48.48 0 000-.7zM24 11h-1V9h-1v2h-1V7.71l1.5-1.5 1.5 1.5z" fill="#5a2acb"/><path fill="#20123b" d="M15 2v12H2v1h14V2h-1z"/></svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
new file mode 100644
index 0000000000..5caf57ee1b
--- /dev/null
+++ b/browser/themes/addons/alpenglow/manifest.json
@@ -0,0 +1,125 @@
+{
+  "manifest_version": 2,
+
+  "applications": {
+    "gecko": {
+      "id": "firefox-alpenglow@mozilla.org"
+    }
+  },
+
+  "name": "Firefox Alpenglow",
+  "description": "Use a colorful appearance for buttons, menus, and windows.",
+  "version": "1.2",
+  "icons": { "32": "icon.svg" },
+
+  "theme": {
+    "images": {
+      "additional_backgrounds": [
+        "background-noodles-right.svg",
+        "background-noodles-left.svg",
+        "background-gradient.svg"
+      ]
+    },
+
+    "properties": {
+      "additional_backgrounds_alignment": [
+        "right top",
+        "left top",
+        "right top"
+      ],
+      "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"]
+    },
+    "colors": {
+      "frame": "hsla(240, 20%, 98%, 1)",
+      "toolbar": "hsla(0, 0%, 100%, .76)",
+      "button_background_active": "hsla(240, 26%, 11%, .16)",
+      "button_background_hover": "hsla(240, 26%, 11%, .08)",
+      "icons": "hsla(258, 66%, 48%, 1)",
+      "icons_attention": "hsla(180, 100%, 32%, 1)",
+      "toolbar_text": "hsla(261, 53%, 15%, 1)",
+      "toolbar_vertical_separator": "hsla(261, 53%, 15%, .2)",
+      "toolbar_field": "hsla(0, 0%, 100%, .8)",
+      "toolbar_field_focus": "hsla(261, 53%, 15%, .96)",
+      "toolbar_field_text": "hsla(261, 53%, 15%, 1)",
+      "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
+      "toolbar_field_border": "hsla(261, 53%, 15%, .32)",
+      "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
+      "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
+      "toolbar_field_separator": "hsla(261, 53%, 15%, .32)",
+      "toolbar_top_separator": "hsla(261, 53%, 15%, 1)",
+      "toolbar_bottom_separator": "hsla(261, 53%, 15%, .32)",
+      "bookmark_text": "hsla(261, 53%, 15%, 1)",
+      "tab_text": "hsla(261, 53%, 15%, 1)",
+      "tab_background_text": "hsla(261, 53%, 15%, 1)",
+      "tab_background_separator": "hsla(261, 53%, 15%, 1)",
+      "tab_line": "hsla(265, 100%, 72%, 1)",
+      "tab_loading": "hsla(265, 100%, 72%, 1)",
+      "ntp_background": "hsla(0, 0%, 100%, 1)",
+      "ntp_text": "hsla(261, 53%, 15%, 1)",
+      "popup": "hsla(254, 46%, 21%, 1)",
+      "popup_text": "hsla(255, 100%, 94%, 1)",
+      "popup_border": "hsla(255, 100%, 94%, .32)",
+      "popup_highlight": "hsla(255, 100%, 94%, .12)",
+      "sidebar": "hsla(240, 15%, 95%, 1)",
+      "sidebar_text": "hsla(261, 53%, 15%, 1)",
+      "sidebar_border": "hsla(261, 53%, 15%, .24)",
+      "sidebar_highlight": "hsla(265, 100%, 72%, 1)",
+      "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)"
+    }
+  },
+  "dark_theme": {
+    "images": {
+      "additional_backgrounds": [
+        "background-noodles-right-dark.svg",
+        "background-noodles-left-dark.svg",
+        "background-gradient-dark.svg"
+      ]
+    },
+
+    "properties": {
+      "additional_backgrounds_alignment": [
+        "right top",
+        "left top",
+        "right top"
+      ],
+      "additional_backgrounds_tiling": ["no-repeat", "no-repeat", "repeat-x"]
+    },
+    "colors": {
+      "frame": "hsla(240, 20%, 98%, 1)",
+      "toolbar": "hsla(254, 46%, 21%, .96)",
+      "button_background_active": "hsla(255, 100%, 94%, .24)",
+      "button_background_hover": "hsla(255, 100%, 94%, .12)",
+      "icons": "hsla(271, 100%, 77%, 1)",
+      "icons_attention": "hsla(157, 100%, 66%, 1)",
+      "toolbar_text": "hsla(255, 100%, 94%, 1)",
+      "toolbar_vertical_separator": "hsla(271, 100%, 77%, .4)",
+      "toolbar_field": "hsla(250, 43%, 25%, 1)",
+      "toolbar_field_focus": "hsla(250, 43%, 25%, .98)",
+      "toolbar_field_text": "hsla(255, 100%, 94%, 1)",
+      "toolbar_field_text_focus": "hsla(255, 100%, 94%, 1)",
+      "toolbar_field_border": "hsla(255, 100%, 94%, .32)",
+      "toolbar_field_border_focus": "hsla(265, 100%, 72%, 1)",
+      "toolbar_field_highlight": "hsla(265, 100%, 72%, .32)",
+      "toolbar_field_separator": "hsla(261, 53%, 15%, .32)",
+      "toolbar_top_separator": "hsla(255, 100%, 94%, .32)",
+      "toolbar_bottom_separator": "hsla(245, 38%, 33%, .96)",
+      "bookmark_text": "hsla(255, 100%, 94%, 1)",
+      "tab_text": "hsla(255, 100%, 94%, 1)",
+      "tab_background_text": "hsla(255, 100%, 94%, 1)",
+      "tab_background_separator": "hsla(255, 100%, 94%, 1)",
+      "tab_line": "hsla(265, 100%, 72%, 1)",
+      "tab_loading": "hsla(265, 100%, 72%, 1)",
+      "ntp_background": "hsla(254, 46%, 21%, .96)",
+      "ntp_text": "hsla(255, 100%, 94%, 1)",
+      "popup": "hsla(250, 43%, 25%, 1)",
+      "popup_text": "hsla(255, 100%, 94%, 1)",
+      "popup_border": "hsla(255, 100%, 94%, .32)",
+      "popup_highlight": "hsla(255, 100%, 94%, .12)",
+      "sidebar": "hsla(250, 43%, 25%, 1)",
+      "sidebar_text": "hsla(255, 100%, 94%, 1)",
+      "sidebar_border": "hsla(255, 100%, 94%, .24)",
+      "sidebar_highlight": "hsla(259, 76%, 58%, 1)",
+      "sidebar_highlight_text": "hsla(0, 0%, 100%, 1)"
+    }
+  }
+}
diff --git a/browser/themes/addons/dark/experiment.css b/browser/themes/addons/dark/experiment.css
new file mode 100644
index 0000000000..e613c87b4c
--- /dev/null
+++ b/browser/themes/addons/dark/experiment.css
@@ -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/. */
+
+/* Dark theme */
+@import url("chrome://browser/skin/compacttheme.css");
diff --git a/browser/themes/addons/dark/icon.svg b/browser/themes/addons/dark/icon.svg
new file mode 100644
index 0000000000..e68e62d147
--- /dev/null
+++ b/browser/themes/addons/dark/icon.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <path fill="#0c0c0d" d="M2 2h14v13H2z"/>
+  <path fill="#323234" d="M16 2v13H2v15h28V2H16z"/>
+  <rect x="1" y="1" width="30" height="30" rx="2" ry="2" fill="none" stroke="#08091a" stroke-opacity=".35" stroke-width="2"/>
+  <circle cx="9.5" cy="22.5" r="6" fill="#474749" stroke="#08091a"/>
+  <path d="M12.5 22H7.707l2.146-2.146a.5.5 0 0 0-.707-.707l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 1 0 .707-.707L7.707 23H12.5a.5.5 0 0 0 0-1z" fill="#f9f9fa" fill-opacity=".8"/>
+  <path d="M20.5 20h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0 0 1zm4 2h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1zm0 3h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1z" fill="#f9f9fa" fill-opacity=".8"/>
+  <path fill="#0a84ff" d="M16 2h14v1H16z"/>
+  <path d="M26.354 8.646l-3.5-3.5a.5.5 0 0 0-.707 0l-3.5 3.5a.5.5 0 0 0 .707.707L20 8.707V11.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5V8.707l.646.646a.5.5 0 1 0 .707-.707zM24 11h-1V9h-1v2h-1V7.707l1.5-1.5 1.5 1.5z" fill="#f9f9fa" fill-opacity=".8"/>
+  <path fill="#08091a" d="M15 2v12H2v1h14V2h-1z"/>
+</svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
new file mode 100644
index 0000000000..b246ec6a59
--- /dev/null
+++ b/browser/themes/addons/dark/manifest.json
@@ -0,0 +1,43 @@
+{
+  "manifest_version": 2,
+
+  "applications": {
+    "gecko": {
+      "id": "firefox-compact-dark@mozilla.org"
+    }
+  },
+
+  "name": "Dark",
+  "description": "A theme with a dark color scheme.",
+  "author": "Mozilla",
+  "version": "1.1",
+
+  "icons": {"32": "icon.svg"},
+
+  "theme": {
+    "colors": {
+      "tab_background_text": "rgb(249, 249, 250)",
+      "icons": "rgb(249, 249, 250, 0.7)",
+      "frame": "hsl(240, 5%, 5%)",
+      "popup": "#4a4a4f",
+      "popup_text": "rgb(249, 249, 250)",
+      "popup_border": "#27272b",
+      "tab_line": "#0a84ff",
+      "toolbar": "hsl(240, 1%, 20%)",
+      "toolbar_bottom_separator": "hsl(240, 5%, 5%)",
+      "toolbar_field": "rgb(71, 71, 73)",
+      "toolbar_field_border": "rgba(249, 249, 250, 0.2)",
+      "toolbar_field_separator": "#5F6670",
+      "toolbar_field_text": "rgb(249, 249, 250)",
+      "ntp_background": "#2A2A2E",
+      "ntp_text": "rgb(249, 249, 250)",
+      "sidebar": "#38383D",
+      "sidebar_text": "rgb(249, 249, 250)",
+      "sidebar_border": "rgba(255, 255, 255, 0.1)"
+    }
+  },
+
+  "theme_experiment": {
+    "stylesheet": "experiment.css"
+  }
+}
diff --git a/browser/themes/addons/jar.mn b/browser/themes/addons/jar.mn
new file mode 100644
index 0000000000..5aa122b2ab
--- /dev/null
+++ b/browser/themes/addons/jar.mn
@@ -0,0 +1,17 @@
+# 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:
+%  resource builtin-themes %content/builtin-themes/
+
+  content/builtin-themes/alpenglow                 (alpenglow/*.svg)
+  content/builtin-themes/alpenglow/manifest.json   (alpenglow/manifest.json)
+
+  content/builtin-themes/dark                      (dark/*.svg)
+  content/builtin-themes/dark                      (dark/*.css)
+  content/builtin-themes/dark/manifest.json        (dark/manifest.json)
+
+  content/builtin-themes/light                     (light/*.svg)
+  content/builtin-themes/light                     (light/*.css)
+  content/builtin-themes/light/manifest.json       (light/manifest.json)
diff --git a/browser/themes/addons/light/experiment.css b/browser/themes/addons/light/experiment.css
new file mode 100644
index 0000000000..54ba4ae3af
--- /dev/null
+++ b/browser/themes/addons/light/experiment.css
@@ -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/. */
+
+/* Light theme */
+@import url("chrome://browser/skin/compacttheme.css");
diff --git a/browser/themes/addons/light/icon.svg b/browser/themes/addons/light/icon.svg
new file mode 100644
index 0000000000..6cddd29e19
--- /dev/null
+++ b/browser/themes/addons/light/icon.svg
@@ -0,0 +1,14 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <path fill="#e1e1e5" d="M2 2h14v13H2z"/>
+  <path fill="#f9f9fa" d="M16 2v13H2v15h28V2H16z"/>
+  <rect x="1" y="1" width="30" height="30" rx="2" ry="2" fill="none" stroke="#08091a" stroke-opacity=".35" stroke-width="2"/>
+  <circle cx="9.5" cy="22.5" r="6" fill="#fff" stroke="#adadb3"/>
+  <path d="M12.5 22H7.707l2.146-2.146a.5.5 0 0 0-.707-.707l-3 3a.5.5 0 0 0 0 .708l3 3a.5.5 0 1 0 .707-.707L7.707 23H12.5a.5.5 0 0 0 0-1z" fill="#0c0c0d" fill-opacity=".8"/>
+  <path d="M20.5 20h4a.5.5 0 0 0 0-1h-4a.5.5 0 0 0 0 1zm4 2h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1zm0 3h-4a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1z" fill="#0c0c0d" fill-opacity=".8"/>
+  <path fill="#0a84ff" d="M16 2h14v1H16z"/>
+  <path d="M26.354 8.646l-3.5-3.5a.5.5 0 0 0-.707 0l-3.5 3.5a.5.5 0 0 0 .707.707L20 8.707V11.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5V8.707l.646.646a.5.5 0 1 0 .707-.707zM24 11h-1V9h-1v2h-1V7.707l1.5-1.5 1.5 1.5z" fill="#0c0c0d" fill-opacity=".8"/>
+  <path fill="#08091a" fill-opacity=".25" d="M15 2v12H2v1h14V2h-1z"/>
+</svg>
+\ No newline at end of file
diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
new file mode 100644
index 0000000000..24ffe228d2
--- /dev/null
+++ b/browser/themes/addons/light/manifest.json
@@ -0,0 +1,37 @@
+{
+  "manifest_version": 2,
+
+  "applications": {
+    "gecko": {
+      "id": "firefox-compact-light@mozilla.org"
+    }
+  },
+
+  "name": "Light",
+  "description": "A theme with a light color scheme.",
+  "author": "Mozilla",
+  "version": "1.1",
+
+  "icons": {"32": "icon.svg"},
+
+  "theme": {
+    "colors": {
+      "tab_background_text": "rgb(24, 25, 26)",
+      "icons": "rgb(24, 25, 26, 0.7)",
+      "frame": "#E3E4E6",
+      "popup": "#fff",
+      "popup_text": "#0c0c0d",
+      "popup_border": "#ccc",
+      "tab_line": "#0a84ff",
+      "toolbar": "#f5f6f7",
+      "toolbar_bottom_separator": "#ccc",
+      "toolbar_field": "#fff",
+      "toolbar_field_text": "rgb(24, 25, 26)",
+      "toolbar_field_border": "#ccc"
+    }
+  },
+
+  "theme_experiment": {
+    "stylesheet": "experiment.css"
+  }
+}
diff --git a/browser/themes/addons/moz.build b/browser/themes/addons/moz.build
new file mode 100644
index 0000000000..d988c0ff9b
--- /dev/null
+++ b/browser/themes/addons/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"]